diff options
author | Stefan Roese <sr@denx.de> | 2008-01-16 04:00:00 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-02-15 22:35:30 -0500 |
commit | e563db977f58836c30ce3ee7cb6719c47feac4be (patch) | |
tree | 5fe3eb2f0761e615f8983ce3a6b34d272b7f3123 /arch/powerpc/boot | |
parent | 7fe5f10ed032251f35258be2ee5296bca4299471 (diff) |
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
Remove all "i2c" and "xxmii-interface" (rgmii etc) device_type entries
from the 4xx dts files.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/bamboo.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/ebony.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/katmai.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/kilauea.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/makalu.dts | 3 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/rainier.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/sequoia.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/taishan.dts | 4 |
8 files changed, 0 insertions, 25 deletions
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts index 29f1a6f3e373..7dc37c9a7446 100644 --- a/arch/powerpc/boot/dts/bamboo.dts +++ b/arch/powerpc/boot/dts/bamboo.dts | |||
@@ -185,7 +185,6 @@ | |||
185 | }; | 185 | }; |
186 | 186 | ||
187 | IIC0: i2c@ef600700 { | 187 | IIC0: i2c@ef600700 { |
188 | device_type = "i2c"; | ||
189 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; | 188 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; |
190 | reg = <ef600700 14>; | 189 | reg = <ef600700 14>; |
191 | interrupt-parent = <&UIC0>; | 190 | interrupt-parent = <&UIC0>; |
@@ -193,7 +192,6 @@ | |||
193 | }; | 192 | }; |
194 | 193 | ||
195 | IIC1: i2c@ef600800 { | 194 | IIC1: i2c@ef600800 { |
196 | device_type = "i2c"; | ||
197 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; | 195 | compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic"; |
198 | reg = <ef600800 14>; | 196 | reg = <ef600800 14>; |
199 | interrupt-parent = <&UIC0>; | 197 | interrupt-parent = <&UIC0>; |
@@ -201,7 +199,6 @@ | |||
201 | }; | 199 | }; |
202 | 200 | ||
203 | ZMII0: emac-zmii@ef600d00 { | 201 | ZMII0: emac-zmii@ef600d00 { |
204 | device_type = "zmii-interface"; | ||
205 | compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; | 202 | compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii"; |
206 | reg = <ef600d00 c>; | 203 | reg = <ef600d00 c>; |
207 | }; | 204 | }; |
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts index 7aad135a44b0..0b000cb7ed8b 100644 --- a/arch/powerpc/boot/dts/ebony.dts +++ b/arch/powerpc/boot/dts/ebony.dts | |||
@@ -216,7 +216,6 @@ | |||
216 | 216 | ||
217 | IIC0: i2c@40000400 { | 217 | IIC0: i2c@40000400 { |
218 | /* FIXME */ | 218 | /* FIXME */ |
219 | device_type = "i2c"; | ||
220 | compatible = "ibm,iic-440gp", "ibm,iic"; | 219 | compatible = "ibm,iic-440gp", "ibm,iic"; |
221 | reg = <40000400 14>; | 220 | reg = <40000400 14>; |
222 | interrupt-parent = <&UIC0>; | 221 | interrupt-parent = <&UIC0>; |
@@ -224,7 +223,6 @@ | |||
224 | }; | 223 | }; |
225 | IIC1: i2c@40000500 { | 224 | IIC1: i2c@40000500 { |
226 | /* FIXME */ | 225 | /* FIXME */ |
227 | device_type = "i2c"; | ||
228 | compatible = "ibm,iic-440gp", "ibm,iic"; | 226 | compatible = "ibm,iic-440gp", "ibm,iic"; |
229 | reg = <40000500 14>; | 227 | reg = <40000500 14>; |
230 | interrupt-parent = <&UIC0>; | 228 | interrupt-parent = <&UIC0>; |
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts index 9bdfc0ff3c24..bc32ac7250ec 100644 --- a/arch/powerpc/boot/dts/katmai.dts +++ b/arch/powerpc/boot/dts/katmai.dts | |||
@@ -187,7 +187,6 @@ | |||
187 | }; | 187 | }; |
188 | 188 | ||
189 | IIC0: i2c@10000400 { | 189 | IIC0: i2c@10000400 { |
190 | device_type = "i2c"; | ||
191 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; | 190 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; |
192 | reg = <10000400 14>; | 191 | reg = <10000400 14>; |
193 | interrupt-parent = <&UIC0>; | 192 | interrupt-parent = <&UIC0>; |
@@ -195,7 +194,6 @@ | |||
195 | }; | 194 | }; |
196 | 195 | ||
197 | IIC1: i2c@10000500 { | 196 | IIC1: i2c@10000500 { |
198 | device_type = "i2c"; | ||
199 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; | 197 | compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic"; |
200 | reg = <10000500 14>; | 198 | reg = <10000500 14>; |
201 | interrupt-parent = <&UIC0>; | 199 | interrupt-parent = <&UIC0>; |
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index 67c7ea179a07..8baef61f31cd 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts | |||
@@ -182,7 +182,6 @@ | |||
182 | }; | 182 | }; |
183 | 183 | ||
184 | IIC0: i2c@ef600400 { | 184 | IIC0: i2c@ef600400 { |
185 | device_type = "i2c"; | ||
186 | compatible = "ibm,iic-405ex", "ibm,iic"; | 185 | compatible = "ibm,iic-405ex", "ibm,iic"; |
187 | reg = <ef600400 14>; | 186 | reg = <ef600400 14>; |
188 | interrupt-parent = <&UIC0>; | 187 | interrupt-parent = <&UIC0>; |
@@ -190,7 +189,6 @@ | |||
190 | }; | 189 | }; |
191 | 190 | ||
192 | IIC1: i2c@ef600500 { | 191 | IIC1: i2c@ef600500 { |
193 | device_type = "i2c"; | ||
194 | compatible = "ibm,iic-405ex", "ibm,iic"; | 192 | compatible = "ibm,iic-405ex", "ibm,iic"; |
195 | reg = <ef600500 14>; | 193 | reg = <ef600500 14>; |
196 | interrupt-parent = <&UIC0>; | 194 | interrupt-parent = <&UIC0>; |
@@ -199,7 +197,6 @@ | |||
199 | 197 | ||
200 | 198 | ||
201 | RGMII0: emac-rgmii@ef600b00 { | 199 | RGMII0: emac-rgmii@ef600b00 { |
202 | device_type = "rgmii-interface"; | ||
203 | compatible = "ibm,rgmii-405ex", "ibm,rgmii"; | 200 | compatible = "ibm,rgmii-405ex", "ibm,rgmii"; |
204 | reg = <ef600b00 104>; | 201 | reg = <ef600b00 104>; |
205 | has-mdio; | 202 | has-mdio; |
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts index bdd70e4596ae..710c01168179 100644 --- a/arch/powerpc/boot/dts/makalu.dts +++ b/arch/powerpc/boot/dts/makalu.dts | |||
@@ -182,7 +182,6 @@ | |||
182 | }; | 182 | }; |
183 | 183 | ||
184 | IIC0: i2c@ef600400 { | 184 | IIC0: i2c@ef600400 { |
185 | device_type = "i2c"; | ||
186 | compatible = "ibm,iic-405ex", "ibm,iic"; | 185 | compatible = "ibm,iic-405ex", "ibm,iic"; |
187 | reg = <ef600400 14>; | 186 | reg = <ef600400 14>; |
188 | interrupt-parent = <&UIC0>; | 187 | interrupt-parent = <&UIC0>; |
@@ -190,7 +189,6 @@ | |||
190 | }; | 189 | }; |
191 | 190 | ||
192 | IIC1: i2c@ef600500 { | 191 | IIC1: i2c@ef600500 { |
193 | device_type = "i2c"; | ||
194 | compatible = "ibm,iic-405ex", "ibm,iic"; | 192 | compatible = "ibm,iic-405ex", "ibm,iic"; |
195 | reg = <ef600500 14>; | 193 | reg = <ef600500 14>; |
196 | interrupt-parent = <&UIC0>; | 194 | interrupt-parent = <&UIC0>; |
@@ -199,7 +197,6 @@ | |||
199 | 197 | ||
200 | 198 | ||
201 | RGMII0: emac-rgmii@ef600b00 { | 199 | RGMII0: emac-rgmii@ef600b00 { |
202 | device_type = "rgmii-interface"; | ||
203 | compatible = "ibm,rgmii-405ex", "ibm,rgmii"; | 200 | compatible = "ibm,rgmii-405ex", "ibm,rgmii"; |
204 | reg = <ef600b00 104>; | 201 | reg = <ef600b00 104>; |
205 | has-mdio; | 202 | has-mdio; |
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts index d3c2ac394ce9..f947c75a2e94 100644 --- a/arch/powerpc/boot/dts/rainier.dts +++ b/arch/powerpc/boot/dts/rainier.dts | |||
@@ -229,7 +229,6 @@ | |||
229 | }; | 229 | }; |
230 | 230 | ||
231 | IIC0: i2c@ef600700 { | 231 | IIC0: i2c@ef600700 { |
232 | device_type = "i2c"; | ||
233 | compatible = "ibm,iic-440grx", "ibm,iic"; | 232 | compatible = "ibm,iic-440grx", "ibm,iic"; |
234 | reg = <ef600700 14>; | 233 | reg = <ef600700 14>; |
235 | interrupt-parent = <&UIC0>; | 234 | interrupt-parent = <&UIC0>; |
@@ -237,7 +236,6 @@ | |||
237 | }; | 236 | }; |
238 | 237 | ||
239 | IIC1: i2c@ef600800 { | 238 | IIC1: i2c@ef600800 { |
240 | device_type = "i2c"; | ||
241 | compatible = "ibm,iic-440grx", "ibm,iic"; | 239 | compatible = "ibm,iic-440grx", "ibm,iic"; |
242 | reg = <ef600800 14>; | 240 | reg = <ef600800 14>; |
243 | interrupt-parent = <&UIC0>; | 241 | interrupt-parent = <&UIC0>; |
@@ -245,13 +243,11 @@ | |||
245 | }; | 243 | }; |
246 | 244 | ||
247 | ZMII0: emac-zmii@ef600d00 { | 245 | ZMII0: emac-zmii@ef600d00 { |
248 | device_type = "zmii-interface"; | ||
249 | compatible = "ibm,zmii-440grx", "ibm,zmii"; | 246 | compatible = "ibm,zmii-440grx", "ibm,zmii"; |
250 | reg = <ef600d00 c>; | 247 | reg = <ef600d00 c>; |
251 | }; | 248 | }; |
252 | 249 | ||
253 | RGMII0: emac-rgmii@ef601000 { | 250 | RGMII0: emac-rgmii@ef601000 { |
254 | device_type = "rgmii-interface"; | ||
255 | compatible = "ibm,rgmii-440grx", "ibm,rgmii"; | 251 | compatible = "ibm,rgmii-440grx", "ibm,rgmii"; |
256 | reg = <ef601000 8>; | 252 | reg = <ef601000 8>; |
257 | has-mdio; | 253 | has-mdio; |
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts index 5c13d46f441d..8db9515d7dc3 100644 --- a/arch/powerpc/boot/dts/sequoia.dts +++ b/arch/powerpc/boot/dts/sequoia.dts | |||
@@ -244,7 +244,6 @@ | |||
244 | }; | 244 | }; |
245 | 245 | ||
246 | IIC0: i2c@ef600700 { | 246 | IIC0: i2c@ef600700 { |
247 | device_type = "i2c"; | ||
248 | compatible = "ibm,iic-440epx", "ibm,iic"; | 247 | compatible = "ibm,iic-440epx", "ibm,iic"; |
249 | reg = <ef600700 14>; | 248 | reg = <ef600700 14>; |
250 | interrupt-parent = <&UIC0>; | 249 | interrupt-parent = <&UIC0>; |
@@ -252,7 +251,6 @@ | |||
252 | }; | 251 | }; |
253 | 252 | ||
254 | IIC1: i2c@ef600800 { | 253 | IIC1: i2c@ef600800 { |
255 | device_type = "i2c"; | ||
256 | compatible = "ibm,iic-440epx", "ibm,iic"; | 254 | compatible = "ibm,iic-440epx", "ibm,iic"; |
257 | reg = <ef600800 14>; | 255 | reg = <ef600800 14>; |
258 | interrupt-parent = <&UIC0>; | 256 | interrupt-parent = <&UIC0>; |
@@ -260,13 +258,11 @@ | |||
260 | }; | 258 | }; |
261 | 259 | ||
262 | ZMII0: emac-zmii@ef600d00 { | 260 | ZMII0: emac-zmii@ef600d00 { |
263 | device_type = "zmii-interface"; | ||
264 | compatible = "ibm,zmii-440epx", "ibm,zmii"; | 261 | compatible = "ibm,zmii-440epx", "ibm,zmii"; |
265 | reg = <ef600d00 c>; | 262 | reg = <ef600d00 c>; |
266 | }; | 263 | }; |
267 | 264 | ||
268 | RGMII0: emac-rgmii@ef601000 { | 265 | RGMII0: emac-rgmii@ef601000 { |
269 | device_type = "rgmii-interface"; | ||
270 | compatible = "ibm,rgmii-440epx", "ibm,rgmii"; | 266 | compatible = "ibm,rgmii-440epx", "ibm,rgmii"; |
271 | reg = <ef601000 8>; | 267 | reg = <ef601000 8>; |
272 | has-mdio; | 268 | has-mdio; |
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts index 0706a4a13b9f..8278068c802c 100644 --- a/arch/powerpc/boot/dts/taishan.dts +++ b/arch/powerpc/boot/dts/taishan.dts | |||
@@ -203,7 +203,6 @@ | |||
203 | 203 | ||
204 | IIC0: i2c@40000400 { | 204 | IIC0: i2c@40000400 { |
205 | /* FIXME */ | 205 | /* FIXME */ |
206 | device_type = "i2c"; | ||
207 | compatible = "ibm,iic-440gp", "ibm,iic"; | 206 | compatible = "ibm,iic-440gp", "ibm,iic"; |
208 | reg = <40000400 14>; | 207 | reg = <40000400 14>; |
209 | interrupt-parent = <&UIC0>; | 208 | interrupt-parent = <&UIC0>; |
@@ -211,7 +210,6 @@ | |||
211 | }; | 210 | }; |
212 | IIC1: i2c@40000500 { | 211 | IIC1: i2c@40000500 { |
213 | /* FIXME */ | 212 | /* FIXME */ |
214 | device_type = "i2c"; | ||
215 | compatible = "ibm,iic-440gp", "ibm,iic"; | 213 | compatible = "ibm,iic-440gp", "ibm,iic"; |
216 | reg = <40000500 14>; | 214 | reg = <40000500 14>; |
217 | interrupt-parent = <&UIC0>; | 215 | interrupt-parent = <&UIC0>; |
@@ -225,13 +223,11 @@ | |||
225 | }; | 223 | }; |
226 | 224 | ||
227 | ZMII0: emac-zmii@40000780 { | 225 | ZMII0: emac-zmii@40000780 { |
228 | device_type = "zgmii-interface"; | ||
229 | compatible = "ibm,zmii-440gx", "ibm,zmii"; | 226 | compatible = "ibm,zmii-440gx", "ibm,zmii"; |
230 | reg = <40000780 c>; | 227 | reg = <40000780 c>; |
231 | }; | 228 | }; |
232 | 229 | ||
233 | RGMII0: emac-rgmii@40000790 { | 230 | RGMII0: emac-rgmii@40000790 { |
234 | device_type = "rgmii-interface"; | ||
235 | compatible = "ibm,rgmii"; | 231 | compatible = "ibm,rgmii"; |
236 | reg = <40000790 8>; | 232 | reg = <40000790 8>; |
237 | }; | 233 | }; |