OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 24... Line 24...
24 aliases { 24 aliases {
25 serial0 = &gsbi4_serial; 25 serial0 = &gsbi4_serial;
26 mdio-gpio0 = &mdio0; 26 mdio-gpio0 = &mdio0;
Line 27... Line 27...
27   27  
28 led-boot = &power_green; 28 led-boot = &power_green;
29 led-failsafe = &power_red; 29 led-failsafe = &power_green;
30 led-running = &power_green; 30 led-running = &power_green;
31 led-upgrade = &power_green; 31 led-upgrade = &power_green;
Line 32... Line 32...
32 }; 32 };
33   33  
34 chosen { 34 chosen {
Line 35... Line 35...
35 stdout-path = "serial0:115200n8"; 35 linux,stdout-path = "serial0:115200n8";
-   36 };
-   37  
-   38 soc {
-   39 pinmux@800000 {
-   40 button_pins: button_pins {
-   41 mux {
-   42 pins = "gpio16", "gpio54", "gpio24", "gpio25";
-   43 function = "gpio";
-   44 drive-strength = <2>;
-   45 bias-pull-up;
-   46 };
-   47 };
-   48  
-   49 i2c4_pins: i2c4_pinmux {
-   50 mux {
-   51 pins = "gpio12", "gpio13";
-   52 function = "gsbi4";
-   53 drive-strength = <12>;
-   54 bias-disable;
-   55 };
-   56 };
-   57  
-   58 led_pins: led_pins {
-   59 mux {
-   60 pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14",
-   61 "gpio15", "gpio55", "gpio56", "gpio57", "gpio58",
-   62 "gpio64", "gpio65";
-   63 function = "gpio";
-   64 drive-strength = <2>;
-   65 bias-pull-down;
-   66 };
-   67 };
-   68  
-   69 spi_pins: spi_pins {
-   70 mux {
-   71 pins = "gpio18", "gpio19", "gpio21";
-   72 function = "gsbi5";
-   73 bias-pull-down;
-   74 };
-   75  
-   76 data {
-   77 pins = "gpio18", "gpio19";
-   78 drive-strength = <10>;
-   79 };
-   80  
-   81 cs {
-   82 pins = "gpio20";
-   83 drive-strength = <10>;
-   84 bias-pull-up;
-   85 };
-   86  
-   87 clk {
-   88 pins = "gpio21";
-   89 drive-strength = <12>;
-   90 };
-   91 };
-   92  
-   93 mdio0_pins: mdio0_pins {
-   94 mux {
-   95 pins = "gpio0", "gpio1";
-   96 function = "gpio";
-   97 drive-strength = <8>;
-   98 bias-disable;
-   99 };
-   100 };
-   101  
-   102 rgmii2_pins: rgmii2_pins {
-   103 mux {
-   104 pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
-   105 "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
-   106 function = "rgmii2";
-   107 drive-strength = <8>;
-   108 bias-disable;
-   109 };
-   110 };
-   111  
-   112 usb_pwr_en_pins: usb_pwr_en_pins {
-   113 mux {
-   114 pins = "gpio22";
-   115 function = "gpio";
-   116 drive-strength = <2>;
-   117 bias-pull-down;
-   118 output-high;
-   119 };
-   120 };
-   121 };
-   122  
-   123 gsbi@16300000 {
-   124 qcom,mode = <GSBI_PROT_I2C_UART>;
-   125 status = "ok";
-   126 serial@16340000 {
-   127 status = "ok";
-   128 };
-   129 /*
-   130 * The i2c device on gsbi4 should not be enabled.
-   131 * On ipq806x designs gsbi4 i2c is meant for exclusive
-   132 * RPM usage. Turning this on in kernel manifests as
-   133 * i2c failure for the RPM.
-   134 */
-   135 };
-   136  
-   137 gsbi5: gsbi@1a200000 {
-   138 qcom,mode = <GSBI_PROT_SPI>;
-   139 status = "ok";
-   140  
-   141 spi4: spi@1a280000 {
-   142 status = "ok";
-   143  
-   144 pinctrl-0 = <&spi_pins>;
-   145 pinctrl-names = "default";
-   146  
-   147 cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-   148  
-   149 flash: m25p80@0 {
-   150 compatible = "jedec,spi-nor";
-   151 #address-cells = <1>;
-   152 #size-cells = <1>;
-   153 spi-max-frequency = <50000000>;
-   154 reg = <0>;
-   155  
-   156 SBL1@0 {
-   157 label = "SBL1";
-   158 reg = <0x0 0x20000>;
-   159 read-only;
-   160 };
-   161  
-   162 MIBIB@20000 {
-   163 label = "MIBIB";
-   164 reg = <0x20000 0x20000>;
-   165 read-only;
-   166 };
-   167  
-   168 SBL2@40000 {
-   169 label = "SBL2";
-   170 reg = <0x40000 0x40000>;
-   171 read-only;
-   172 };
-   173  
-   174 SBL3@80000 {
-   175 label = "SBL3";
-   176 reg = <0x80000 0x80000>;
-   177 read-only;
-   178 };
-   179  
-   180 DDRCONFIG@100000 {
-   181 label = "DDRCONFIG";
-   182 reg = <0x100000 0x10000>;
-   183 read-only;
-   184 };
-   185  
-   186 SSD@110000 {
-   187 label = "SSD";
-   188 reg = <0x110000 0x10000>;
-   189 read-only;
-   190 };
-   191  
-   192 TZ@120000 {
-   193 label = "TZ";
-   194 reg = <0x120000 0x80000>;
-   195 read-only;
-   196 };
-   197  
-   198 RPM@1a0000 {
-   199 label = "RPM";
-   200 reg = <0x1a0000 0x80000>;
-   201 read-only;
-   202 };
-   203  
-   204 APPSBL@220000 {
-   205 label = "APPSBL";
-   206 reg = <0x220000 0x80000>;
-   207 read-only;
-   208 };
-   209  
-   210 APPSBLENV@2a0000 {
-   211 label = "APPSBLENV";
-   212 reg = <0x2a0000 0x10000>;
-   213 };
-   214  
-   215 PRODUCTDATA: PRODUCTDATA@2b0000 {
-   216 label = "PRODUCTDATA";
-   217 reg = <0x2b0000 0x30000>;
-   218 read-only;
-   219 };
-   220  
-   221 ART@2e0000 {
-   222 label = "ART";
-   223 reg = <0x2e0000 0x40000>;
-   224 read-only;
-   225 };
-   226  
-   227 TP@320000 {
-   228 label = "TP";
-   229 reg = <0x320000 0x40000>;
-   230 read-only;
-   231 };
-   232  
-   233 TINY@360000 {
-   234 label = "TINY";
-   235 reg = <0x360000 0x500000>;
-   236 read-only;
-   237 };
-   238  
-   239 firmware@860000 {
-   240 label = "firmware";
-   241 reg = <0x860000 0x17a0000>;
-   242 };
-   243 };
-   244 };
-   245 };
-   246  
-   247 phy@100f8800 { /* USB3 port 1 HS phy */
-   248 status = "ok";
-   249 };
-   250  
-   251 phy@100f8830 { /* USB3 port 1 SS phy */
-   252 status = "ok";
-   253 };
-   254  
-   255 phy@110f8800 { /* USB3 port 0 HS phy */
-   256 status = "ok";
-   257 };
-   258  
-   259 phy@110f8830 { /* USB3 port 0 SS phy */
-   260 status = "ok";
-   261 };
-   262  
-   263 usb30@0 {
-   264 status = "ok";
-   265  
-   266 pinctrl-0 = <&usb_pwr_en_pins>;
-   267 pinctrl-names = "default";
-   268 };
-   269  
-   270 usb30@1 {
-   271 status = "ok";
-   272 };
-   273  
-   274 pcie0: pci@1b500000 {
-   275 status = "ok";
-   276 reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_HIGH>;
-   277 pinctrl-0 = <&pcie0_pins>;
-   278 pinctrl-names = "default";
-   279 };
-   280  
-   281 pcie1: pci@1b700000 {
-   282 status = "ok";
-   283 reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>;
-   284 pinctrl-0 = <&pcie1_pins>;
-   285 pinctrl-names = "default";
36 }; 286 force_gen1 = <1>;
37   287 };
38 soc { 288  
39 mdio0: mdio { 289 mdio0: mdio {
40 compatible = "virtual,mdio-gpio"; 290 compatible = "virtual,mdio-gpio";
41 #address-cells = <1>; 291 #address-cells = <1>;
42 #size-cells = <0>; 292 #size-cells = <0>;
Line 43... Line 293...
43 gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>; 293 gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH &qcom_pinmux 0 GPIO_ACTIVE_HIGH>;
-   294 pinctrl-0 = <&mdio0_pins>;
44 pinctrl-0 = <&mdio0_pins>; 295 pinctrl-names = "default";
45 pinctrl-names = "default"; 296  
46   297 phy0: ethernet-phy@0 {
47 ethernet-phy@0 { 298 device_type = "ethernet-phy";
-   299 reg = <0>;
48 reg = <0>; 300 qca,ar8327-initvals = <
49 qca,ar8327-initvals = < 301 0x00004 0x7600000 /* PAD0_MODE */
50 0x00004 0x06000000 /* PAD0_MODE */ 302 0x00008 0x1000000 /* PAD5_MODE */
51 0x0000c 0x00080080 /* PAD6_MODE */ 303 0x0000c 0x80 /* PAD6_MODE */
52 0x000e4 0x0006a545 /* MAC_POWER_SEL */ 304 0x000e4 0x6a545 /* MAC_POWER_SEL */
53 0x000e0 0xc74164de /* SGMII_CTRL */ 305 0x000e0 0xc74164de /* SGMII_CTRL */
Line 54... Line 306...
54 0x0007c 0x0000004e /* PORT0_STATUS */ 306 0x0007c 0x4e /* PORT0_STATUS */
-   307 0x00094 0x4e /* PORT6_STATUS */
55 0x00094 0x0000004e /* PORT6_STATUS */ 308 >;
56 >; 309 };
57 }; 310  
-   311 phy4: ethernet-phy@4 {
-   312 device_type = "ethernet-phy";
-   313 reg = <4>;
-   314 };
-   315 };
-   316  
-   317 gmac1: ethernet@37200000 {
-   318 status = "ok";
-   319 phy-mode = "rgmii";
-   320 qcom,id = <1>;
-   321  
-   322 pinctrl-0 = <&rgmii2_pins>;
-   323 pinctrl-names = "default";
-   324  
-   325 mtd-mac-address = <&PRODUCTDATA 6>;
-   326  
-   327 fixed-link {
-   328 speed = <1000>;
-   329 full-duplex;
-   330 };
-   331 };
-   332  
-   333 gmac2: ethernet@37400000 {
-   334 status = "ok";
-   335 phy-mode = "sgmii";
-   336 qcom,id = <2>;
-   337  
-   338 mtd-mac-address = <&PRODUCTDATA 0>;
-   339  
58   340 fixed-link {
Line 59... Line 341...
59 ethernet-phy@4 { 341 speed = <1000>;
60 reg = <4>; 342 full-duplex;
61 }; 343 };
62 }; 344 };
Line 63... Line 345...
63 }; 345 };
Line 92... Line 374...
92 linux,code = <BTN_0>; 374 linux,code = <BTN_0>;
93 linux,input-type = <EV_SW>; 375 linux,input-type = <EV_SW>;
94 }; 376 };
95 }; 377 };
Line 96... Line 378...
96   378  
97 leds { 379 gpio-leds {
98 compatible = "gpio-leds"; 380 compatible = "gpio-leds";
99 pinctrl-0 = <&led_pins>; 381 pinctrl-0 = <&led_pins>;
Line 100... Line 382...
100 pinctrl-names = "default"; 382 pinctrl-names = "default";
101   383  
102 converter_green { 384 converter_green {
103 label = "wg2600hp:green:converter"; 385 label = "wg2600hp:green:converter";
Line 104... Line 386...
104 gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>; 386 gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
105 }; 387 };
106   388  
107 power_red: power_red { 389 power_red {
Line 108... Line 390...
108 label = "wg2600hp:red:power"; 390 label = "wg2600hp:red:power";
Line 160... Line 442...
160 }; 442 };
161 }; 443 };
162 }; 444 };
Line 163... Line 445...
163   445  
164 &adm_dma { -  
165 status = "okay"; -  
166 }; -  
167   -  
168 &gmac1 { -  
169 status = "okay"; -  
170   -  
171 phy-mode = "rgmii"; -  
172 qcom,id = <1>; -  
173   -  
174 pinctrl-0 = <&rgmii2_pins>; -  
175 pinctrl-names = "default"; -  
176   -  
177 mtd-mac-address = <&PRODUCTDATA 6>; -  
178   -  
179 fixed-link { -  
180 speed = <1000>; -  
181 full-duplex; -  
182 }; -  
183 }; -  
184   -  
185 &gmac2 { -  
186 status = "okay"; -  
187   -  
188 phy-mode = "sgmii"; -  
189 qcom,id = <2>; -  
190   -  
191 mtd-mac-address = <&PRODUCTDATA 0>; -  
192   -  
193 fixed-link { -  
194 speed = <1000>; -  
195 full-duplex; -  
196 }; -  
197 }; -  
198   -  
199 &gsbi4 { -  
200 status = "okay"; -  
201 qcom,mode = <GSBI_PROT_I2C_UART>; -  
202 }; -  
203   -  
204 &gsbi4_serial { -  
205 status = "okay"; -  
206 }; -  
207   -  
208 &gsbi5 { -  
209 status = "okay"; -  
210   -  
211 qcom,mode = <GSBI_PROT_SPI>; -  
212   -  
213 spi@1a280000 { -  
214 status = "okay"; -  
215   -  
216 pinctrl-0 = <&spi_pins>; -  
217 pinctrl-names = "default"; -  
218   -  
219 cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>; -  
220   -  
221 flash@0 { -  
222 compatible = "jedec,spi-nor"; -  
223 spi-max-frequency = <50000000>; -  
224 reg = <0>; -  
225   -  
226 partitions { -  
227 compatible = "fixed-partitions"; -  
228 #address-cells = <1>; -  
229 #size-cells = <1>; -  
230   -  
231 SBL1@0 { -  
232 label = "SBL1"; -  
233 reg = <0x0 0x20000>; -  
234 read-only; -  
235 }; -  
236   -  
237 MIBIB@20000 { -  
238 label = "MIBIB"; -  
239 reg = <0x20000 0x20000>; -  
240 read-only; -  
241 }; -  
242   -  
243 SBL2@40000 { -  
244 label = "SBL2"; -  
245 reg = <0x40000 0x40000>; -  
246 read-only; -  
247 }; -  
248   -  
249 SBL3@80000 { -  
250 label = "SBL3"; -  
251 reg = <0x80000 0x80000>; -  
252 read-only; -  
253 }; -  
254   -  
255 DDRCONFIG@100000 { -  
256 label = "DDRCONFIG"; -  
257 reg = <0x100000 0x10000>; -  
258 read-only; -  
259 }; -  
260   -  
261 SSD@110000 { -  
262 label = "SSD"; -  
263 reg = <0x110000 0x10000>; -  
264 read-only; -  
265 }; -  
266   -  
267 TZ@120000 { -  
268 label = "TZ"; -  
269 reg = <0x120000 0x80000>; -  
270 read-only; -  
271 }; -  
272   -  
273 RPM@1a0000 { -  
274 label = "RPM"; -  
275 reg = <0x1a0000 0x80000>; -  
276 read-only; -  
277 }; -  
278   -  
279 APPSBL@220000 { -  
280 label = "APPSBL"; -  
281 reg = <0x220000 0x80000>; -  
282 read-only; -  
283 }; -  
284   -  
285 APPSBLENV@2a0000 { -  
286 label = "APPSBLENV"; -  
287 reg = <0x2a0000 0x10000>; -  
288 }; -  
289   -  
290 PRODUCTDATA: PRODUCTDATA@2b0000 { -  
291 label = "PRODUCTDATA"; -  
292 reg = <0x2b0000 0x30000>; -  
293 read-only; -  
294 }; -  
295   -  
296 ART@2e0000 { -  
297 label = "ART"; -  
298 reg = <0x2e0000 0x40000>; -  
299 read-only; -  
300 }; -  
301   -  
302 TP@320000 { -  
303 label = "TP"; -  
304 reg = <0x320000 0x40000>; -  
305 read-only; -  
306 }; -  
307   -  
308 TINY@360000 { -  
309 label = "TINY"; -  
310 reg = <0x360000 0x500000>; -  
311 read-only; -  
312 }; -  
313   -  
314 firmware@860000 { -  
315 compatible = "denx,uimage"; -  
316 label = "firmware"; -  
317 reg = <0x860000 0x17a0000>; -  
318 }; -  
319 }; -  
320 }; -  
321 }; -  
322 }; -  
323   -  
324 &hs_phy_0 { /* USB3 port 0 HS phy */ 446 &adm_dma {
325 status = "okay"; -  
326 }; -  
327   -  
328 &ss_phy_0 { /* USB3 port 0 SS phy */ -  
329 status = "okay"; -  
330 }; -  
331   -  
332 &hs_phy_1 { /* USB3 port 1 HS phy */ -  
333 status = "okay"; -  
334 }; -  
335   -  
336 &ss_phy_1 { /* USB3 port 1 SS phy */ -  
337 status = "okay"; -  
338 }; -  
339   -  
340 &usb3_0 { -  
341 status = "okay"; -  
342   -  
343 pinctrl-0 = <&usb_pwr_en_pins>; -  
344 pinctrl-names = "default"; -  
345 }; -  
346   -  
347 &usb3_1 { -  
348 status = "okay"; -  
349 }; -  
350   -  
351 &pcie0 { -  
352 status = "okay"; -  
353 }; -  
354   -  
355 &pcie1 { -  
356 status = "okay"; -  
357 force_gen1 = <1>; -  
358 }; -  
359   -  
360 &qcom_pinmux { -  
361 button_pins: button_pins { -  
362 mux { -  
363 pins = "gpio16", "gpio54", "gpio24", "gpio25"; -  
364 function = "gpio"; -  
365 drive-strength = <2>; -  
366 bias-pull-up; -  
367 }; -  
368 }; -  
369   -  
370 i2c4_pins: i2c4_pinmux { -  
371 mux { -  
372 pins = "gpio12", "gpio13"; -  
373 function = "gsbi4"; -  
374 drive-strength = <12>; -  
375 bias-disable; -  
376 }; -  
377 }; -  
378   -  
379 led_pins: led_pins { -  
380 mux { -  
381 pins = "gpio6", "gpio7", "gpio8", "gpio9", "gpio14", -  
382 "gpio15", "gpio55", "gpio56", "gpio57", "gpio58", -  
383 "gpio64", "gpio65"; -  
384 function = "gpio"; -  
385 drive-strength = <2>; -  
386 bias-pull-down; -  
387 }; -  
388 }; -  
389   -  
390 spi_pins: spi_pins { -  
391 mux { -  
392 pins = "gpio18", "gpio19", "gpio21"; -  
393 function = "gsbi5"; -  
394 bias-pull-down; -  
395 }; -  
396   -  
397 data { -  
398 pins = "gpio18", "gpio19"; -  
399 drive-strength = <10>; -  
400 }; -  
401   -  
402 cs { -  
403 pins = "gpio20"; -  
404 drive-strength = <10>; -  
405 bias-pull-up; -  
406 }; -  
407   -  
408 clk { -  
409 pins = "gpio21"; -  
410 drive-strength = <12>; -  
411 }; -  
412 }; -  
413   -  
414 mdio0_pins: mdio0_pins { -  
415 mux { -  
416 pins = "gpio0", "gpio1"; -  
417 function = "gpio"; -  
418 drive-strength = <8>; -  
419 bias-disable; -  
420 }; -  
421 }; -  
422   -  
423 rgmii2_pins: rgmii2_pins { -  
424 mux { -  
425 pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32", -  
426 "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ; -  
427 function = "rgmii2"; -  
428 drive-strength = <8>; -  
429 bias-disable; -  
430 }; -  
431 }; -  
432   -  
433 usb_pwr_en_pins: usb_pwr_en_pins { -  
434 mux { -  
435 pins = "gpio22"; -  
436 function = "gpio"; -  
437 drive-strength = <2>; -  
438 bias-pull-down; -  
439 output-high; -  
440 }; -  
441 }; 447 status = "ok";