From 1d4b7c40a772c2ad5384897907cf745d0b5210d3 Mon Sep 17 00:00:00 2001 From: John Bonesio Date: Wed, 17 Nov 2010 15:28:30 -0800 Subject: [PATCH] --- yaml --- r: 227727 b: refs/heads/master c: abf1e27fbb4200a010b8fcb1be8cc02485744862 h: refs/heads/master i: 227725: 62644fe943292f31427e41496864a3f5b7488d05 227723: 727c1a17a7ab7c0810fd674690dbc17a9a6a7c05 227719: 34c966800ca339049d404aa40aea98d10b3017d7 227711: 589d8b2048037c880d17437651336d1e0b7178b3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/dts/cm5200.dts | 8 ++++---- trunk/arch/powerpc/boot/dts/digsy_mtc.dts | 6 +++--- trunk/arch/powerpc/boot/dts/lite5200b.dts | 2 +- trunk/arch/powerpc/boot/dts/media5200.dts | 2 +- trunk/arch/powerpc/boot/dts/motionpro.dts | 10 +++++----- trunk/arch/powerpc/boot/dts/mucmc52.dts | 6 +++--- trunk/arch/powerpc/boot/dts/pcm030.dts | 6 +++--- trunk/arch/powerpc/boot/dts/pcm032.dts | 6 +++--- trunk/arch/powerpc/boot/dts/uc101.dts | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index d4ec56eafeec..071562f99cac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 658f29a51e9830e620bb9a1ce3534b318a38bfeb +refs/heads/master: abf1e27fbb4200a010b8fcb1be8cc02485744862 diff --git a/trunk/arch/powerpc/boot/dts/cm5200.dts b/trunk/arch/powerpc/boot/dts/cm5200.dts index dd3860846f15..9369dcd00a5f 100644 --- a/trunk/arch/powerpc/boot/dts/cm5200.dts +++ b/trunk/arch/powerpc/boot/dts/cm5200.dts @@ -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>; diff --git a/trunk/arch/powerpc/boot/dts/digsy_mtc.dts b/trunk/arch/powerpc/boot/dts/digsy_mtc.dts index 8e9be6bfe23e..f0592de71bb6 100644 --- a/trunk/arch/powerpc/boot/dts/digsy_mtc.dts +++ b/trunk/arch/powerpc/boot/dts/digsy_mtc.dts @@ -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>; @@ -217,7 +217,7 @@ }; }; - lpb { + localbus { compatible = "fsl,mpc5200b-lpb","simple-bus"; #address-cells = <2>; #size-cells = <1>; diff --git a/trunk/arch/powerpc/boot/dts/lite5200b.dts b/trunk/arch/powerpc/boot/dts/lite5200b.dts index 59702ace900f..a74b79084059 100644 --- a/trunk/arch/powerpc/boot/dts/lite5200b.dts +++ b/trunk/arch/powerpc/boot/dts/lite5200b.dts @@ -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>; diff --git a/trunk/arch/powerpc/boot/dts/media5200.dts b/trunk/arch/powerpc/boot/dts/media5200.dts index 0c3902bc5b6a..a70ef680f301 100644 --- a/trunk/arch/powerpc/boot/dts/media5200.dts +++ b/trunk/arch/powerpc/boot/dts/media5200.dts @@ -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 diff --git a/trunk/arch/powerpc/boot/dts/motionpro.dts b/trunk/arch/powerpc/boot/dts/motionpro.dts index 6ca4fc144a33..f6261ea0972b 100644 --- a/trunk/arch/powerpc/boot/dts/motionpro.dts +++ b/trunk/arch/powerpc/boot/dts/motionpro.dts @@ -100,7 +100,7 @@ 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>; @@ -108,7 +108,7 @@ 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>; @@ -169,14 +169,14 @@ 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>; @@ -184,7 +184,7 @@ }; // 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>; diff --git a/trunk/arch/powerpc/boot/dts/mucmc52.dts b/trunk/arch/powerpc/boot/dts/mucmc52.dts index b72a7581d798..8dc212d9238b 100644 --- a/trunk/arch/powerpc/boot/dts/mucmc52.dts +++ b/trunk/arch/powerpc/boot/dts/mucmc52.dts @@ -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>; diff --git a/trunk/arch/powerpc/boot/dts/pcm030.dts b/trunk/arch/powerpc/boot/dts/pcm030.dts index e7c36bc88fa0..34ab3bbcf990 100644 --- a/trunk/arch/powerpc/boot/dts/pcm030.dts +++ b/trunk/arch/powerpc/boot/dts/pcm030.dts @@ -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>; @@ -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>; @@ -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>; diff --git a/trunk/arch/powerpc/boot/dts/pcm032.dts b/trunk/arch/powerpc/boot/dts/pcm032.dts index e175e2c601b5..29fde83b99b3 100644 --- a/trunk/arch/powerpc/boot/dts/pcm032.dts +++ b/trunk/arch/powerpc/boot/dts/pcm032.dts @@ -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>; @@ -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>; @@ -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>; diff --git a/trunk/arch/powerpc/boot/dts/uc101.dts b/trunk/arch/powerpc/boot/dts/uc101.dts index 019264c62904..e00441a3e5a7 100644 --- a/trunk/arch/powerpc/boot/dts/uc101.dts +++ b/trunk/arch/powerpc/boot/dts/uc101.dts @@ -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>;