diff options
-rw-r--r-- | arch/powerpc/boot/dts/cm5200.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/digsy_mtc.dts | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/lite5200b.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/media5200.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/motionpro.dts | 10 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mucmc52.dts | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/pcm030.dts | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/pcm032.dts | 6 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/uc101.dts | 6 |
9 files changed, 26 insertions, 26 deletions
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts index dd3860846f15..9369dcd00a5f 100644 --- a/arch/powerpc/boot/dts/cm5200.dts +++ b/arch/powerpc/boot/dts/cm5200.dts | |||
@@ -160,25 +160,25 @@ | |||
160 | reg = <0x1f00 0x100>; | 160 | reg = <0x1f00 0x100>; |
161 | }; | 161 | }; |
162 | 162 | ||
163 | serial@2000 { // PSC1 | 163 | psc@2000 { // PSC1 |
164 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 164 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
165 | reg = <0x2000 0x100>; | 165 | reg = <0x2000 0x100>; |
166 | interrupts = <2 1 0>; | 166 | interrupts = <2 1 0>; |
167 | }; | 167 | }; |
168 | 168 | ||
169 | serial@2200 { // PSC2 | 169 | psc@2200 { // PSC2 |
170 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 170 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
171 | reg = <0x2200 0x100>; | 171 | reg = <0x2200 0x100>; |
172 | interrupts = <2 2 0>; | 172 | interrupts = <2 2 0>; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | serial@2400 { // PSC3 | 175 | psc@2400 { // PSC3 |
176 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 176 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
177 | reg = <0x2400 0x100>; | 177 | reg = <0x2400 0x100>; |
178 | interrupts = <2 3 0>; | 178 | interrupts = <2 3 0>; |
179 | }; | 179 | }; |
180 | 180 | ||
181 | serial@2c00 { // PSC6 | 181 | psc@2c00 { // PSC6 |
182 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 182 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
183 | reg = <0x2c00 0x100>; | 183 | reg = <0x2c00 0x100>; |
184 | interrupts = <2 4 0>; | 184 | interrupts = <2 4 0>; |
diff --git a/arch/powerpc/boot/dts/digsy_mtc.dts b/arch/powerpc/boot/dts/digsy_mtc.dts index 8e9be6bfe23e..f0592de71bb6 100644 --- a/arch/powerpc/boot/dts/digsy_mtc.dts +++ b/arch/powerpc/boot/dts/digsy_mtc.dts | |||
@@ -155,13 +155,13 @@ | |||
155 | reg = <0x1f00 0x100>; | 155 | reg = <0x1f00 0x100>; |
156 | }; | 156 | }; |
157 | 157 | ||
158 | serial@2600 { // PSC4 | 158 | psc@2600 { // PSC4 |
159 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 159 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
160 | reg = <0x2600 0x100>; | 160 | reg = <0x2600 0x100>; |
161 | interrupts = <2 11 0>; | 161 | interrupts = <2 11 0>; |
162 | }; | 162 | }; |
163 | 163 | ||
164 | serial@2800 { // PSC5 | 164 | psc@2800 { // PSC5 |
165 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 165 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
166 | reg = <0x2800 0x100>; | 166 | reg = <0x2800 0x100>; |
167 | interrupts = <2 12 0>; | 167 | interrupts = <2 12 0>; |
@@ -217,7 +217,7 @@ | |||
217 | }; | 217 | }; |
218 | }; | 218 | }; |
219 | 219 | ||
220 | lpb { | 220 | localbus { |
221 | compatible = "fsl,mpc5200b-lpb","simple-bus"; | 221 | compatible = "fsl,mpc5200b-lpb","simple-bus"; |
222 | #address-cells = <2>; | 222 | #address-cells = <2>; |
223 | #size-cells = <1>; | 223 | #size-cells = <1>; |
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index 59702ace900f..a74b79084059 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
@@ -172,7 +172,7 @@ | |||
172 | reg = <0x1f00 0x100>; | 172 | reg = <0x1f00 0x100>; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | serial@2000 { // PSC1 | 175 | psc@2000 { // PSC1 |
176 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 176 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
177 | cell-index = <0>; | 177 | cell-index = <0>; |
178 | reg = <0x2000 0x100>; | 178 | reg = <0x2000 0x100>; |
diff --git a/arch/powerpc/boot/dts/media5200.dts b/arch/powerpc/boot/dts/media5200.dts index 0c3902bc5b6a..a70ef680f301 100644 --- a/arch/powerpc/boot/dts/media5200.dts +++ b/arch/powerpc/boot/dts/media5200.dts | |||
@@ -183,7 +183,7 @@ | |||
183 | }; | 183 | }; |
184 | 184 | ||
185 | // PSC6 in uart mode | 185 | // PSC6 in uart mode |
186 | console: serial@2c00 { // PSC6 | 186 | console: psc@2c00 { // PSC6 |
187 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 187 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
188 | cell-index = <5>; | 188 | cell-index = <5>; |
189 | port-number = <0>; // Logical port assignment | 189 | port-number = <0>; // Logical port assignment |
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts index 6ca4fc144a33..f6261ea0972b 100644 --- a/arch/powerpc/boot/dts/motionpro.dts +++ b/arch/powerpc/boot/dts/motionpro.dts | |||
@@ -100,7 +100,7 @@ | |||
100 | interrupts = <1 14 0>; | 100 | interrupts = <1 14 0>; |
101 | }; | 101 | }; |
102 | 102 | ||
103 | motionpro-led@660 { // Motion-PRO status LED | 103 | timer@660 { // Motion-PRO status LED |
104 | compatible = "promess,motionpro-led"; | 104 | compatible = "promess,motionpro-led"; |
105 | label = "motionpro-statusled"; | 105 | label = "motionpro-statusled"; |
106 | reg = <0x660 0x10>; | 106 | reg = <0x660 0x10>; |
@@ -108,7 +108,7 @@ | |||
108 | blink-delay = <100>; // 100 msec | 108 | blink-delay = <100>; // 100 msec |
109 | }; | 109 | }; |
110 | 110 | ||
111 | motionpro-led@670 { // Motion-PRO ready LED | 111 | timer@670 { // Motion-PRO ready LED |
112 | compatible = "promess,motionpro-led"; | 112 | compatible = "promess,motionpro-led"; |
113 | label = "motionpro-readyled"; | 113 | label = "motionpro-readyled"; |
114 | reg = <0x670 0x10>; | 114 | reg = <0x670 0x10>; |
@@ -169,14 +169,14 @@ | |||
169 | reg = <0x1f00 0x100>; | 169 | reg = <0x1f00 0x100>; |
170 | }; | 170 | }; |
171 | 171 | ||
172 | serial@2000 { // PSC1 | 172 | psc@2000 { // PSC1 |
173 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 173 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
174 | reg = <0x2000 0x100>; | 174 | reg = <0x2000 0x100>; |
175 | interrupts = <2 1 0>; | 175 | interrupts = <2 1 0>; |
176 | }; | 176 | }; |
177 | 177 | ||
178 | // PSC2 in spi master mode | 178 | // PSC2 in spi master mode |
179 | spi@2200 { // PSC2 | 179 | psc@2200 { // PSC2 |
180 | compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi"; | 180 | compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi"; |
181 | cell-index = <1>; | 181 | cell-index = <1>; |
182 | reg = <0x2200 0x100>; | 182 | reg = <0x2200 0x100>; |
@@ -184,7 +184,7 @@ | |||
184 | }; | 184 | }; |
185 | 185 | ||
186 | // PSC5 in uart mode | 186 | // PSC5 in uart mode |
187 | serial@2800 { // PSC5 | 187 | psc@2800 { // PSC5 |
188 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 188 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
189 | reg = <0x2800 0x100>; | 189 | reg = <0x2800 0x100>; |
190 | interrupts = <2 12 0>; | 190 | interrupts = <2 12 0>; |
diff --git a/arch/powerpc/boot/dts/mucmc52.dts b/arch/powerpc/boot/dts/mucmc52.dts index b72a7581d798..8dc212d9238b 100644 --- a/arch/powerpc/boot/dts/mucmc52.dts +++ b/arch/powerpc/boot/dts/mucmc52.dts | |||
@@ -126,19 +126,19 @@ | |||
126 | reg = <0x1f00 0x100>; | 126 | reg = <0x1f00 0x100>; |
127 | }; | 127 | }; |
128 | 128 | ||
129 | serial@2000 { /* PSC1 in UART mode */ | 129 | psc@2000 { /* PSC1 in UART mode */ |
130 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 130 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
131 | reg = <0x2000 0x100>; | 131 | reg = <0x2000 0x100>; |
132 | interrupts = <2 1 0>; | 132 | interrupts = <2 1 0>; |
133 | }; | 133 | }; |
134 | 134 | ||
135 | serial@2200 { /* PSC2 in UART mode */ | 135 | psc@2200 { /* PSC2 in UART mode */ |
136 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 136 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
137 | reg = <0x2200 0x100>; | 137 | reg = <0x2200 0x100>; |
138 | interrupts = <2 2 0>; | 138 | interrupts = <2 2 0>; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | serial@2c00 { /* PSC6 in UART mode */ | 141 | psc@2c00 { /* PSC6 in UART mode */ |
142 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 142 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
143 | reg = <0x2c00 0x100>; | 143 | reg = <0x2c00 0x100>; |
144 | interrupts = <2 4 0>; | 144 | interrupts = <2 4 0>; |
diff --git a/arch/powerpc/boot/dts/pcm030.dts b/arch/powerpc/boot/dts/pcm030.dts index e7c36bc88fa0..34ab3bbcf990 100644 --- a/arch/powerpc/boot/dts/pcm030.dts +++ b/arch/powerpc/boot/dts/pcm030.dts | |||
@@ -185,7 +185,7 @@ | |||
185 | reg = <0x1f00 0x100>; | 185 | reg = <0x1f00 0x100>; |
186 | }; | 186 | }; |
187 | 187 | ||
188 | ac97@2000 { /* PSC1 in ac97 mode */ | 188 | psc@2000 { /* PSC1 in ac97 mode */ |
189 | compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; | 189 | compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; |
190 | cell-index = <0>; | 190 | cell-index = <0>; |
191 | reg = <0x2000 0x100>; | 191 | reg = <0x2000 0x100>; |
@@ -194,7 +194,7 @@ | |||
194 | 194 | ||
195 | /* PSC2 port is used by CAN1/2 */ | 195 | /* PSC2 port is used by CAN1/2 */ |
196 | 196 | ||
197 | serial@2400 { /* PSC3 in UART mode */ | 197 | psc@2400 { /* PSC3 in UART mode */ |
198 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 198 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
199 | cell-index = <2>; | 199 | cell-index = <2>; |
200 | reg = <0x2400 0x100>; | 200 | reg = <0x2400 0x100>; |
@@ -205,7 +205,7 @@ | |||
205 | 205 | ||
206 | /* PSC5 is ??? */ | 206 | /* PSC5 is ??? */ |
207 | 207 | ||
208 | serial@2c00 { /* PSC6 in UART mode */ | 208 | psc@2c00 { /* PSC6 in UART mode */ |
209 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 209 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
210 | cell-index = <5>; | 210 | cell-index = <5>; |
211 | reg = <0x2c00 0x100>; | 211 | reg = <0x2c00 0x100>; |
diff --git a/arch/powerpc/boot/dts/pcm032.dts b/arch/powerpc/boot/dts/pcm032.dts index e175e2c601b5..29fde83b99b3 100644 --- a/arch/powerpc/boot/dts/pcm032.dts +++ b/arch/powerpc/boot/dts/pcm032.dts | |||
@@ -185,7 +185,7 @@ | |||
185 | reg = <0x1f00 0x100>; | 185 | reg = <0x1f00 0x100>; |
186 | }; | 186 | }; |
187 | 187 | ||
188 | ac97@2000 { /* PSC1 is ac97 */ | 188 | psc@2000 { /* PSC1 is ac97 */ |
189 | compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97"; | 189 | compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97"; |
190 | cell-index = <0>; | 190 | cell-index = <0>; |
191 | reg = <0x2000 0x100>; | 191 | reg = <0x2000 0x100>; |
@@ -194,7 +194,7 @@ | |||
194 | 194 | ||
195 | /* PSC2 port is used by CAN1/2 */ | 195 | /* PSC2 port is used by CAN1/2 */ |
196 | 196 | ||
197 | serial@2400 { /* PSC3 in UART mode */ | 197 | psc@2400 { /* PSC3 in UART mode */ |
198 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 198 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
199 | cell-index = <2>; | 199 | cell-index = <2>; |
200 | reg = <0x2400 0x100>; | 200 | reg = <0x2400 0x100>; |
@@ -205,7 +205,7 @@ | |||
205 | 205 | ||
206 | /* PSC5 is ??? */ | 206 | /* PSC5 is ??? */ |
207 | 207 | ||
208 | serial@2c00 { /* PSC6 in UART mode */ | 208 | psc@2c00 { /* PSC6 in UART mode */ |
209 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 209 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
210 | cell-index = <5>; | 210 | cell-index = <5>; |
211 | reg = <0x2c00 0x100>; | 211 | reg = <0x2c00 0x100>; |
diff --git a/arch/powerpc/boot/dts/uc101.dts b/arch/powerpc/boot/dts/uc101.dts index 019264c62904..e00441a3e5a7 100644 --- a/arch/powerpc/boot/dts/uc101.dts +++ b/arch/powerpc/boot/dts/uc101.dts | |||
@@ -158,19 +158,19 @@ | |||
158 | reg = <0x1f00 0x100>; | 158 | reg = <0x1f00 0x100>; |
159 | }; | 159 | }; |
160 | 160 | ||
161 | serial@2000 { /* PSC1 in UART mode */ | 161 | psc@2000 { /* PSC1 in UART mode */ |
162 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 162 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
163 | reg = <0x2000 0x100>; | 163 | reg = <0x2000 0x100>; |
164 | interrupts = <2 1 0>; | 164 | interrupts = <2 1 0>; |
165 | }; | 165 | }; |
166 | 166 | ||
167 | serial@2200 { /* PSC2 in UART mode */ | 167 | psc@2200 { /* PSC2 in UART mode */ |
168 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 168 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
169 | reg = <0x2200 0x100>; | 169 | reg = <0x2200 0x100>; |
170 | interrupts = <2 2 0>; | 170 | interrupts = <2 2 0>; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | serial@2c00 { /* PSC6 in UART mode */ | 173 | psc@2c00 { /* PSC6 in UART mode */ |
174 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; | 174 | compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart"; |
175 | reg = <0x2c00 0x100>; | 175 | reg = <0x2c00 0x100>; |
176 | interrupts = <2 4 0>; | 176 | interrupts = <2 4 0>; |