Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 227727
b: refs/heads/master
c: abf1e27
h: refs/heads/master
i:
  227725: 62644fe
  227723: 727c1a1
  227719: 34c9668
  227711: 589d8b2
v: v3
  • Loading branch information
John Bonesio authored and Grant Likely committed Jan 3, 2011
1 parent 2385632 commit 1d4b7c4
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 658f29a51e9830e620bb9a1ce3534b318a38bfeb
refs/heads/master: abf1e27fbb4200a010b8fcb1be8cc02485744862
8 changes: 4 additions & 4 deletions trunk/arch/powerpc/boot/dts/cm5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,25 +160,25 @@
reg = <0x1f00 0x100>;
};

serial@2000 { // PSC1
psc@2000 { // PSC1
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2000 0x100>;
interrupts = <2 1 0>;
};

serial@2200 { // PSC2
psc@2200 { // PSC2
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2200 0x100>;
interrupts = <2 2 0>;
};

serial@2400 { // PSC3
psc@2400 { // PSC3
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2400 0x100>;
interrupts = <2 3 0>;
};

serial@2c00 { // PSC6
psc@2c00 { // PSC6
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2c00 0x100>;
interrupts = <2 4 0>;
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/boot/dts/digsy_mtc.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@
reg = <0x1f00 0x100>;
};

serial@2600 { // PSC4
psc@2600 { // PSC4
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2600 0x100>;
interrupts = <2 11 0>;
};

serial@2800 { // PSC5
psc@2800 { // PSC5
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2800 0x100>;
interrupts = <2 12 0>;
Expand Down Expand Up @@ -217,7 +217,7 @@
};
};

lpb {
localbus {
compatible = "fsl,mpc5200b-lpb","simple-bus";
#address-cells = <2>;
#size-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/boot/dts/lite5200b.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
reg = <0x1f00 0x100>;
};

serial@2000 { // PSC1
psc@2000 { // PSC1
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <0>;
reg = <0x2000 0x100>;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/powerpc/boot/dts/media5200.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
};

// PSC6 in uart mode
console: serial@2c00 { // PSC6
console: psc@2c00 { // PSC6
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <5>;
port-number = <0>; // Logical port assignment
Expand Down
10 changes: 5 additions & 5 deletions trunk/arch/powerpc/boot/dts/motionpro.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@
interrupts = <1 14 0>;
};

motionpro-led@660 { // Motion-PRO status LED
timer@660 { // Motion-PRO status LED
compatible = "promess,motionpro-led";
label = "motionpro-statusled";
reg = <0x660 0x10>;
interrupts = <1 15 0>;
blink-delay = <100>; // 100 msec
};

motionpro-led@670 { // Motion-PRO ready LED
timer@670 { // Motion-PRO ready LED
compatible = "promess,motionpro-led";
label = "motionpro-readyled";
reg = <0x670 0x10>;
Expand Down Expand Up @@ -169,22 +169,22 @@
reg = <0x1f00 0x100>;
};

serial@2000 { // PSC1
psc@2000 { // PSC1
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2000 0x100>;
interrupts = <2 1 0>;
};

// PSC2 in spi master mode
spi@2200 { // PSC2
psc@2200 { // PSC2
compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi";
cell-index = <1>;
reg = <0x2200 0x100>;
interrupts = <2 2 0>;
};

// PSC5 in uart mode
serial@2800 { // PSC5
psc@2800 { // PSC5
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2800 0x100>;
interrupts = <2 12 0>;
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/boot/dts/mucmc52.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,19 @@
reg = <0x1f00 0x100>;
};

serial@2000 { /* PSC1 in UART mode */
psc@2000 { /* PSC1 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2000 0x100>;
interrupts = <2 1 0>;
};

serial@2200 { /* PSC2 in UART mode */
psc@2200 { /* PSC2 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2200 0x100>;
interrupts = <2 2 0>;
};

serial@2c00 { /* PSC6 in UART mode */
psc@2c00 { /* PSC6 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2c00 0x100>;
interrupts = <2 4 0>;
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/boot/dts/pcm030.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
reg = <0x1f00 0x100>;
};

ac97@2000 { /* PSC1 in ac97 mode */
psc@2000 { /* PSC1 in ac97 mode */
compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97";
cell-index = <0>;
reg = <0x2000 0x100>;
Expand All @@ -194,7 +194,7 @@

/* PSC2 port is used by CAN1/2 */

serial@2400 { /* PSC3 in UART mode */
psc@2400 { /* PSC3 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <2>;
reg = <0x2400 0x100>;
Expand All @@ -205,7 +205,7 @@

/* PSC5 is ??? */

serial@2c00 { /* PSC6 in UART mode */
psc@2c00 { /* PSC6 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <5>;
reg = <0x2c00 0x100>;
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/boot/dts/pcm032.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
reg = <0x1f00 0x100>;
};

ac97@2000 { /* PSC1 is ac97 */
psc@2000 { /* PSC1 is ac97 */
compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97";
cell-index = <0>;
reg = <0x2000 0x100>;
Expand All @@ -194,7 +194,7 @@

/* PSC2 port is used by CAN1/2 */

serial@2400 { /* PSC3 in UART mode */
psc@2400 { /* PSC3 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <2>;
reg = <0x2400 0x100>;
Expand All @@ -205,7 +205,7 @@

/* PSC5 is ??? */

serial@2c00 { /* PSC6 in UART mode */
psc@2c00 { /* PSC6 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
cell-index = <5>;
reg = <0x2c00 0x100>;
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/boot/dts/uc101.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,19 @@
reg = <0x1f00 0x100>;
};

serial@2000 { /* PSC1 in UART mode */
psc@2000 { /* PSC1 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2000 0x100>;
interrupts = <2 1 0>;
};

serial@2200 { /* PSC2 in UART mode */
psc@2200 { /* PSC2 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2200 0x100>;
interrupts = <2 2 0>;
};

serial@2c00 { /* PSC6 in UART mode */
psc@2c00 { /* PSC6 in UART mode */
compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
reg = <0x2c00 0x100>;
interrupts = <2 4 0>;
Expand Down

0 comments on commit 1d4b7c4

Please sign in to comment.