OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 /dts-v1/; 1 /dts-v1/;
2   2  
3 #include "mt7620a.dtsi" 3 #include "mt7620a.dtsi"
4   4  
5 #include <dt-bindings/gpio/gpio.h> 5 #include <dt-bindings/gpio/gpio.h>
6 #include <dt-bindings/input/input.h> 6 #include <dt-bindings/input/input.h>
7   7  
8 / { 8 / {
9 compatible = "dlink,dch-m225", "ralink,mt7620a-soc"; 9 compatible = "dlink,dch-m225", "ralink,mt7620a-soc";
10 model = "D-Link DCH-M225"; 10 model = "D-Link DCH-M225";
11   11  
12 aliases { -  
13 led-boot = &led_power; -  
14 led-failsafe = &led_power; -  
15 led-running = &led_power; -  
16 led-upgrade = &led_power; -  
17 }; -  
18   -  
19 keys { 12 gpio-keys-polled {
-   13 compatible = "gpio-keys-polled";
-   14 #address-cells = <1>;
20 compatible = "gpio-keys-polled"; 15 #size-cells = <0>;
21 poll-interval = <100>; 16 poll-interval = <100>;
22   17  
23 wps { 18 wps {
24 label = "wps"; 19 label = "wps";
25 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 20 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
26 linux,code = <KEY_RFKILL>; 21 linux,code = <KEY_RFKILL>;
27 }; 22 };
28   23  
29 reset { 24 reset {
30 label = "reset"; 25 label = "reset";
31 gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
32 linux,code = <KEY_RESTART>; 27 linux,code = <KEY_RESTART>;
33 }; 28 };
34 }; 29 };
35   30  
36 leds { 31 gpio-leds {
37 compatible = "gpio-leds"; 32 compatible = "gpio-leds";
38   33  
39 led_power: power { 34 power {
40 label = "dch-m225:green:power"; -  
41 gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; 35 label = "dch-m225:green:power";
42 default-state = "on"; 36 gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
43 }; 37 };
44   38  
45 status { 39 status {
46 label = "dch-m225:red:status"; 40 label = "dch-m225:red:status";
47 gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; 41 gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
48 }; 42 };
49 }; 43 };
50   44  
51 sound { 45 sound {
52 compatible = "simple-audio-card"; 46 compatible = "simple-audio-card";
53 simple-audio-card,name = "Audio-I2S"; 47 simple-audio-card,name = "Audio-I2S";
54 simple-audio-card,format = "i2s"; 48 simple-audio-card,format = "i2s";
55 simple-audio-card,bitclock-master = <&dailink0_master>; 49 simple-audio-card,bitclock-master = <&dailink0_master>;
56 simple-audio-card,frame-master = <&dailink0_master>; 50 simple-audio-card,frame-master = <&dailink0_master>;
57 simple-audio-card,widgets = 51 simple-audio-card,widgets =
58 "Headphone", "Headphones"; 52 "Headphone", "Headphones";
59 simple-audio-card,routing = 53 simple-audio-card,routing =
60 "Headphones", "HP_L", 54 "Headphones", "HP_L",
61 "Headphones", "HP_R"; 55 "Headphones", "HP_R";
62 simple-audio-card,mclk-fs = <256>; 56 simple-audio-card,mclk-fs = <256>;
63 simple-audio-card,hp-det-gpio = <&gpio0 14 GPIO_ACTIVE_LOW>; 57 simple-audio-card,hp-det-gpio = <&gpio0 14 GPIO_ACTIVE_LOW>;
64   58  
65 simple-audio-card,cpu { 59 simple-audio-card,cpu {
66 sound-dai = <&i2s>; 60 sound-dai = <&i2s>;
67 }; 61 };
68   62  
69 dailink0_master: simple-audio-card,codec { 63 dailink0_master: simple-audio-card,codec {
70 sound-dai = <&codec>; 64 sound-dai = <&codec>;
71 }; 65 };
72 }; 66 };
73 }; 67 };
74   68  
75 &gpio0 { 69 &gpio0 {
76 status = "okay"; 70 status = "okay";
77 }; 71 };
78   72  
79 &gpio1 { 73 &gpio1 {
80 status = "okay"; 74 status = "okay";
81 }; 75 };
82   76  
83 &i2c { 77 &i2c {
84 status = "okay"; 78 status = "okay";
85   79  
86 codec: wm8960@1a { 80 codec: wm8960@1a {
87 #sound-dai-cells = <0>; 81 #sound-dai-cells = <0>;
88 compatible = "wlf,wm8960"; 82 compatible = "wlf,wm8960";
89 reg = <0x1a>; 83 reg = <0x1a>;
90   84  
91 wlf,shared-lrclk; 85 wlf,shared-lrclk;
92 }; 86 };
93 }; 87 };
94   88  
95 &i2s { 89 &i2s {
96 #sound-dai-cells = <0>; 90 #sound-dai-cells = <0>;
97 status = "okay"; 91 status = "okay";
98 pinctrl-names = "default"; 92 pinctrl-names = "default";
99 pinctrl-0 = <&mdio_refclk_pins>; 93 pinctrl-0 = <&mdio_refclk_pins>;
100 }; 94 };
101   95  
102 &spi0 { 96 &spi0 {
103 status = "okay"; 97 status = "okay";
104   98  
105 m25p80@0 { 99 m25p80@0 {
-   100 #address-cells = <1>;
-   101 #size-cells = <1>;
106 compatible = "jedec,spi-nor"; 102 compatible = "jedec,spi-nor";
107 reg = <0>; 103 reg = <0>;
108 spi-max-frequency = <80000000>; 104 spi-max-frequency = <80000000>;
109 m25p,fast-read; 105 m25p,fast-read;
110   -  
111 partitions { -  
112 compatible = "fixed-partitions"; -  
113 #address-cells = <1>; -  
114 #size-cells = <1>; -  
115   106  
116 partition@0 { 107 partition@0 {
117 label = "u-boot"; 108 label = "u-boot";
118 reg = <0x0 0x30000>; 109 reg = <0x0 0x30000>;
119 read-only; 110 read-only;
120 }; 111 };
121   112  
122 partition@30000 { 113 partition@30000 {
123 label = "u-boot-env"; 114 label = "u-boot-env";
124 reg = <0x30000 0x4000>; 115 reg = <0x30000 0x4000>;
125 read-only; 116 read-only;
126 }; 117 };
127   118  
128 factory: partition@34000 { 119 factory: partition@34000 {
129 label = "factory"; 120 label = "factory";
130 reg = <0x34000 0x4000>; 121 reg = <0x34000 0x4000>;
131 read-only; 122 read-only;
132 }; 123 };
133   124  
134 nvram: partition@38000 { 125 nvram: partition@38000 {
135 label = "nvram"; 126 label = "nvram";
136 reg = <0x38000 0x8000>; 127 reg = <0x38000 0x8000>;
137 read-only; 128 read-only;
138 }; 129 };
139   130  
140 partition@40000 { 131 partition@40000 {
141 label = "devconf"; 132 label = "devconf";
142 reg = <0x40000 0x10000>; 133 reg = <0x40000 0x10000>;
143 read-only; 134 read-only;
144 }; 135 };
145   136  
146 partition@50000 { 137 partition@50000 {
147 label = "upgrade_rec"; 138 label = "upgrade_rec";
148 reg = <0x50000 0x100000>; 139 reg = <0x50000 0x100000>;
149 read-only; 140 read-only;
150 }; 141 };
151   142  
152 partition@150000 { -  
153 compatible = "seama"; 143 partition@150000 {
154 label = "firmware"; 144 label = "firmware";
155 reg = <0x150000 0x6b0000>; -  
156 }; 145 reg = <0x150000 0x6b0000>;
157 }; 146 };
158 }; 147 };
159 }; 148 };
160   149  
161 &gdma { 150 &gdma {
162 status = "okay"; 151 status = "okay";
163 }; 152 };
164   153  
165 &pinctrl { 154 &pinctrl {
166 state_default: pinctrl0 { 155 state_default: pinctrl0 {
167 gpio { 156 gpio {
168 ralink,group = "wdt", "rgmii1"; 157 ralink,group = "wdt", "rgmii1";
169 ralink,function = "gpio"; 158 ralink,function = "gpio";
170 }; 159 };
171   160  
172 gpio_i2s { 161 gpio_i2s {
173 ralink,group = "uartf"; 162 ralink,group = "uartf";
174 ralink,function = "gpio i2s"; 163 ralink,function = "gpio i2s";
175 }; 164 };
176 }; 165 };
177 }; 166 };
178   167  
179 &ethernet { 168 &ethernet {
180 mtd-mac-address = <&factory 0x4>; 169 mtd-mac-address = <&factory 0x4>;
181 }; 170 };
182   171  
183 &gsw { 172 &gsw {
184 ralink,port4 = "ephy"; 173 ralink,port4 = "ephy";
185 }; 174 };
186   175  
187 &wmac { 176 &wmac {
188 ralink,mtd-eeprom = <&factory 0>; 177 ralink,mtd-eeprom = <&factory 0>;
189 pinctrl-names = "default"; 178 pinctrl-names = "default";
190 pinctrl-0 = <&pa_pins>; 179 pinctrl-0 = <&pa_pins>;
191 }; 180 };
192   181