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 "mt7621.dtsi" 3 #include "mt7621.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 = "buffalo,wsr-600dhp", "mediatek,mt7621-soc"; 9 compatible = "buffalo,wsr-600dhp", "mediatek,mt7621-soc";
10 model = "Buffalo WSR-600DHP"; 10 model = "Buffalo WSR-600DHP";
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   11  
19 memory@0 { 12 memory@0 {
20 device_type = "memory"; 13 device_type = "memory";
21 reg = <0x0 0x4000000>; 14 reg = <0x0 0x4000000>;
22 }; 15 };
23   16  
24 chosen { 17 chosen {
25 bootargs = "console=ttyS0,57600"; 18 bootargs = "console=ttyS0,57600";
26 }; 19 };
27   20  
28 leds { 21 gpio-leds {
29 compatible = "gpio-leds"; 22 compatible = "gpio-leds";
30   23  
31 led_power: power { 24 power {
32 label = "wsr-600:green:power"; 25 label = "wsr-600:green:power";
33 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
34 }; 27 };
35   28  
36 wifi_o { 29 wifi_o {
37 label = "wsr-600:orange:wifi"; 30 label = "wsr-600:orange:wifi";
38 gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; 31 gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
39 }; 32 };
40   33  
41 diag { 34 diag {
42 label = "wsr-600:orange:diag"; 35 label = "wsr-600:orange:diag";
43 gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; 36 gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
44 }; 37 };
45   38  
46 wifi_g { 39 wifi_g {
47 label = "wsr-600:green:wifi"; 40 label = "wsr-600:green:wifi";
48 gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; 41 gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
49 }; 42 };
50   43  
51 router_o { 44 router_o {
52 label = "wsr-600:orange:router"; 45 label = "wsr-600:orange:router";
53 gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; 46 gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
54 }; 47 };
55   48  
56 router_g { 49 router_g {
57 label = "wsr-600:green:router"; 50 label = "wsr-600:green:router";
58 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 51 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
59 }; 52 };
60   53  
61 internet_o { 54 internet_o {
62 label = "wsr-600:orange:internet"; 55 label = "wsr-600:orange:internet";
63 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 56 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
64 }; 57 };
65   58  
66 internet_g { 59 internet_g {
67 label = "wsr-600:green:internet"; 60 label = "wsr-600:green:internet";
68 gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; 61 gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
69 }; 62 };
70 }; 63 };
71   64  
72 keys { 65 gpio-keys-polled {
-   66 compatible = "gpio-keys-polled";
-   67 #address-cells = <1>;
73 compatible = "gpio-keys-polled"; 68 #size-cells = <0>;
74 poll-interval = <20>; 69 poll-interval = <20>;
75   70  
76 power { 71 power {
77 label = "power"; 72 label = "power";
78 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; 73 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
79 linux,code = <KEY_POWER>; 74 linux,code = <KEY_POWER>;
80 }; 75 };
81   76  
82 reset { 77 reset {
83 label = "reset"; 78 label = "reset";
84 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 79 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
85 linux,code = <KEY_RESTART>; 80 linux,code = <KEY_RESTART>;
86 }; 81 };
87   82  
88 aoss { 83 aoss {
89 label = "aoss"; 84 label = "aoss";
90 gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; 85 gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
91 linux,code = <KEY_WPS_BUTTON>; 86 linux,code = <KEY_WPS_BUTTON>;
92 }; 87 };
93   88  
94 auto { 89 auto {
95 label = "mode"; 90 label = "mode";
96 gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; 91 gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
97 linux,code = <BTN_0>; 92 linux,code = <BTN_0>;
98 linux,input-type = <EV_SW>; 93 linux,input-type = <EV_SW>;
99 }; 94 };
100   95  
101 ap { 96 ap {
102 label = "ap"; 97 label = "ap";
103 gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; 98 gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
104 linux,code = <BTN_0>; 99 linux,code = <BTN_0>;
105 linux,input-type = <EV_SW>; 100 linux,input-type = <EV_SW>;
106 }; 101 };
107   102  
108 router { 103 router {
109 label = "router"; 104 label = "router";
110 gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; 105 gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
111 linux,code = <BTN_0>; 106 linux,code = <BTN_0>;
112 linux,input-type = <EV_SW>; 107 linux,input-type = <EV_SW>;
113 }; 108 };
114 }; 109 };
115   110  
116 gpio_poweroff { 111 gpio_poweroff {
117 compatible = "gpio-poweroff"; 112 compatible = "gpio-poweroff";
118 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 113 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
119 }; 114 };
120 }; 115 };
121   116  
122 &spi0 { 117 &spi0 {
123 status = "okay"; 118 status = "okay";
124   119  
125 m25p80@0 { 120 m25p80@0 {
-   121 #address-cells = <1>;
-   122 #size-cells = <1>;
126 compatible = "jedec,spi-nor"; 123 compatible = "jedec,spi-nor";
127 reg = <0>; 124 reg = <0>;
128 spi-max-frequency = <10000000>; 125 spi-max-frequency = <10000000>;
-   126 m25p,chunked-io = <32>;
-   127  
-   128 partition@0 {
-   129 label = "u-boot";
-   130 reg = <0x0 0x30000>;
-   131 read-only;
-   132 };
-   133  
-   134 partition@30000 {
-   135 label = "u-boot-env";
-   136 reg = <0x30000 0x10000>;
-   137 read-only;
-   138 };
129   -  
130 partitions { -  
131 compatible = "fixed-partitions"; -  
132 #address-cells = <1>; -  
133 #size-cells = <1>; -  
134   -  
135 partition@0 { -  
136 label = "u-boot"; -  
137 reg = <0x0 0x30000>; -  
138 read-only; -  
139 }; -  
140   -  
141 partition@30000 { -  
142 label = "u-boot-env"; -  
143 reg = <0x30000 0x10000>; -  
144 read-only; -  
145 }; -  
146   139  
147 factory: partition@40000 { 140 factory: partition@40000 {
148 label = "factory"; 141 label = "factory";
149 reg = <0x40000 0x10000>; 142 reg = <0x40000 0x10000>;
150 read-only; 143 read-only;
151 }; 144 };
152   145  
153 partition@50000 { -  
154 compatible = "denx,uimage"; 146 partition@50000 {
155 label = "firmware"; 147 label = "firmware";
156 reg = <0x50000 0xfb0000>; -  
157 }; 148 reg = <0x50000 0xfb0000>;
158 }; 149 };
159 }; 150 };
160 }; 151 };
161   152  
162 &pinctrl { 153 &pinctrl {
163 state_default: pinctrl0 { 154 state_default: pinctrl0 {
164 gpio { 155 gpio {
165 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; 156 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
166 ralink,function = "gpio"; 157 ralink,function = "gpio";
167 }; 158 };
168 }; 159 };
169 }; 160 };
170   161  
171 &pcie { 162 &pcie {
172 status = "okay"; 163 status = "okay";
173 }; -  
174   164  
175 &pcie0 { 165 pcie0 {
176 rt5592@0,0 { 166 rt5592@0,0 {
-   167 reg = <0x0000 0 0 0 0>;
177 reg = <0x0000 0 0 0 0>; 168 device_type = "pci";
-   169 ralink,mtd-eeprom = <&factory 0x8000>;
178 ralink,mtd-eeprom = <&factory 0x8000>; 170 };
179 }; -  
180 }; 171 };
181   172  
182 &pcie1 { 173 pcie1 {
-   174 mt76@1,0 {
183 mt76@0,0 { 175 reg = <0x0000 0 0 0 0>;
-   176 device_type = "pci";
184 reg = <0x0000 0 0 0 0>; 177 mediatek,mtd-eeprom = <&factory 0x0000>;
185 mediatek,mtd-eeprom = <&factory 0x0000>; 178 };
186 }; 179 };
187 }; 180 };
188   181  
189 &xhci { 182 &xhci {
190 status = "disabled"; 183 status = "disabled";
191 }; 184 };
192   185