OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 / { 1 / {
2 #address-cells = <1>; 2 #address-cells = <1>;
3 #size-cells = <1>; 3 #size-cells = <1>;
4 compatible = "ralink,mt7620a-soc"; 4 compatible = "ralink,mtk7620a-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,mips24KEc"; -  
12 reg = <0>; 8 compatible = "mips,mips24KEc";
13 }; 9 };
Line 14... Line 10...
14 }; 10 };
15   11  
16 chosen { 12 chosen {
Line 17... Line 13...
17 bootargs = "console=ttyS0,57600"; 13 bootargs = "console=ttyS0,57600";
18 }; 14 };
19   15  
20 cpuintc: cpuintc { 16 cpuintc: cpuintc@0 {
21 #address-cells = <0>; 17 #address-cells = <0>;
22 #interrupt-cells = <1>; 18 #interrupt-cells = <1>;
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 131... Line 127...
131   127  
132 gpio-controller; 128 gpio-controller;
Line 133... Line 129...
133 #gpio-cells = <2>; 129 #gpio-cells = <2>;
134   130  
135 ralink,gpio-base = <24>; 131 ralink,gpio-base = <24>;
136 ralink,nr-gpio = <16>; 132 ralink,num-gpios = <16>;
137 ralink,register-map = [ 00 04 08 0c 133 ralink,register-map = [ 00 04 08 0c
Line 138... Line 134...
138 10 14 18 1c 134 10 14 18 1c
Line 150... Line 146...
150   146  
151 gpio-controller; 147 gpio-controller;
Line 152... Line 148...
152 #gpio-cells = <2>; 148 #gpio-cells = <2>;
153   149  
154 ralink,gpio-base = <40>; 150 ralink,gpio-base = <40>;
155 ralink,nr-gpio = <32>; 151 ralink,num-gpios = <32>;
156 ralink,register-map = [ 00 04 08 0c 152 ralink,register-map = [ 00 04 08 0c
Line 157... Line 153...
157 10 14 18 1c 153 10 14 18 1c
Line 169... Line 165...
169   165  
170 gpio-controller; 166 gpio-controller;
Line 171... Line 167...
171 #gpio-cells = <2>; 167 #gpio-cells = <2>;
172   168  
173 ralink,gpio-base = <72>; 169 ralink,gpio-base = <72>;
174 ralink,nr-gpio = <1>; 170 ralink,num-gpios = <1>;
175 ralink,register-map = [ 00 04 08 0c 171 ralink,register-map = [ 00 04 08 0c
Line 176... Line 172...
176 10 14 18 1c 172 10 14 18 1c
Line 332... Line 328...
332 ralink,group = "uartf"; 328 ralink,group = "uartf";
333 ralink,function = "gpio i2s"; 329 ralink,function = "gpio i2s";
334 }; 330 };
335 }; 331 };
Line 336... Line 332...
336   332  
337 spi_pins: spi_pins { 333 spi_pins: spi {
338 spi_pins { 334 spi {
339 ralink,group = "spi"; 335 ralink,group = "spi";
340 ralink,function = "spi"; 336 ralink,function = "spi";
341 }; 337 };
Line 342... Line 338...
342 }; 338 };
343   339  
344 spi_cs1: spi1 { 340 spi_cs1: spi1 {
345 spi1 { 341 spi1 {
346 ralink,group = "spi refclk"; 342 ralink,group = "spi_cs1";
347 ralink,function = "spi refclk"; 343 ralink,function = "spi_cs1";
Line 348... Line 344...
348 }; 344 };
349 }; 345 };
350   346  
351 i2c_pins: i2c_pins { 347 i2c_pins: i2c {
352 i2c_pins { 348 i2c {
353 ralink,group = "i2c"; 349 ralink,group = "i2c";
Line 415... Line 411...
415 pa { 411 pa {
416 ralink,group = "pa"; 412 ralink,group = "pa";
417 ralink,function = "pa"; 413 ralink,function = "pa";
418 }; 414 };
419 }; 415 };
420   -  
421 sdhci_pins: sdhci { -  
422 sdhci { -  
423 ralink,group = "nd_sd"; -  
424 ralink,function = "sd"; -  
425 }; -  
426 }; -  
427 }; 416 };
Line 428... Line 417...
428   417  
429 rstctrl: rstctrl { 418 rstctrl: rstctrl {
430 compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset"; 419 compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset";
Line 501... Line 490...
501 reg = <0x10130000 0x4000>; 490 reg = <0x10130000 0x4000>;
Line 502... Line 491...
502   491  
503 interrupt-parent = <&intc>; 492 interrupt-parent = <&intc>;
Line 504... Line -...
504 interrupts = <14>; -  
505   -  
506 pinctrl-names = "default"; -  
507 pinctrl-0 = <&sdhci_pins>; 493 interrupts = <14>;
508   494  
Line 509... Line 495...
509 status = "disabled"; 495 status = "disabled";
510 }; -  
511   -  
512 ehci: ehci@101c0000 { 496 };
513 #address-cells = <1>; 497  
Line 514... Line 498...
514 #size-cells = <0>; 498 ehci: ehci@101c0000 {
515 compatible = "generic-ehci"; 499 compatible = "generic-ehci";
Line 516... Line 500...
516 reg = <0x101c0000 0x1000>; 500 reg = <0x101c0000 0x1000>;
517   501  
Line 518... Line 502...
518 interrupt-parent = <&intc>; 502 interrupt-parent = <&intc>;
519 interrupts = <18>; -  
520   -  
521 phys = <&usbphy>; -  
522 phy-names = "usb"; -  
523   -  
524 status = "disabled"; 503 interrupts = <18>;
Line 525... Line 504...
525   504  
526 ehci_port1: port@1 { -  
527 reg = <1>; -  
528 #trigger-source-cells = <0>; 505 phys = <&usbphy>;
529 }; 506 phy-names = "usb";
Line 530... Line 507...
530 }; 507  
531   508 status = "disabled";
Line 532... Line 509...
532 ohci: ohci@101c1000 { 509 };
533 #address-cells = <1>; 510  
Line 534... Line 511...
534 #size-cells = <0>; 511 ohci: ohci@101c1000 {
535 compatible = "generic-ohci"; -  
536 reg = <0x101c1000 0x1000>; -  
537   -  
538 interrupt-parent = <&intc>; -  
539 interrupts = <18>; -  
540   512 compatible = "generic-ohci";
Line 541... Line 513...
541 phys = <&usbphy>; 513 reg = <0x101c1000 0x1000>;
542 phy-names = "usb"; 514  
543   515 interrupt-parent = <&intc>;
Line 577... Line 549...
577 0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */ 549 0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */
578 >; 550 >;
Line 579... Line 551...
579   551  
Line 580... Line 552...
580 status = "disabled"; 552 status = "disabled";
581   553  
Line 582... Line 554...
582 pcie0: pcie@0,0 { 554 pcie-bridge {
583 reg = <0x0000 0 0 0 0>; 555 reg = <0x0000 0 0 0 0>;
Line 584... Line 556...
584   556  
585 #address-cells = <3>; -  
586 #size-cells = <2>; -  
587   557 #address-cells = <3>;
588 device_type = "pci"; 558 #size-cells = <2>;
Line 589... Line 559...
589   559  
590 ranges; 560 device_type = "pci";