diff options
21 files changed, 94 insertions, 38 deletions
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts index ec71ab819fee..1c14dcde6838 100644 --- a/arch/powerpc/boot/dts/kuroboxHD.dts +++ b/arch/powerpc/boot/dts/kuroboxHD.dts | |||
@@ -60,7 +60,7 @@ XXXX add flash parts, rtc, ?? | |||
60 | i2c@80003000 { | 60 | i2c@80003000 { |
61 | #address-cells = <1>; | 61 | #address-cells = <1>; |
62 | #size-cells = <0>; | 62 | #size-cells = <0>; |
63 | device_type = "i2c"; | 63 | cell-index = <0>; |
64 | compatible = "fsl-i2c"; | 64 | compatible = "fsl-i2c"; |
65 | reg = <80003000 1000>; | 65 | reg = <80003000 1000>; |
66 | interrupts = <5 2>; | 66 | interrupts = <5 2>; |
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts index 32ecd2319928..1b973fa34605 100644 --- a/arch/powerpc/boot/dts/kuroboxHG.dts +++ b/arch/powerpc/boot/dts/kuroboxHG.dts | |||
@@ -60,7 +60,7 @@ XXXX add flash parts, rtc, ?? | |||
60 | i2c@80003000 { | 60 | i2c@80003000 { |
61 | #address-cells = <1>; | 61 | #address-cells = <1>; |
62 | #size-cells = <0>; | 62 | #size-cells = <0>; |
63 | device_type = "i2c"; | 63 | cell-index = <0>; |
64 | compatible = "fsl-i2c"; | 64 | compatible = "fsl-i2c"; |
65 | reg = <80003000 1000>; | 65 | reg = <80003000 1000>; |
66 | interrupts = <5 2>; | 66 | interrupts = <5 2>; |
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts index 6731763f0282..23eeeb1fc61e 100644 --- a/arch/powerpc/boot/dts/lite5200.dts +++ b/arch/powerpc/boot/dts/lite5200.dts | |||
@@ -284,7 +284,8 @@ | |||
284 | }; | 284 | }; |
285 | 285 | ||
286 | i2c@3d00 { | 286 | i2c@3d00 { |
287 | device_type = "i2c"; | 287 | #address-cells = <1>; |
288 | #size-cells = <0>; | ||
288 | compatible = "mpc5200-i2c","fsl-i2c"; | 289 | compatible = "mpc5200-i2c","fsl-i2c"; |
289 | cell-index = <0>; | 290 | cell-index = <0>; |
290 | reg = <3d00 40>; | 291 | reg = <3d00 40>; |
@@ -294,7 +295,8 @@ | |||
294 | }; | 295 | }; |
295 | 296 | ||
296 | i2c@3d40 { | 297 | i2c@3d40 { |
297 | device_type = "i2c"; | 298 | #address-cells = <1>; |
299 | #size-cells = <0>; | ||
298 | compatible = "mpc5200-i2c","fsl-i2c"; | 300 | compatible = "mpc5200-i2c","fsl-i2c"; |
299 | cell-index = <1>; | 301 | cell-index = <1>; |
300 | reg = <3d40 40>; | 302 | reg = <3d40 40>; |
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts index b540388c608c..f94e073de9a7 100644 --- a/arch/powerpc/boot/dts/lite5200b.dts +++ b/arch/powerpc/boot/dts/lite5200b.dts | |||
@@ -300,7 +300,8 @@ | |||
300 | }; | 300 | }; |
301 | 301 | ||
302 | i2c@3d00 { | 302 | i2c@3d00 { |
303 | device_type = "i2c"; | 303 | #address-cells = <1>; |
304 | #size-cells = <0>; | ||
304 | compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; | 305 | compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; |
305 | cell-index = <0>; | 306 | cell-index = <0>; |
306 | reg = <3d00 40>; | 307 | reg = <3d00 40>; |
@@ -310,7 +311,8 @@ | |||
310 | }; | 311 | }; |
311 | 312 | ||
312 | i2c@3d40 { | 313 | i2c@3d40 { |
313 | device_type = "i2c"; | 314 | #address-cells = <1>; |
315 | #size-cells = <0>; | ||
314 | compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; | 316 | compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; |
315 | cell-index = <1>; | 317 | cell-index = <1>; |
316 | reg = <3d40 40>; | 318 | reg = <3d40 40>; |
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts index 9e7eba973262..d417f1bbff6e 100644 --- a/arch/powerpc/boot/dts/mpc8313erdb.dts +++ b/arch/powerpc/boot/dts/mpc8313erdb.dts | |||
@@ -52,7 +52,9 @@ | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | i2c@3000 { | 54 | i2c@3000 { |
55 | device_type = "i2c"; | 55 | #address-cells = <1>; |
56 | #size-cells = <0>; | ||
57 | cell-index = <0>; | ||
56 | compatible = "fsl-i2c"; | 58 | compatible = "fsl-i2c"; |
57 | reg = <3000 100>; | 59 | reg = <3000 100>; |
58 | interrupts = <e 8>; | 60 | interrupts = <e 8>; |
@@ -61,7 +63,9 @@ | |||
61 | }; | 63 | }; |
62 | 64 | ||
63 | i2c@3100 { | 65 | i2c@3100 { |
64 | device_type = "i2c"; | 66 | #address-cells = <1>; |
67 | #size-cells = <0>; | ||
68 | cell-index = <1>; | ||
65 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
66 | reg = <3100 100>; | 70 | reg = <3100 100>; |
67 | interrupts = <f 8>; | 71 | interrupts = <f 8>; |
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index c64f3037a13b..f866e81f9368 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -59,7 +59,7 @@ | |||
59 | i2c@3000 { | 59 | i2c@3000 { |
60 | #address-cells = <1>; | 60 | #address-cells = <1>; |
61 | #size-cells = <0>; | 61 | #size-cells = <0>; |
62 | device_type = "i2c"; | 62 | cell-index = <0>; |
63 | compatible = "fsl-i2c"; | 63 | compatible = "fsl-i2c"; |
64 | reg = <3000 100>; | 64 | reg = <3000 100>; |
65 | interrupts = <e 8>; | 65 | interrupts = <e 8>; |
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index 388c8a7012e1..91849dd64223 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -52,7 +52,9 @@ | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | i2c@3000 { | 54 | i2c@3000 { |
55 | device_type = "i2c"; | 55 | #address-cells = <1>; |
56 | #size-cells = <0>; | ||
57 | cell-index = <0>; | ||
56 | compatible = "fsl-i2c"; | 58 | compatible = "fsl-i2c"; |
57 | reg = <3000 100>; | 59 | reg = <3000 100>; |
58 | interrupts = <e 8>; | 60 | interrupts = <e 8>; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 5072f6d0a46d..c29e4f4a7ae5 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -51,7 +51,9 @@ | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | i2c@3000 { | 53 | i2c@3000 { |
54 | device_type = "i2c"; | 54 | #address-cells = <1>; |
55 | #size-cells = <0>; | ||
56 | cell-index = <0>; | ||
55 | compatible = "fsl-i2c"; | 57 | compatible = "fsl-i2c"; |
56 | reg = <3000 100>; | 58 | reg = <3000 100>; |
57 | interrupts = <e 8>; | 59 | interrupts = <e 8>; |
@@ -60,7 +62,9 @@ | |||
60 | }; | 62 | }; |
61 | 63 | ||
62 | i2c@3100 { | 64 | i2c@3100 { |
63 | device_type = "i2c"; | 65 | #address-cells = <1>; |
66 | #size-cells = <0>; | ||
67 | cell-index = <1>; | ||
64 | compatible = "fsl-i2c"; | 68 | compatible = "fsl-i2c"; |
65 | reg = <3100 100>; | 69 | reg = <3100 100>; |
66 | interrupts = <f 8>; | 70 | interrupts = <f 8>; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index 074f7a2ab7e4..6e51d172e4f8 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts | |||
@@ -51,7 +51,9 @@ | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | i2c@3000 { | 53 | i2c@3000 { |
54 | device_type = "i2c"; | 54 | #address-cells = <1>; |
55 | #size-cells = <0>; | ||
56 | cell-index = <0>; | ||
55 | compatible = "fsl-i2c"; | 57 | compatible = "fsl-i2c"; |
56 | reg = <3000 100>; | 58 | reg = <3000 100>; |
57 | interrupts = <e 8>; | 59 | interrupts = <e 8>; |
@@ -60,7 +62,9 @@ | |||
60 | }; | 62 | }; |
61 | 63 | ||
62 | i2c@3100 { | 64 | i2c@3100 { |
63 | device_type = "i2c"; | 65 | #address-cells = <1>; |
66 | #size-cells = <0>; | ||
67 | cell-index = <1>; | ||
64 | compatible = "fsl-i2c"; | 68 | compatible = "fsl-i2c"; |
65 | reg = <3100 100>; | 69 | reg = <3100 100>; |
66 | interrupts = <f 8>; | 70 | interrupts = <f 8>; |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index 49363f89cb71..73311e82ab5d 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -59,7 +59,7 @@ | |||
59 | i2c@3000 { | 59 | i2c@3000 { |
60 | #address-cells = <1>; | 60 | #address-cells = <1>; |
61 | #size-cells = <0>; | 61 | #size-cells = <0>; |
62 | device_type = "i2c"; | 62 | cell-index = <0>; |
63 | compatible = "fsl-i2c"; | 63 | compatible = "fsl-i2c"; |
64 | reg = <3000 100>; | 64 | reg = <3000 100>; |
65 | interrupts = <e 8>; | 65 | interrupts = <e 8>; |
@@ -75,7 +75,7 @@ | |||
75 | i2c@3100 { | 75 | i2c@3100 { |
76 | #address-cells = <1>; | 76 | #address-cells = <1>; |
77 | #size-cells = <0>; | 77 | #size-cells = <0>; |
78 | device_type = "i2c"; | 78 | cell-index = <1>; |
79 | compatible = "fsl-i2c"; | 79 | compatible = "fsl-i2c"; |
80 | reg = <3100 100>; | 80 | reg = <3100 100>; |
81 | interrupts = <f 8>; | 81 | interrupts = <f 8>; |
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 0b2d2b588daa..8b7d77887503 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -64,7 +64,7 @@ | |||
64 | i2c@3000 { | 64 | i2c@3000 { |
65 | #address-cells = <1>; | 65 | #address-cells = <1>; |
66 | #size-cells = <0>; | 66 | #size-cells = <0>; |
67 | device_type = "i2c"; | 67 | cell-index = <0>; |
68 | compatible = "fsl-i2c"; | 68 | compatible = "fsl-i2c"; |
69 | reg = <3000 100>; | 69 | reg = <3000 100>; |
70 | interrupts = <e 8>; | 70 | interrupts = <e 8>; |
@@ -80,7 +80,7 @@ | |||
80 | i2c@3100 { | 80 | i2c@3100 { |
81 | #address-cells = <1>; | 81 | #address-cells = <1>; |
82 | #size-cells = <0>; | 82 | #size-cells = <0>; |
83 | device_type = "i2c"; | 83 | cell-index = <1>; |
84 | compatible = "fsl-i2c"; | 84 | compatible = "fsl-i2c"; |
85 | reg = <3100 100>; | 85 | reg = <3100 100>; |
86 | interrupts = <f 8>; | 86 | interrupts = <f 8>; |
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index 6442a717ec3b..435a2b6e55a1 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts | |||
@@ -63,7 +63,9 @@ | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | i2c@3000 { | 65 | i2c@3000 { |
66 | device_type = "i2c"; | 66 | #address-cells = <1>; |
67 | #size-cells = <0>; | ||
68 | cell-index = <0>; | ||
67 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
68 | reg = <3000 100>; | 70 | reg = <3000 100>; |
69 | interrupts = <2b 2>; | 71 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts index f3f4d79deb63..101c0b6095b0 100644 --- a/arch/powerpc/boot/dts/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/mpc8541cds.dts | |||
@@ -63,7 +63,9 @@ | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | i2c@3000 { | 65 | i2c@3000 { |
66 | device_type = "i2c"; | 66 | #address-cells = <1>; |
67 | #size-cells = <0>; | ||
68 | cell-index = <0>; | ||
67 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
68 | reg = <3000 100>; | 70 | reg = <3000 100>; |
69 | interrupts = <2b 2>; | 71 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index 6c608de1fc1b..a81eccae17a8 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -64,7 +64,9 @@ | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | i2c@3000 { | 66 | i2c@3000 { |
67 | device_type = "i2c"; | 67 | #address-cells = <1>; |
68 | #size-cells = <0>; | ||
69 | cell-index = <0>; | ||
68 | compatible = "fsl-i2c"; | 70 | compatible = "fsl-i2c"; |
69 | reg = <3000 100>; | 71 | reg = <3000 100>; |
70 | interrupts = <2b 2>; | 72 | interrupts = <2b 2>; |
@@ -72,6 +74,17 @@ | |||
72 | dfsrr; | 74 | dfsrr; |
73 | }; | 75 | }; |
74 | 76 | ||
77 | i2c@3100 { | ||
78 | #address-cells = <1>; | ||
79 | #size-cells = <0>; | ||
80 | cell-index = <1>; | ||
81 | compatible = "fsl-i2c"; | ||
82 | reg = <3100 100>; | ||
83 | interrupts = <2b 2>; | ||
84 | interrupt-parent = <&mpic>; | ||
85 | dfsrr; | ||
86 | }; | ||
87 | |||
75 | mdio@24520 { | 88 | mdio@24520 { |
76 | #address-cells = <1>; | 89 | #address-cells = <1>; |
77 | #size-cells = <0>; | 90 | #size-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index 69ca5025d972..70358dc0e571 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -63,7 +63,9 @@ | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | i2c@3000 { | 65 | i2c@3000 { |
66 | device_type = "i2c"; | 66 | #address-cells = <1>; |
67 | #size-cells = <0>; | ||
68 | cell-index = <0>; | ||
67 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
68 | reg = <3000 100>; | 70 | reg = <3000 100>; |
69 | interrupts = <2b 2>; | 71 | interrupts = <2b 2>; |
@@ -71,6 +73,17 @@ | |||
71 | dfsrr; | 73 | dfsrr; |
72 | }; | 74 | }; |
73 | 75 | ||
76 | i2c@3100 { | ||
77 | #address-cells = <1>; | ||
78 | #size-cells = <0>; | ||
79 | cell-index = <1>; | ||
80 | compatible = "fsl-i2c"; | ||
81 | reg = <3100 100>; | ||
82 | interrupts = <2b 2>; | ||
83 | interrupt-parent = <&mpic>; | ||
84 | dfsrr; | ||
85 | }; | ||
86 | |||
74 | mdio@24520 { | 87 | mdio@24520 { |
75 | #address-cells = <1>; | 88 | #address-cells = <1>; |
76 | #size-cells = <0>; | 89 | #size-cells = <0>; |
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index 57029cca32b2..1e8bf4663b06 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -63,7 +63,9 @@ | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | i2c@3000 { | 65 | i2c@3000 { |
66 | device_type = "i2c"; | 66 | #address-cells = <1>; |
67 | #size-cells = <0>; | ||
68 | cell-index = <0>; | ||
67 | compatible = "fsl-i2c"; | 69 | compatible = "fsl-i2c"; |
68 | reg = <3000 100>; | 70 | reg = <3000 100>; |
69 | interrupts = <2b 2>; | 71 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index 54394372b12a..d73e5f165ef8 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -74,7 +74,7 @@ | |||
74 | i2c@3000 { | 74 | i2c@3000 { |
75 | #address-cells = <1>; | 75 | #address-cells = <1>; |
76 | #size-cells = <0>; | 76 | #size-cells = <0>; |
77 | device_type = "i2c"; | 77 | cell-index = <0>; |
78 | compatible = "fsl-i2c"; | 78 | compatible = "fsl-i2c"; |
79 | reg = <3000 100>; | 79 | reg = <3000 100>; |
80 | interrupts = <2b 2>; | 80 | interrupts = <2b 2>; |
@@ -90,7 +90,7 @@ | |||
90 | i2c@3100 { | 90 | i2c@3100 { |
91 | #address-cells = <1>; | 91 | #address-cells = <1>; |
92 | #size-cells = <0>; | 92 | #size-cells = <0>; |
93 | device_type = "i2c"; | 93 | cell-index = <1>; |
94 | compatible = "fsl-i2c"; | 94 | compatible = "fsl-i2c"; |
95 | reg = <3100 100>; | 95 | reg = <3100 100>; |
96 | interrupts = <2b 2>; | 96 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts index 0eb44fb9647d..91d15e8de9b5 100644 --- a/arch/powerpc/boot/dts/mpc8572ds.dts +++ b/arch/powerpc/boot/dts/mpc8572ds.dts | |||
@@ -69,7 +69,9 @@ | |||
69 | }; | 69 | }; |
70 | 70 | ||
71 | i2c@3000 { | 71 | i2c@3000 { |
72 | device_type = "i2c"; | 72 | #address-cells = <1>; |
73 | #size-cells = <0>; | ||
74 | cell-index = <0>; | ||
73 | compatible = "fsl-i2c"; | 75 | compatible = "fsl-i2c"; |
74 | reg = <3000 100>; | 76 | reg = <3000 100>; |
75 | interrupts = <2b 2>; | 77 | interrupts = <2b 2>; |
@@ -78,7 +80,9 @@ | |||
78 | }; | 80 | }; |
79 | 81 | ||
80 | i2c@3100 { | 82 | i2c@3100 { |
81 | device_type = "i2c"; | 83 | #address-cells = <1>; |
84 | #size-cells = <0>; | ||
85 | cell-index = <1>; | ||
82 | compatible = "fsl-i2c"; | 86 | compatible = "fsl-i2c"; |
83 | reg = <3100 100>; | 87 | reg = <3100 100>; |
84 | interrupts = <2b 2>; | 88 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 966edf1161a6..e9c444ed922f 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
@@ -47,10 +47,10 @@ | |||
47 | bus-frequency = <0>; | 47 | bus-frequency = <0>; |
48 | 48 | ||
49 | i2c@3000 { | 49 | i2c@3000 { |
50 | device_type = "i2c"; | ||
51 | compatible = "fsl-i2c"; | ||
52 | #address-cells = <1>; | 50 | #address-cells = <1>; |
53 | #size-cells = <0>; | 51 | #size-cells = <0>; |
52 | cell-index = <0>; | ||
53 | compatible = "fsl-i2c"; | ||
54 | reg = <3000 100>; | 54 | reg = <3000 100>; |
55 | interrupts = <2b 2>; | 55 | interrupts = <2b 2>; |
56 | interrupt-parent = <&mpic>; | 56 | interrupt-parent = <&mpic>; |
@@ -58,10 +58,10 @@ | |||
58 | }; | 58 | }; |
59 | 59 | ||
60 | i2c@3100 { | 60 | i2c@3100 { |
61 | device_type = "i2c"; | ||
62 | compatible = "fsl-i2c"; | ||
63 | #address-cells = <1>; | 61 | #address-cells = <1>; |
64 | #size-cells = <0>; | 62 | #size-cells = <0>; |
63 | cell-index = <1>; | ||
64 | compatible = "fsl-i2c"; | ||
65 | reg = <3100 100>; | 65 | reg = <3100 100>; |
66 | interrupts = <2b 2>; | 66 | interrupts = <2b 2>; |
67 | interrupt-parent = <&mpic>; | 67 | interrupt-parent = <&mpic>; |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index b039f2136c9b..dc0efafd584f 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -69,7 +69,9 @@ | |||
69 | bus-frequency = <0>; | 69 | bus-frequency = <0>; |
70 | 70 | ||
71 | i2c@3000 { | 71 | i2c@3000 { |
72 | device_type = "i2c"; | 72 | #address-cells = <1>; |
73 | #size-cells = <0>; | ||
74 | cell-index = <0>; | ||
73 | compatible = "fsl-i2c"; | 75 | compatible = "fsl-i2c"; |
74 | reg = <3000 100>; | 76 | reg = <3000 100>; |
75 | interrupts = <2b 2>; | 77 | interrupts = <2b 2>; |
@@ -78,7 +80,9 @@ | |||
78 | }; | 80 | }; |
79 | 81 | ||
80 | i2c@3100 { | 82 | i2c@3100 { |
81 | device_type = "i2c"; | 83 | #address-cells = <1>; |
84 | #size-cells = <0>; | ||
85 | cell-index = <1>; | ||
82 | compatible = "fsl-i2c"; | 86 | compatible = "fsl-i2c"; |
83 | reg = <3100 100>; | 87 | reg = <3100 100>; |
84 | interrupts = <2b 2>; | 88 | interrupts = <2b 2>; |
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 3ace7474809e..81af4bdf252a 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -390,13 +390,11 @@ static void __init of_register_i2c_devices(struct device_node *adap_node, | |||
390 | static int __init fsl_i2c_of_init(void) | 390 | static int __init fsl_i2c_of_init(void) |
391 | { | 391 | { |
392 | struct device_node *np; | 392 | struct device_node *np; |
393 | unsigned int i; | 393 | unsigned int i = 0; |
394 | struct platform_device *i2c_dev; | 394 | struct platform_device *i2c_dev; |
395 | int ret; | 395 | int ret; |
396 | 396 | ||
397 | for (np = NULL, i = 0; | 397 | for_each_compatible_node(np, NULL, "fsl-i2c") { |
398 | (np = of_find_compatible_node(np, "i2c", "fsl-i2c")) != NULL; | ||
399 | i++) { | ||
400 | struct resource r[2]; | 398 | struct resource r[2]; |
401 | struct fsl_i2c_platform_data i2c_data; | 399 | struct fsl_i2c_platform_data i2c_data; |
402 | const unsigned char *flags = NULL; | 400 | const unsigned char *flags = NULL; |
@@ -432,7 +430,7 @@ static int __init fsl_i2c_of_init(void) | |||
432 | if (ret) | 430 | if (ret) |
433 | goto unreg; | 431 | goto unreg; |
434 | 432 | ||
435 | of_register_i2c_devices(np, i); | 433 | of_register_i2c_devices(np, i++); |
436 | } | 434 | } |
437 | 435 | ||
438 | return 0; | 436 | return 0; |