OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 2... Line 2...
2 #address-cells = <1>; 2 #address-cells = <1>;
3 #size-cells = <1>; 3 #size-cells = <1>;
4 compatible = "ralink,rt3883-soc"; 4 compatible = "ralink,rt3883-soc";
Line 5... Line 5...
5   5  
6 cpus { -  
7 #address-cells = <1>; -  
8 #size-cells = <0>; -  
9   6 cpus {
10 cpu@0 { 7 cpu@0 {
11 compatible = "mips,mips74Kc"; -  
12 reg = <0>; 8 compatible = "mips,mips74Kc";
13 }; 9 };
Line 14... Line 10...
14 }; 10 };
15   11  
Line 21... Line 17...
21 spi0 = &spi0; 17 spi0 = &spi0;
22 spi1 = &spi1; 18 spi1 = &spi1;
23 serial0 = &uartlite; 19 serial0 = &uartlite;
24 }; 20 };
Line 25... Line 21...
25   21  
26 cpuintc: cpuintc { 22 cpuintc: cpuintc@0 {
27 #address-cells = <0>; 23 #address-cells = <0>;
28 #interrupt-cells = <1>; 24 #interrupt-cells = <1>;
29 interrupt-controller; 25 interrupt-controller;
30 compatible = "mti,cpu-interrupt-controller"; 26 compatible = "mti,cpu-interrupt-controller";
Line 114... Line 110...
114   110  
115 gpio-controller; 111 gpio-controller;
Line 116... Line 112...
116 #gpio-cells = <2>; 112 #gpio-cells = <2>;
117   113  
118 ralink,gpio-base = <0>; 114 ralink,gpio-base = <0>;
119 ralink,nr-gpio = <24>; 115 ralink,num-gpios = <24>;
120 ralink,register-map = [ 00 04 08 0c 116 ralink,register-map = [ 00 04 08 0c
121 20 24 28 2c 117 20 24 28 2c
Line 128... Line 124...
128   124  
129 gpio-controller; 125 gpio-controller;
Line 130... Line 126...
130 #gpio-cells = <2>; 126 #gpio-cells = <2>;
131   127  
132 ralink,gpio-base = <24>; 128 ralink,gpio-base = <24>;
133 ralink,nr-gpio = <16>; 129 ralink,num-gpios = <16>;
134 ralink,register-map = [ 00 04 08 0c 130 ralink,register-map = [ 00 04 08 0c
Line 135... Line 131...
135 10 14 18 1c 131 10 14 18 1c
Line 144... Line 140...
144   140  
145 gpio-controller; 141 gpio-controller;
Line 146... Line 142...
146 #gpio-cells = <2>; 142 #gpio-cells = <2>;
147   143  
148 ralink,gpio-base = <40>; 144 ralink,gpio-base = <40>;
149 ralink,nr-gpio = <32>; 145 ralink,num-gpios = <32>;
150 ralink,register-map = [ 00 04 08 0c 146 ralink,register-map = [ 00 04 08 0c
Line 151... Line 147...
151 10 14 18 1c 147 10 14 18 1c
Line 160... Line 156...
160   156  
161 gpio-controller; 157 gpio-controller;
Line 162... Line 158...
162 #gpio-cells = <2>; 158 #gpio-cells = <2>;
163   159  
164 ralink,gpio-base = <72>; 160 ralink,gpio-base = <72>;
165 ralink,nr-gpio = <24>; 161 ralink,num-gpios = <24>;
166 ralink,register-map = [ 00 04 08 0c 162 ralink,register-map = [ 00 04 08 0c
Line 167... Line 163...
167 10 14 18 1c 163 10 14 18 1c
Line 277... Line 273...
277 pinctrl-0 = <&state_default>; 273 pinctrl-0 = <&state_default>;
Line 278... Line 274...
278   274  
279 state_default: pinctrl0 { 275 state_default: pinctrl0 {
Line 280... Line 276...
280 }; 276 };
281   277  
282 i2c_pins: i2c_pins { 278 i2c_pins: i2c {
283 i2c_pins { 279 i2c {
284 ralink,group = "i2c"; 280 ralink,group = "i2c";
285 ralink,function = "i2c"; 281 ralink,function = "i2c";
Line 286... Line 282...
286 }; 282 };
287 }; 283 };
288   284  
289 spi_pins: spi_pins { 285 spi_pins: spi {
290 spi_pins { 286 spi {
291 ralink,group = "spi"; 287 ralink,group = "spi";
Line 292... Line 288...
292 ralink,function = "spi"; 288 ralink,function = "spi";
293 }; 289 };
294 }; 290 };
295   291  
296 spi_cs1: spi1 { 292 spi_cs1: spi1 {
297 spi1 { 293 spi1 {
Line 298... Line 294...
298 ralink,group = "pci"; 294 ralink,group = "spi_cs1";
299 ralink,function = "pci-func"; 295 ralink,function = "spi_cs1";
300 }; 296 };
301 }; 297 };
302   298  
303 uartlite_pins: uartlite { 299 uartlite_pins: uartlite {
304 uart { -  
305 ralink,group = "uartlite"; -  
306 ralink,function = "uartlite"; -  
307 }; -  
308 }; -  
309   -  
310 pci_pins: pci { -  
311 pci { 300 uart {
Line 312... Line 301...
312 ralink,group = "pci"; 301 ralink,group = "uartlite";
313 ralink,function = "pci-fnc"; 302 ralink,function = "uartlite";
314 }; 303 };
Line 355... Line 344...
355 reg = <0x10140000 0x20000>; 344 reg = <0x10140000 0x20000>;
356 #address-cells = <1>; 345 #address-cells = <1>;
357 #size-cells = <1>; 346 #size-cells = <1>;
358 ranges; /* direct mapping */ 347 ranges; /* direct mapping */
Line 359... Line -...
359   -  
360 pinctrl-names = "default"; -  
361 pinctrl-0 = <&pci_pins>; -  
362   348  
Line 363... Line 349...
363 status = "disabled"; 349 status = "disabled";
364   350  
365 pciintc: interrupt-controller { 351 pciintc: interrupt-controller {
Line 369... Line 355...
369   355  
370 interrupt-parent = <&cpuintc>; 356 interrupt-parent = <&cpuintc>;
371 interrupts = <4>; 357 interrupts = <4>;
Line 372... Line 358...
372 }; 358 };
373   359  
374 pci@0 { 360 host-bridge {
375 #address-cells = <3>; 361 #address-cells = <3>;
Line 376... Line 362...
376 #size-cells = <2>; 362 #size-cells = <2>;
Line 396... Line 382...
396 0x9000 0 0 2 &pciintc 19 382 0x9000 0 0 2 &pciintc 19
397 0x9000 0 0 3 &pciintc 19 383 0x9000 0 0 3 &pciintc 19
398 0x9000 0 0 4 &pciintc 19 384 0x9000 0 0 4 &pciintc 19
399 >; 385 >;
Line 400... Line 386...
400   386  
401 pci1: pci@1 { 387 pci-bridge@1 {
402 reg = <0x0800 0 0 0 0>; 388 reg = <0x0800 0 0 0 0>;
403 device_type = "pci"; 389 device_type = "pci";
404 #interrupt-cells = <1>; 390 #interrupt-cells = <1>;
405 #address-cells = <3>; 391 #address-cells = <3>;
Line 406... Line 392...
406 #size-cells = <2>; 392 #size-cells = <2>;
Line -... Line 393...
-   393  
-   394 status = "disabled";
407   395  
408 status = "disabled"; 396 ralink,pci-slot = <1>;
409   -  
410 interrupt-map-mask = <0x0 0 0 0>; -  
411 interrupt-map = <0x0 0 0 0 &pciintc 20>; -  
412   397  
Line 413... Line 398...
413 bus-range = <1 255>; 398 interrupt-map-mask = <0x0 0 0 0>;
414 ranges; 399 interrupt-map = <0x0 0 0 0 &pciintc 20>;
-   400 };
415 }; 401  
416   402 pci-slot@17 {
417 pci17: pci@11,0 { 403 reg = <0x8800 0 0 0 0>;
Line -... Line 404...
-   404 device_type = "pci";
-   405 #interrupt-cells = <1>;
418 reg = <0x8800 0 0 0 0>; 406 #address-cells = <3>;
419 #interrupt-cells = <1>; 407 #size-cells = <2>;
Line 420... Line 408...
420 #address-cells = <3>; 408  
421 #size-cells = <2>; 409 ralink,pci-slot = <17>;
-   410  
422   411 status = "disabled";
423 status = "disabled"; 412 };
424 }; 413  
Line -... Line 414...
-   414 pci-slot@18 {
-   415 reg = <0x9000 0 0 0 0>;
425   416 device_type = "pci";
426 pci18: pci@12,0 { 417 #interrupt-cells = <1>;
427 reg = <0x9000 0 0 0 0>; 418 #address-cells = <3>;
428 #interrupt-cells = <1>; 419 #size-cells = <2>;
Line 454... Line 445...
454   445  
455 ralink,eeprom = "soc_wmac.eeprom"; 446 ralink,eeprom = "soc_wmac.eeprom";
Line 456... Line 447...
456 }; 447 };
457   -  
458 ehci: ehci@101c0000 { -  
459 #address-cells = <1>; 448  
460 #size-cells = <0>; 449 ehci: ehci@101c0000 {
Line 461... Line 450...
461 compatible = "generic-ehci"; 450 compatible = "generic-ehci";
462 reg = <0x101c0000 0x1000>; 451 reg = <0x101c0000 0x1000>;
Line 463... Line 452...
463   452  
464 phys = <&usbphy>; 453 phys = <&usbphy>;
Line 465... Line 454...
465 phy-names = "usb"; 454 phy-names = "usb";
466   -  
467 interrupt-parent = <&intc>; -  
468 interrupts = <18>; -  
469   -  
470 status = "disabled"; -  
471   455  
Line 472... Line 456...
472 ehci_port1: port@1 { 456 interrupt-parent = <&intc>;
473 reg = <1>; -  
474 #trigger-source-cells = <0>; -  
475 }; 457 interrupts = <18>;
476 }; 458  
Line 477... Line 459...
477   459 status = "disabled";
478 ohci: ohci@101c1000 { 460 };
Line 479... Line 461...
479 #address-cells = <1>; 461  
480 #size-cells = <0>; 462 ohci: ohci@101c1000 {
Line 481... Line 463...
481 compatible = "generic-ohci"; 463 compatible = "generic-ohci";
482 reg = <0x101c1000 0x1000>; -  
483   -  
484 phys = <&usbphy>; -  
485 phy-names = "usb"; -  
486   -  
487 interrupt-parent = <&intc>; 464 reg = <0x101c1000 0x1000>;
488 interrupts = <18>; 465