aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-12-12 01:28:35 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-12-12 02:50:45 -0500
commite77b28eb199a8d637a00128b86baf515d4eba5fd (patch)
tree4bd63c9312c3ff17da778de9db7bdf07fe9644e6
parentec9686c4a57ea46c97126660936f66e8a5eb87eb (diff)
[POWERPC] FSL: enet device tree cleanups
* Removed address fields in ethernet nodes * Removed #address-cells, #size-cells from gianfar nodes * Added cell-index to gianfar and ucc ethernet nodes * Added enet[0..3] labels * Renamed compatible node for gianfar mdio to "fsl,gianfar-mdio" * Removed device_type = "mdio" The matching for gianfar mdio still supports the old "mdio"/"gianfar" combo but it is now considered deprecated. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat
-rw-r--r--Documentation/powerpc/booting-without-of.txt6
-rw-r--r--arch/powerpc/boot/dts/mpc8313erdb.dts11
-rw-r--r--arch/powerpc/boot/dts/mpc832x_mds.dts18
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts18
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitx.dts25
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitxgp.dts8
-rw-r--r--arch/powerpc/boot/dts/mpc834x_mds.dts26
-rw-r--r--arch/powerpc/boot/dts/mpc836x_mds.dts18
-rw-r--r--arch/powerpc/boot/dts/mpc8540ads.dts37
-rw-r--r--arch/powerpc/boot/dts/mpc8541cds.dts14
-rw-r--r--arch/powerpc/boot/dts/mpc8544ds.dts14
-rw-r--r--arch/powerpc/boot/dts/mpc8548cds.dts24
-rw-r--r--arch/powerpc/boot/dts/mpc8555cds.dts14
-rw-r--r--arch/powerpc/boot/dts/mpc8560ads.dts42
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts45
-rw-r--r--arch/powerpc/boot/dts/mpc8572ds.dts24
-rw-r--r--arch/powerpc/boot/dts/mpc8641_hpcn.dts40
-rw-r--r--arch/powerpc/sysdev/fsl_soc.c15
18 files changed, 118 insertions, 281 deletions
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 7327f37d78f3..c3fc9d955030 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1223,16 +1223,14 @@ platforms are moved over to use the flattened-device-tree model.
1223 1223
1224 Required properties: 1224 Required properties:
1225 - reg : Offset and length of the register set for the device 1225 - reg : Offset and length of the register set for the device
1226 - device_type : Should be "mdio"
1227 - compatible : Should define the compatible device type for the 1226 - compatible : Should define the compatible device type for the
1228 mdio. Currently, this is most likely to be "gianfar" 1227 mdio. Currently, this is most likely to be "fsl,gianfar-mdio"
1229 1228
1230 Example: 1229 Example:
1231 1230
1232 mdio@24520 { 1231 mdio@24520 {
1233 reg = <24520 20>; 1232 reg = <24520 20>;
1234 device_type = "mdio"; 1233 compatible = "fsl,gianfar-mdio";
1235 compatible = "gianfar";
1236 1234
1237 ethernet-phy@0 { 1235 ethernet-phy@0 {
1238 ...... 1236 ......
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index d417f1bbff6e..2f8305055270 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -95,11 +95,10 @@
95 }; 95 };
96 96
97 mdio@24520 { 97 mdio@24520 {
98 device_type = "mdio";
99 compatible = "gianfar";
100 reg = <24520 20>;
101 #address-cells = <1>; 98 #address-cells = <1>;
102 #size-cells = <0>; 99 #size-cells = <0>;
100 compatible = "fsl,gianfar-mdio";
101 reg = <24520 20>;
103 phy1: ethernet-phy@1 { 102 phy1: ethernet-phy@1 {
104 interrupt-parent = < &ipic >; 103 interrupt-parent = < &ipic >;
105 interrupts = <13 8>; 104 interrupts = <13 8>;
@@ -114,7 +113,8 @@
114 }; 113 };
115 }; 114 };
116 115
117 ethernet@24000 { 116 enet0: ethernet@24000 {
117 cell-index = <0>;
118 device_type = "network"; 118 device_type = "network";
119 model = "eTSEC"; 119 model = "eTSEC";
120 compatible = "gianfar"; 120 compatible = "gianfar";
@@ -125,7 +125,8 @@
125 phy-handle = < &phy1 >; 125 phy-handle = < &phy1 >;
126 }; 126 };
127 127
128 ethernet@25000 { 128 enet1: ethernet@25000 {
129 cell-index = <1>;
129 device_type = "network"; 130 device_type = "network";
130 model = "eTSEC"; 131 model = "eTSEC";
131 compatible = "gianfar"; 132 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index f866e81f9368..b0d89d6aa5ac 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -208,20 +208,15 @@
208 mode = "slave"; 208 mode = "slave";
209 }; 209 };
210 210
211 ucc@2200 { 211 enet0: ucc@2200 {
212 device_type = "network"; 212 device_type = "network";
213 compatible = "ucc_geth"; 213 compatible = "ucc_geth";
214 model = "UCC"; 214 model = "UCC";
215 cell-index = <3>;
215 device-id = <3>; 216 device-id = <3>;
216 reg = <2200 200>; 217 reg = <2200 200>;
217 interrupts = <22>; 218 interrupts = <22>;
218 interrupt-parent = < &qeic >; 219 interrupt-parent = < &qeic >;
219 /*
220 * mac-address is deprecated and will be removed
221 * in 2.6.25. Only recent versions of
222 * U-Boot support local-mac-address, however.
223 */
224 mac-address = [ 00 00 00 00 00 00 ];
225 local-mac-address = [ 00 00 00 00 00 00 ]; 220 local-mac-address = [ 00 00 00 00 00 00 ];
226 rx-clock = <19>; 221 rx-clock = <19>;
227 tx-clock = <1a>; 222 tx-clock = <1a>;
@@ -229,20 +224,15 @@
229 pio-handle = < &pio3 >; 224 pio-handle = < &pio3 >;
230 }; 225 };
231 226
232 ucc@3200 { 227 enet1: ucc@3200 {
233 device_type = "network"; 228 device_type = "network";
234 compatible = "ucc_geth"; 229 compatible = "ucc_geth";
235 model = "UCC"; 230 model = "UCC";
231 cell-index = <4>;
236 device-id = <4>; 232 device-id = <4>;
237 reg = <3200 200>; 233 reg = <3200 200>;
238 interrupts = <23>; 234 interrupts = <23>;
239 interrupt-parent = < &qeic >; 235 interrupt-parent = < &qeic >;
240 /*
241 * mac-address is deprecated and will be removed
242 * in 2.6.25. Only recent versions of
243 * U-Boot support local-mac-address, however.
244 */
245 mac-address = [ 00 00 00 00 00 00 ];
246 local-mac-address = [ 00 00 00 00 00 00 ]; 236 local-mac-address = [ 00 00 00 00 00 00 ];
247 rx-clock = <17>; 237 rx-clock = <17>;
248 tx-clock = <18>; 238 tx-clock = <18>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 91849dd64223..0c64381b61de 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -189,20 +189,15 @@
189 mode = "cpu"; 189 mode = "cpu";
190 }; 190 };
191 191
192 ucc@3000 { 192 enet0: ucc@3000 {
193 device_type = "network"; 193 device_type = "network";
194 compatible = "ucc_geth"; 194 compatible = "ucc_geth";
195 model = "UCC"; 195 model = "UCC";
196 cell-index = <2>;
196 device-id = <2>; 197 device-id = <2>;
197 reg = <3000 200>; 198 reg = <3000 200>;
198 interrupts = <21>; 199 interrupts = <21>;
199 interrupt-parent = <&qeic>; 200 interrupt-parent = <&qeic>;
200 /*
201 * mac-address is deprecated and will be removed
202 * in 2.6.25. Only recent versions of
203 * U-Boot support local-mac-address, however.
204 */
205 mac-address = [ 00 00 00 00 00 00 ];
206 local-mac-address = [ 00 00 00 00 00 00 ]; 201 local-mac-address = [ 00 00 00 00 00 00 ];
207 rx-clock = <20>; 202 rx-clock = <20>;
208 tx-clock = <13>; 203 tx-clock = <13>;
@@ -210,20 +205,15 @@
210 pio-handle = <&ucc2pio>; 205 pio-handle = <&ucc2pio>;
211 }; 206 };
212 207
213 ucc@2200 { 208 enet1: ucc@2200 {
214 device_type = "network"; 209 device_type = "network";
215 compatible = "ucc_geth"; 210 compatible = "ucc_geth";
216 model = "UCC"; 211 model = "UCC";
212 cell-index = <3>;
217 device-id = <3>; 213 device-id = <3>;
218 reg = <2200 200>; 214 reg = <2200 200>;
219 interrupts = <22>; 215 interrupts = <22>;
220 interrupt-parent = <&qeic>; 216 interrupt-parent = <&qeic>;
221 /*
222 * mac-address is deprecated and will be removed
223 * in 2.6.25. Only recent versions of
224 * U-Boot support local-mac-address, however.
225 */
226 mac-address = [ 00 00 00 00 00 00 ];
227 local-mac-address = [ 00 00 00 00 00 00 ]; 217 local-mac-address = [ 00 00 00 00 00 00 ];
228 rx-clock = <19>; 218 rx-clock = <19>;
229 tx-clock = <1a>; 219 tx-clock = <1a>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index c29e4f4a7ae5..d2184ada16d8 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -106,11 +106,10 @@
106 }; 106 };
107 107
108 mdio@24520 { 108 mdio@24520 {
109 device_type = "mdio";
110 compatible = "gianfar";
111 reg = <24520 20>;
112 #address-cells = <1>; 109 #address-cells = <1>;
113 #size-cells = <0>; 110 #size-cells = <0>;
111 compatible = "fsl,gianfar-mdio";
112 reg = <24520 20>;
114 113
115 /* Vitesse 8201 */ 114 /* Vitesse 8201 */
116 phy1c: ethernet-phy@1c { 115 phy1c: ethernet-phy@1c {
@@ -129,17 +128,12 @@
129 }; 128 };
130 }; 129 };
131 130
132 ethernet@24000 { 131 enet0: ethernet@24000 {
132 cell-index = <0>;
133 device_type = "network"; 133 device_type = "network";
134 model = "TSEC"; 134 model = "TSEC";
135 compatible = "gianfar"; 135 compatible = "gianfar";
136 reg = <24000 1000>; 136 reg = <24000 1000>;
137 /*
138 * address is deprecated and will be removed
139 * in 2.6.25. Only recent versions of
140 * U-Boot support local-mac-address, however.
141 */
142 address = [ 00 00 00 00 00 00 ];
143 local-mac-address = [ 00 00 00 00 00 00 ]; 137 local-mac-address = [ 00 00 00 00 00 00 ];
144 interrupts = <20 8 21 8 22 8>; 138 interrupts = <20 8 21 8 22 8>;
145 interrupt-parent = < &ipic >; 139 interrupt-parent = < &ipic >;
@@ -147,19 +141,12 @@
147 linux,network-index = <0>; 141 linux,network-index = <0>;
148 }; 142 };
149 143
150 ethernet@25000 { 144 enet1: ethernet@25000 {
151 #address-cells = <1>; 145 cell-index = <1>;
152 #size-cells = <0>;
153 device_type = "network"; 146 device_type = "network";
154 model = "TSEC"; 147 model = "TSEC";
155 compatible = "gianfar"; 148 compatible = "gianfar";
156 reg = <25000 1000>; 149 reg = <25000 1000>;
157 /*
158 * address is deprecated and will be removed
159 * in 2.6.25. Only recent versions of
160 * U-Boot support local-mac-address, however.
161 */
162 address = [ 00 00 00 00 00 00 ];
163 local-mac-address = [ 00 00 00 00 00 00 ]; 150 local-mac-address = [ 00 00 00 00 00 00 ];
164 interrupts = <23 8 24 8 25 8>; 151 interrupts = <23 8 24 8 25 8>;
165 interrupt-parent = < &ipic >; 152 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 6e51d172e4f8..30c68160d1b4 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -94,11 +94,10 @@
94 }; 94 };
95 95
96 mdio@24520 { 96 mdio@24520 {
97 device_type = "mdio";
98 compatible = "gianfar";
99 reg = <24520 20>;
100 #address-cells = <1>; 97 #address-cells = <1>;
101 #size-cells = <0>; 98 #size-cells = <0>;
99 compatible = "fsl,gianfar-mdio";
100 reg = <24520 20>;
102 101
103 /* Vitesse 8201 */ 102 /* Vitesse 8201 */
104 phy1c: ethernet-phy@1c { 103 phy1c: ethernet-phy@1c {
@@ -109,7 +108,8 @@
109 }; 108 };
110 }; 109 };
111 110
112 ethernet@24000 { 111 enet0: ethernet@24000 {
112 cell-index = <0>;
113 device_type = "network"; 113 device_type = "network";
114 model = "TSEC"; 114 model = "TSEC";
115 compatible = "gianfar"; 115 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 73311e82ab5d..c5239c9f2759 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -119,11 +119,11 @@
119 }; 119 };
120 120
121 mdio@24520 { 121 mdio@24520 {
122 device_type = "mdio";
123 compatible = "gianfar";
124 reg = <24520 20>;
125 #address-cells = <1>; 122 #address-cells = <1>;
126 #size-cells = <0>; 123 #size-cells = <0>;
124 compatible = "fsl,gianfar-mdio";
125 reg = <24520 20>;
126
127 phy0: ethernet-phy@0 { 127 phy0: ethernet-phy@0 {
128 interrupt-parent = < &ipic >; 128 interrupt-parent = < &ipic >;
129 interrupts = <11 8>; 129 interrupts = <11 8>;
@@ -138,17 +138,12 @@
138 }; 138 };
139 }; 139 };
140 140
141 ethernet@24000 { 141 enet0: ethernet@24000 {
142 cell-index = <0>;
142 device_type = "network"; 143 device_type = "network";
143 model = "TSEC"; 144 model = "TSEC";
144 compatible = "gianfar"; 145 compatible = "gianfar";
145 reg = <24000 1000>; 146 reg = <24000 1000>;
146 /*
147 * address is deprecated and will be removed
148 * in 2.6.25. Only recent versions of
149 * U-Boot support local-mac-address, however.
150 */
151 address = [ 00 00 00 00 00 00 ];
152 local-mac-address = [ 00 00 00 00 00 00 ]; 147 local-mac-address = [ 00 00 00 00 00 00 ];
153 interrupts = <20 8 21 8 22 8>; 148 interrupts = <20 8 21 8 22 8>;
154 interrupt-parent = < &ipic >; 149 interrupt-parent = < &ipic >;
@@ -156,19 +151,12 @@
156 linux,network-index = <0>; 151 linux,network-index = <0>;
157 }; 152 };
158 153
159 ethernet@25000 { 154 enet1: ethernet@25000 {
160 #address-cells = <1>; 155 cell-index = <1>;
161 #size-cells = <0>;
162 device_type = "network"; 156 device_type = "network";
163 model = "TSEC"; 157 model = "TSEC";
164 compatible = "gianfar"; 158 compatible = "gianfar";
165 reg = <25000 1000>; 159 reg = <25000 1000>;
166 /*
167 * address is deprecated and will be removed
168 * in 2.6.25. Only recent versions of
169 * U-Boot support local-mac-address, however.
170 */
171 address = [ 00 00 00 00 00 00 ];
172 local-mac-address = [ 00 00 00 00 00 00 ]; 160 local-mac-address = [ 00 00 00 00 00 00 ];
173 interrupts = <23 8 24 8 25 8>; 161 interrupts = <23 8 24 8 25 8>;
174 interrupt-parent = < &ipic >; 162 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 8b7d77887503..3b0873a8c909 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -239,20 +239,15 @@
239 mode = "slave"; 239 mode = "slave";
240 }; 240 };
241 241
242 ucc@2000 { 242 enet0: ucc@2000 {
243 device_type = "network"; 243 device_type = "network";
244 compatible = "ucc_geth"; 244 compatible = "ucc_geth";
245 model = "UCC"; 245 model = "UCC";
246 cell-index = <1>;
246 device-id = <1>; 247 device-id = <1>;
247 reg = <2000 200>; 248 reg = <2000 200>;
248 interrupts = <20>; 249 interrupts = <20>;
249 interrupt-parent = < &qeic >; 250 interrupt-parent = < &qeic >;
250 /*
251 * mac-address is deprecated and will be removed
252 * in 2.6.25. Only recent versions of
253 * U-Boot support local-mac-address, however.
254 */
255 mac-address = [ 00 00 00 00 00 00 ];
256 local-mac-address = [ 00 00 00 00 00 00 ]; 251 local-mac-address = [ 00 00 00 00 00 00 ];
257 rx-clock = <0>; 252 rx-clock = <0>;
258 tx-clock = <19>; 253 tx-clock = <19>;
@@ -261,20 +256,15 @@
261 pio-handle = < &pio1 >; 256 pio-handle = < &pio1 >;
262 }; 257 };
263 258
264 ucc@3000 { 259 enet1: ucc@3000 {
265 device_type = "network"; 260 device_type = "network";
266 compatible = "ucc_geth"; 261 compatible = "ucc_geth";
267 model = "UCC"; 262 model = "UCC";
263 cell-index = <2>;
268 device-id = <2>; 264 device-id = <2>;
269 reg = <3000 200>; 265 reg = <3000 200>;
270 interrupts = <21>; 266 interrupts = <21>;
271 interrupt-parent = < &qeic >; 267 interrupt-parent = < &qeic >;
272 /*
273 * mac-address is deprecated and will be removed
274 * in 2.6.25. Only recent versions of
275 * U-Boot support local-mac-address, however.
276 */
277 mac-address = [ 00 00 00 00 00 00 ];
278 local-mac-address = [ 00 00 00 00 00 00 ]; 268 local-mac-address = [ 00 00 00 00 00 00 ];
279 rx-clock = <0>; 269 rx-clock = <0>;
280 tx-clock = <14>; 270 tx-clock = <14>;
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 435a2b6e55a1..7961d911a008 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -76,9 +76,9 @@
76 mdio@24520 { 76 mdio@24520 {
77 #address-cells = <1>; 77 #address-cells = <1>;
78 #size-cells = <0>; 78 #size-cells = <0>;
79 device_type = "mdio"; 79 compatible = "fsl,gianfar-mdio";
80 compatible = "gianfar";
81 reg = <24520 20>; 80 reg = <24520 20>;
81
82 phy0: ethernet-phy@0 { 82 phy0: ethernet-phy@0 {
83 interrupt-parent = <&mpic>; 83 interrupt-parent = <&mpic>;
84 interrupts = <5 1>; 84 interrupts = <5 1>;
@@ -99,57 +99,36 @@
99 }; 99 };
100 }; 100 };
101 101
102 ethernet@24000 { 102 enet0: ethernet@24000 {
103 #address-cells = <1>; 103 cell-index = <0>;
104 #size-cells = <0>;
105 device_type = "network"; 104 device_type = "network";
106 model = "TSEC"; 105 model = "TSEC";
107 compatible = "gianfar"; 106 compatible = "gianfar";
108 reg = <24000 1000>; 107 reg = <24000 1000>;
109 /*
110 * address is deprecated and will be removed
111 * in 2.6.25. Only recent versions of
112 * U-Boot support local-mac-address, however.
113 */
114 address = [ 00 00 00 00 00 00 ];
115 local-mac-address = [ 00 00 00 00 00 00 ]; 108 local-mac-address = [ 00 00 00 00 00 00 ];
116 interrupts = <1d 2 1e 2 22 2>; 109 interrupts = <1d 2 1e 2 22 2>;
117 interrupt-parent = <&mpic>; 110 interrupt-parent = <&mpic>;
118 phy-handle = <&phy0>; 111 phy-handle = <&phy0>;
119 }; 112 };
120 113
121 ethernet@25000 { 114 enet1: ethernet@25000 {
122 #address-cells = <1>; 115 cell-index = <1>;
123 #size-cells = <0>;
124 device_type = "network"; 116 device_type = "network";
125 model = "TSEC"; 117 model = "TSEC";
126 compatible = "gianfar"; 118 compatible = "gianfar";
127 reg = <25000 1000>; 119 reg = <25000 1000>;
128 /*
129 * address is deprecated and will be removed
130 * in 2.6.25. Only recent versions of
131 * U-Boot support local-mac-address, however.
132 */
133 address = [ 00 00 00 00 00 00 ];
134 local-mac-address = [ 00 00 00 00 00 00 ]; 120 local-mac-address = [ 00 00 00 00 00 00 ];
135 interrupts = <23 2 24 2 28 2>; 121 interrupts = <23 2 24 2 28 2>;
136 interrupt-parent = <&mpic>; 122 interrupt-parent = <&mpic>;
137 phy-handle = <&phy1>; 123 phy-handle = <&phy1>;
138 }; 124 };
139 125
140 ethernet@26000 { 126 enet2: ethernet@26000 {
141 #address-cells = <1>; 127 cell-index = <2>;
142 #size-cells = <0>;
143 device_type = "network"; 128 device_type = "network";
144 model = "FEC"; 129 model = "FEC";
145 compatible = "gianfar"; 130 compatible = "gianfar";
146 reg = <26000 1000>; 131 reg = <26000 1000>;
147 /*
148 * address is deprecated and will be removed
149 * in 2.6.25. Only recent versions of
150 * U-Boot support local-mac-address, however.
151 */
152 address = [ 00 00 00 00 00 00 ];
153 local-mac-address = [ 00 00 00 00 00 00 ]; 132 local-mac-address = [ 00 00 00 00 00 00 ];
154 interrupts = <29 2>; 133 interrupts = <29 2>;
155 interrupt-parent = <&mpic>; 134 interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 101c0b6095b0..8637fe09d952 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -76,9 +76,9 @@
76 mdio@24520 { 76 mdio@24520 {
77 #address-cells = <1>; 77 #address-cells = <1>;
78 #size-cells = <0>; 78 #size-cells = <0>;
79 device_type = "mdio"; 79 compatible = "fsl,gianfar-mdio";
80 compatible = "gianfar";
81 reg = <24520 20>; 80 reg = <24520 20>;
81
82 phy0: ethernet-phy@0 { 82 phy0: ethernet-phy@0 {
83 interrupt-parent = <&mpic>; 83 interrupt-parent = <&mpic>;
84 interrupts = <5 1>; 84 interrupts = <5 1>;
@@ -93,9 +93,8 @@
93 }; 93 };
94 }; 94 };
95 95
96 ethernet@24000 { 96 enet0: ethernet@24000 {
97 #address-cells = <1>; 97 cell-index = <0>;
98 #size-cells = <0>;
99 device_type = "network"; 98 device_type = "network";
100 model = "TSEC"; 99 model = "TSEC";
101 compatible = "gianfar"; 100 compatible = "gianfar";
@@ -106,9 +105,8 @@
106 phy-handle = <&phy0>; 105 phy-handle = <&phy0>;
107 }; 106 };
108 107
109 ethernet@25000 { 108 enet1: ethernet@25000 {
110 #address-cells = <1>; 109 cell-index = <1>;
111 #size-cells = <0>;
112 device_type = "network"; 110 device_type = "network";
113 model = "TSEC"; 111 model = "TSEC";
114 compatible = "gianfar"; 112 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index a81eccae17a8..a98c46e00f80 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -88,9 +88,9 @@
88 mdio@24520 { 88 mdio@24520 {
89 #address-cells = <1>; 89 #address-cells = <1>;
90 #size-cells = <0>; 90 #size-cells = <0>;
91 device_type = "mdio"; 91 compatible = "fsl,gianfar-mdio";
92 compatible = "gianfar";
93 reg = <24520 20>; 92 reg = <24520 20>;
93
94 phy0: ethernet-phy@0 { 94 phy0: ethernet-phy@0 {
95 interrupt-parent = <&mpic>; 95 interrupt-parent = <&mpic>;
96 interrupts = <a 1>; 96 interrupts = <a 1>;
@@ -105,9 +105,8 @@
105 }; 105 };
106 }; 106 };
107 107
108 ethernet@24000 { 108 enet0: ethernet@24000 {
109 #address-cells = <1>; 109 cell-index = <0>;
110 #size-cells = <0>;
111 device_type = "network"; 110 device_type = "network";
112 model = "TSEC"; 111 model = "TSEC";
113 compatible = "gianfar"; 112 compatible = "gianfar";
@@ -119,9 +118,8 @@
119 phy-connection-type = "rgmii-id"; 118 phy-connection-type = "rgmii-id";
120 }; 119 };
121 120
122 ethernet@26000 { 121 enet1: ethernet@26000 {
123 #address-cells = <1>; 122 cell-index = <1>;
124 #size-cells = <0>;
125 device_type = "network"; 123 device_type = "network";
126 model = "TSEC"; 124 model = "TSEC";
127 compatible = "gianfar"; 125 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index 70358dc0e571..64f83d0fb5aa 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -87,9 +87,9 @@
87 mdio@24520 { 87 mdio@24520 {
88 #address-cells = <1>; 88 #address-cells = <1>;
89 #size-cells = <0>; 89 #size-cells = <0>;
90 device_type = "mdio"; 90 compatible = "fsl,gianfar-mdio";
91 compatible = "gianfar";
92 reg = <24520 20>; 91 reg = <24520 20>;
92
93 phy0: ethernet-phy@0 { 93 phy0: ethernet-phy@0 {
94 interrupt-parent = <&mpic>; 94 interrupt-parent = <&mpic>;
95 interrupts = <5 1>; 95 interrupts = <5 1>;
@@ -116,9 +116,8 @@
116 }; 116 };
117 }; 117 };
118 118
119 ethernet@24000 { 119 enet0: ethernet@24000 {
120 #address-cells = <1>; 120 cell-index = <0>;
121 #size-cells = <0>;
122 device_type = "network"; 121 device_type = "network";
123 model = "eTSEC"; 122 model = "eTSEC";
124 compatible = "gianfar"; 123 compatible = "gianfar";
@@ -129,9 +128,8 @@
129 phy-handle = <&phy0>; 128 phy-handle = <&phy0>;
130 }; 129 };
131 130
132 ethernet@25000 { 131 enet1: ethernet@25000 {
133 #address-cells = <1>; 132 cell-index = <1>;
134 #size-cells = <0>;
135 device_type = "network"; 133 device_type = "network";
136 model = "eTSEC"; 134 model = "eTSEC";
137 compatible = "gianfar"; 135 compatible = "gianfar";
@@ -143,9 +141,8 @@
143 }; 141 };
144 142
145/* eTSEC 3/4 are currently broken 143/* eTSEC 3/4 are currently broken
146 ethernet@26000 { 144 enet2: ethernet@26000 {
147 #address-cells = <1>; 145 cell-index = <2>;
148 #size-cells = <0>;
149 device_type = "network"; 146 device_type = "network";
150 model = "eTSEC"; 147 model = "eTSEC";
151 compatible = "gianfar"; 148 compatible = "gianfar";
@@ -156,9 +153,8 @@
156 phy-handle = <&phy2>; 153 phy-handle = <&phy2>;
157 }; 154 };
158 155
159 ethernet@27000 { 156 enet3: ethernet@27000 {
160 #address-cells = <1>; 157 cell-index = <3>;
161 #size-cells = <0>;
162 device_type = "network"; 158 device_type = "network";
163 model = "eTSEC"; 159 model = "eTSEC";
164 compatible = "gianfar"; 160 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 1e8bf4663b06..339e87345056 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -76,9 +76,9 @@
76 mdio@24520 { 76 mdio@24520 {
77 #address-cells = <1>; 77 #address-cells = <1>;
78 #size-cells = <0>; 78 #size-cells = <0>;
79 device_type = "mdio"; 79 compatible = "fsl,gianfar-mdio";
80 compatible = "gianfar";
81 reg = <24520 20>; 80 reg = <24520 20>;
81
82 phy0: ethernet-phy@0 { 82 phy0: ethernet-phy@0 {
83 interrupt-parent = <&mpic>; 83 interrupt-parent = <&mpic>;
84 interrupts = <5 1>; 84 interrupts = <5 1>;
@@ -93,9 +93,8 @@
93 }; 93 };
94 }; 94 };
95 95
96 ethernet@24000 { 96 enet0: ethernet@24000 {
97 #address-cells = <1>; 97 cell-index = <0>;
98 #size-cells = <0>;
99 device_type = "network"; 98 device_type = "network";
100 model = "TSEC"; 99 model = "TSEC";
101 compatible = "gianfar"; 100 compatible = "gianfar";
@@ -106,9 +105,8 @@
106 phy-handle = <&phy0>; 105 phy-handle = <&phy0>;
107 }; 106 };
108 107
109 ethernet@25000 { 108 enet1: ethernet@25000 {
110 #address-cells = <1>; 109 cell-index = <1>;
111 #size-cells = <0>;
112 device_type = "network"; 110 device_type = "network";
113 model = "TSEC"; 111 model = "TSEC";
114 compatible = "gianfar"; 112 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 6b362f8222c1..936a4d509990 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -63,11 +63,11 @@
63 }; 63 };
64 64
65 mdio@24520 { 65 mdio@24520 {
66 device_type = "mdio";
67 compatible = "gianfar";
68 reg = <24520 20>;
69 #address-cells = <1>; 66 #address-cells = <1>;
70 #size-cells = <0>; 67 #size-cells = <0>;
68 compatible = "fsl,gianfar-mdio";
69 reg = <24520 20>;
70
71 phy0: ethernet-phy@0 { 71 phy0: ethernet-phy@0 {
72 interrupt-parent = <&mpic>; 72 interrupt-parent = <&mpic>;
73 interrupts = <5 1>; 73 interrupts = <5 1>;
@@ -94,36 +94,24 @@
94 }; 94 };
95 }; 95 };
96 96
97 ethernet@24000 { 97 enet0: ethernet@24000 {
98 cell-index = <0>;
98 device_type = "network"; 99 device_type = "network";
99 model = "TSEC"; 100 model = "TSEC";
100 compatible = "gianfar"; 101 compatible = "gianfar";
101 reg = <24000 1000>; 102 reg = <24000 1000>;
102 /*
103 * address is deprecated and will be removed
104 * in 2.6.25. Only recent versions of
105 * U-Boot support local-mac-address, however.
106 */
107 address = [ 00 00 00 00 00 00 ];
108 local-mac-address = [ 00 00 00 00 00 00 ]; 103 local-mac-address = [ 00 00 00 00 00 00 ];
109 interrupts = <1d 2 1e 2 22 2>; 104 interrupts = <1d 2 1e 2 22 2>;
110 interrupt-parent = <&mpic>; 105 interrupt-parent = <&mpic>;
111 phy-handle = <&phy0>; 106 phy-handle = <&phy0>;
112 }; 107 };
113 108
114 ethernet@25000 { 109 enet1: ethernet@25000 {
115 #address-cells = <1>; 110 cell-index = <1>;
116 #size-cells = <0>;
117 device_type = "network"; 111 device_type = "network";
118 model = "TSEC"; 112 model = "TSEC";
119 compatible = "gianfar"; 113 compatible = "gianfar";
120 reg = <25000 1000>; 114 reg = <25000 1000>;
121 /*
122 * address is deprecated and will be removed
123 * in 2.6.25. Only recent versions of
124 * U-Boot support local-mac-address, however.
125 */
126 address = [ 00 00 00 00 00 00 ];
127 local-mac-address = [ 00 00 00 00 00 00 ]; 115 local-mac-address = [ 00 00 00 00 00 00 ];
128 interrupts = <23 2 24 2 28 2>; 116 interrupts = <23 2 24 2 28 2>;
129 interrupt-parent = <&mpic>; 117 interrupt-parent = <&mpic>;
@@ -198,17 +186,11 @@
198 interrupt-parent = <&cpmpic>; 186 interrupt-parent = <&cpmpic>;
199 }; 187 };
200 188
201 ethernet@91320 { 189 enet2: ethernet@91320 {
202 device_type = "network"; 190 device_type = "network";
203 compatible = "fsl,mpc8560-fcc-enet", 191 compatible = "fsl,mpc8560-fcc-enet",
204 "fsl,cpm2-fcc-enet"; 192 "fsl,cpm2-fcc-enet";
205 reg = <91320 20 88500 100 913b0 1>; 193 reg = <91320 20 88500 100 913b0 1>;
206 /*
207 * mac-address is deprecated and will be removed
208 * in 2.6.25. Only recent versions of
209 * U-Boot support local-mac-address, however.
210 */
211 mac-address = [ 00 00 00 00 00 00 ];
212 local-mac-address = [ 00 00 00 00 00 00 ]; 194 local-mac-address = [ 00 00 00 00 00 00 ];
213 fsl,cpm-command = <16200300>; 195 fsl,cpm-command = <16200300>;
214 interrupts = <21 8>; 196 interrupts = <21 8>;
@@ -216,17 +198,11 @@
216 phy-handle = <&phy2>; 198 phy-handle = <&phy2>;
217 }; 199 };
218 200
219 ethernet@91340 { 201 enet3: ethernet@91340 {
220 device_type = "network"; 202 device_type = "network";
221 compatible = "fsl,mpc8560-fcc-enet", 203 compatible = "fsl,mpc8560-fcc-enet",
222 "fsl,cpm2-fcc-enet"; 204 "fsl,cpm2-fcc-enet";
223 reg = <91340 20 88600 100 913d0 1>; 205 reg = <91340 20 88600 100 913d0 1>;
224 /*
225 * mac-address is deprecated and will be removed
226 * in 2.6.25. Only recent versions of
227 * U-Boot support local-mac-address, however.
228 */
229 mac-address = [ 00 00 00 00 00 00 ];
230 local-mac-address = [ 00 00 00 00 00 00 ]; 206 local-mac-address = [ 00 00 00 00 00 00 ];
231 fsl,cpm-command = <1a400300>; 207 fsl,cpm-command = <1a400300>;
232 interrupts = <22 8>; 208 interrupts = <22 8>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index d73e5f165ef8..60f0eab4ca8d 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -101,9 +101,9 @@
101 mdio@24520 { 101 mdio@24520 {
102 #address-cells = <1>; 102 #address-cells = <1>;
103 #size-cells = <0>; 103 #size-cells = <0>;
104 device_type = "mdio"; 104 compatible = "fsl,gianfar-mdio";
105 compatible = "gianfar";
106 reg = <24520 20>; 105 reg = <24520 20>;
106
107 phy0: ethernet-phy@7 { 107 phy0: ethernet-phy@7 {
108 interrupt-parent = <&mpic>; 108 interrupt-parent = <&mpic>;
109 interrupts = <1 1>; 109 interrupts = <1 1>;
@@ -130,38 +130,24 @@
130 }; 130 };
131 }; 131 };
132 132
133 ethernet@24000 { 133 enet0: ethernet@24000 {
134 #address-cells = <1>; 134 cell-index = <0>;
135 #size-cells = <0>;
136 device_type = "network"; 135 device_type = "network";
137 model = "eTSEC"; 136 model = "eTSEC";
138 compatible = "gianfar"; 137 compatible = "gianfar";
139 reg = <24000 1000>; 138 reg = <24000 1000>;
140 /*
141 * mac-address is deprecated and will be removed
142 * in 2.6.25. Only recent versions of
143 * U-Boot support local-mac-address, however.
144 */
145 mac-address = [ 00 00 00 00 00 00 ];
146 local-mac-address = [ 00 00 00 00 00 00 ]; 139 local-mac-address = [ 00 00 00 00 00 00 ];
147 interrupts = <1d 2 1e 2 22 2>; 140 interrupts = <1d 2 1e 2 22 2>;
148 interrupt-parent = <&mpic>; 141 interrupt-parent = <&mpic>;
149 phy-handle = <&phy2>; 142 phy-handle = <&phy2>;
150 }; 143 };
151 144
152 ethernet@25000 { 145 enet1: ethernet@25000 {
153 #address-cells = <1>; 146 cell-index = <1>;
154 #size-cells = <0>;
155 device_type = "network"; 147 device_type = "network";
156 model = "eTSEC"; 148 model = "eTSEC";
157 compatible = "gianfar"; 149 compatible = "gianfar";
158 reg = <25000 1000>; 150 reg = <25000 1000>;
159 /*
160 * mac-address is deprecated and will be removed
161 * in 2.6.25. Only recent versions of
162 * U-Boot support local-mac-address, however.
163 */
164 mac-address = [ 00 00 00 00 00 00 ];
165 local-mac-address = [ 00 00 00 00 00 00 ]; 151 local-mac-address = [ 00 00 00 00 00 00 ];
166 interrupts = <23 2 24 2 28 2>; 152 interrupts = <23 2 24 2 28 2>;
167 interrupt-parent = <&mpic>; 153 interrupt-parent = <&mpic>;
@@ -318,20 +304,15 @@
318 mode = "cpu"; 304 mode = "cpu";
319 }; 305 };
320 306
321 ucc@2000 { 307 enet2: ucc@2000 {
322 device_type = "network"; 308 device_type = "network";
323 compatible = "ucc_geth"; 309 compatible = "ucc_geth";
324 model = "UCC"; 310 model = "UCC";
311 cell-index = <1>;
325 device-id = <1>; 312 device-id = <1>;
326 reg = <2000 200>; 313 reg = <2000 200>;
327 interrupts = <20>; 314 interrupts = <20>;
328 interrupt-parent = <&qeic>; 315 interrupt-parent = <&qeic>;
329 /*
330 * mac-address is deprecated and will be removed
331 * in 2.6.25. Only recent versions of
332 * U-Boot support local-mac-address, however.
333 */
334 mac-address = [ 00 00 00 00 00 00 ];
335 local-mac-address = [ 00 00 00 00 00 00 ]; 316 local-mac-address = [ 00 00 00 00 00 00 ];
336 rx-clock = <0>; 317 rx-clock = <0>;
337 tx-clock = <20>; 318 tx-clock = <20>;
@@ -340,20 +321,15 @@
340 phy-connection-type = "rgmii-id"; 321 phy-connection-type = "rgmii-id";
341 }; 322 };
342 323
343 ucc@3000 { 324 enet3: ucc@3000 {
344 device_type = "network"; 325 device_type = "network";
345 compatible = "ucc_geth"; 326 compatible = "ucc_geth";
346 model = "UCC"; 327 model = "UCC";
328 cell-index = <2>;
347 device-id = <2>; 329 device-id = <2>;
348 reg = <3000 200>; 330 reg = <3000 200>;
349 interrupts = <21>; 331 interrupts = <21>;
350 interrupt-parent = <&qeic>; 332 interrupt-parent = <&qeic>;
351 /*
352 * mac-address is deprecated and will be removed
353 * in 2.6.25. Only recent versions of
354 * U-Boot support local-mac-address, however.
355 */
356 mac-address = [ 00 00 00 00 00 00 ];
357 local-mac-address = [ 00 00 00 00 00 00 ]; 333 local-mac-address = [ 00 00 00 00 00 00 ];
358 rx-clock = <0>; 334 rx-clock = <0>;
359 tx-clock = <20>; 335 tx-clock = <20>;
@@ -366,7 +342,6 @@
366 #address-cells = <1>; 342 #address-cells = <1>;
367 #size-cells = <0>; 343 #size-cells = <0>;
368 reg = <2120 18>; 344 reg = <2120 18>;
369 device_type = "mdio";
370 compatible = "ucc_geth_phy"; 345 compatible = "ucc_geth_phy";
371 346
372 /* These are the same PHYs as on 347 /* These are the same PHYs as on
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 91d15e8de9b5..c2a8ffa61f8c 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -93,9 +93,9 @@
93 mdio@24520 { 93 mdio@24520 {
94 #address-cells = <1>; 94 #address-cells = <1>;
95 #size-cells = <0>; 95 #size-cells = <0>;
96 device_type = "mdio"; 96 compatible = "fsl,gianfar-mdio";
97 compatible = "gianfar";
98 reg = <24520 20>; 97 reg = <24520 20>;
98
99 phy0: ethernet-phy@0 { 99 phy0: ethernet-phy@0 {
100 interrupt-parent = <&mpic>; 100 interrupt-parent = <&mpic>;
101 interrupts = <a 1>; 101 interrupts = <a 1>;
@@ -118,9 +118,8 @@
118 }; 118 };
119 }; 119 };
120 120
121 ethernet@24000 { 121 enet0: ethernet@24000 {
122 #address-cells = <1>; 122 cell-index = <0>;
123 #size-cells = <0>;
124 device_type = "network"; 123 device_type = "network";
125 model = "eTSEC"; 124 model = "eTSEC";
126 compatible = "gianfar"; 125 compatible = "gianfar";
@@ -132,9 +131,8 @@
132 phy-connection-type = "rgmii-id"; 131 phy-connection-type = "rgmii-id";
133 }; 132 };
134 133
135 ethernet@25000 { 134 enet1: ethernet@25000 {
136 #address-cells = <1>; 135 cell-index = <1>;
137 #size-cells = <0>;
138 device_type = "network"; 136 device_type = "network";
139 model = "eTSEC"; 137 model = "eTSEC";
140 compatible = "gianfar"; 138 compatible = "gianfar";
@@ -146,9 +144,8 @@
146 phy-connection-type = "rgmii-id"; 144 phy-connection-type = "rgmii-id";
147 }; 145 };
148 146
149 ethernet@26000 { 147 enet2: ethernet@26000 {
150 #address-cells = <1>; 148 cell-index = <2>;
151 #size-cells = <0>;
152 device_type = "network"; 149 device_type = "network";
153 model = "eTSEC"; 150 model = "eTSEC";
154 compatible = "gianfar"; 151 compatible = "gianfar";
@@ -160,9 +157,8 @@
160 phy-connection-type = "rgmii-id"; 157 phy-connection-type = "rgmii-id";
161 }; 158 };
162 159
163 ethernet@27000 { 160 enet3: ethernet@27000 {
164 #address-cells = <1>; 161 cell-index = <3>;
165 #size-cells = <0>;
166 device_type = "network"; 162 device_type = "network";
167 model = "eTSEC"; 163 model = "eTSEC";
168 compatible = "gianfar"; 164 compatible = "gianfar";
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index dc0efafd584f..ddd8fbbb2171 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -93,9 +93,9 @@
93 mdio@24520 { 93 mdio@24520 {
94 #address-cells = <1>; 94 #address-cells = <1>;
95 #size-cells = <0>; 95 #size-cells = <0>;
96 device_type = "mdio"; 96 compatible = "fsl,gianfar-mdio";
97 compatible = "gianfar";
98 reg = <24520 20>; 97 reg = <24520 20>;
98
99 phy0: ethernet-phy@0 { 99 phy0: ethernet-phy@0 {
100 interrupt-parent = <&mpic>; 100 interrupt-parent = <&mpic>;
101 interrupts = <a 1>; 101 interrupts = <a 1>;
@@ -123,18 +123,11 @@
123 }; 123 };
124 124
125 enet0: ethernet@24000 { 125 enet0: ethernet@24000 {
126 #address-cells = <1>; 126 cell-index = <0>;
127 #size-cells = <0>;
128 device_type = "network"; 127 device_type = "network";
129 model = "TSEC"; 128 model = "TSEC";
130 compatible = "gianfar"; 129 compatible = "gianfar";
131 reg = <24000 1000>; 130 reg = <24000 1000>;
132 /*
133 * mac-address is deprecated and will be removed
134 * in 2.6.25. Only recent versions of
135 * U-Boot support local-mac-address, however.
136 */
137 mac-address = [ 00 00 00 00 00 00 ];
138 local-mac-address = [ 00 00 00 00 00 00 ]; 131 local-mac-address = [ 00 00 00 00 00 00 ];
139 interrupts = <1d 2 1e 2 22 2>; 132 interrupts = <1d 2 1e 2 22 2>;
140 interrupt-parent = <&mpic>; 133 interrupt-parent = <&mpic>;
@@ -143,18 +136,11 @@
143 }; 136 };
144 137
145 enet1: ethernet@25000 { 138 enet1: ethernet@25000 {
146 #address-cells = <1>; 139 cell-index = <1>;
147 #size-cells = <0>;
148 device_type = "network"; 140 device_type = "network";
149 model = "TSEC"; 141 model = "TSEC";
150 compatible = "gianfar"; 142 compatible = "gianfar";
151 reg = <25000 1000>; 143 reg = <25000 1000>;
152 /*
153 * mac-address is deprecated and will be removed
154 * in 2.6.25. Only recent versions of
155 * U-Boot support local-mac-address, however.
156 */
157 mac-address = [ 00 00 00 00 00 00 ];
158 local-mac-address = [ 00 00 00 00 00 00 ]; 144 local-mac-address = [ 00 00 00 00 00 00 ];
159 interrupts = <23 2 24 2 28 2>; 145 interrupts = <23 2 24 2 28 2>;
160 interrupt-parent = <&mpic>; 146 interrupt-parent = <&mpic>;
@@ -163,18 +149,11 @@
163 }; 149 };
164 150
165 enet2: ethernet@26000 { 151 enet2: ethernet@26000 {
166 #address-cells = <1>; 152 cell-index = <2>;
167 #size-cells = <0>;
168 device_type = "network"; 153 device_type = "network";
169 model = "TSEC"; 154 model = "TSEC";
170 compatible = "gianfar"; 155 compatible = "gianfar";
171 reg = <26000 1000>; 156 reg = <26000 1000>;
172 /*
173 * mac-address is deprecated and will be removed
174 * in 2.6.25. Only recent versions of
175 * U-Boot support local-mac-address, however.
176 */
177 mac-address = [ 00 00 00 00 00 00 ];
178 local-mac-address = [ 00 00 00 00 00 00 ]; 157 local-mac-address = [ 00 00 00 00 00 00 ];
179 interrupts = <1F 2 20 2 21 2>; 158 interrupts = <1F 2 20 2 21 2>;
180 interrupt-parent = <&mpic>; 159 interrupt-parent = <&mpic>;
@@ -183,18 +162,11 @@
183 }; 162 };
184 163
185 enet3: ethernet@27000 { 164 enet3: ethernet@27000 {
186 #address-cells = <1>; 165 cell-index = <3>;
187 #size-cells = <0>;
188 device_type = "network"; 166 device_type = "network";
189 model = "TSEC"; 167 model = "TSEC";
190 compatible = "gianfar"; 168 compatible = "gianfar";
191 reg = <27000 1000>; 169 reg = <27000 1000>;
192 /*
193 * mac-address is deprecated and will be removed
194 * in 2.6.25. Only recent versions of
195 * U-Boot support local-mac-address, however.
196 */
197 mac-address = [ 00 00 00 00 00 00 ];
198 local-mac-address = [ 00 00 00 00 00 00 ]; 170 local-mac-address = [ 00 00 00 00 00 00 ];
199 interrupts = <25 2 26 2 27 2>; 171 interrupts = <25 2 26 2 27 2>;
200 interrupt-parent = <&mpic>; 172 interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 81af4bdf252a..4baad80ab731 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -132,15 +132,18 @@ EXPORT_SYMBOL(get_baudrate);
132 132
133static int __init gfar_mdio_of_init(void) 133static int __init gfar_mdio_of_init(void)
134{ 134{
135 struct device_node *np; 135 struct device_node *np = NULL;
136 unsigned int i;
137 struct platform_device *mdio_dev; 136 struct platform_device *mdio_dev;
138 struct resource res; 137 struct resource res;
139 int ret; 138 int ret;
140 139
141 for (np = NULL, i = 0; 140 np = of_find_compatible_node(np, NULL, "fsl,gianfar-mdio");
142 (np = of_find_compatible_node(np, "mdio", "gianfar")) != NULL; 141
143 i++) { 142 /* try the deprecated version */
143 if (!np)
144 np = of_find_compatible_node(np, "mdio", "gianfar");
145
146 if (np) {
144 int k; 147 int k;
145 struct device_node *child = NULL; 148 struct device_node *child = NULL;
146 struct gianfar_mdio_data mdio_data; 149 struct gianfar_mdio_data mdio_data;
@@ -179,11 +182,13 @@ static int __init gfar_mdio_of_init(void)
179 goto unreg; 182 goto unreg;
180 } 183 }
181 184
185 of_node_put(np);
182 return 0; 186 return 0;
183 187
184unreg: 188unreg:
185 platform_device_unregister(mdio_dev); 189 platform_device_unregister(mdio_dev);
186err: 190err:
191 of_node_put(np);
187 return ret; 192 return ret;
188} 193}
189 194
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-19 08:26:01 -0500