diff options
author | Timur Tabi <timur@freescale.com> | 2007-06-22 15:33:15 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-03 03:05:41 -0400 |
commit | eae98266e78e5659d75dbb62b4601960c15c7830 (patch) | |
tree | dd2aeb31df443b961a477d4cf18c9c4c1b53dc99 /arch/powerpc | |
parent | 65482ccf9d00bf4f68e17eb9c656d045d26e5d1f (diff) |
[POWERPC] Fix MAC address entries for 83xx, 85xx, and 86xx device trees
For the 83xx, 85xx, and 86xx device trees, add a "local-mac-address" property
to every Ethernet node that didn't have one. Add a comment indicating that
the "address" and/or "mac-address" properties are deprecated in DTS files
and will be removed at a later time. Change all MAC address properties to
have a zero MAC address value.
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_mds.dts | 16 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc832x_rdb.dts | 16 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 10 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc834x_mds.dts | 10 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc836x_mds.dts | 16 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8540ads.dts | 27 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8541cds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8548cds.dts | 8 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8555cds.dts | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8560ads.dts | 32 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8568mds.dts | 30 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 32 |
12 files changed, 174 insertions, 31 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts index 112dd5198fe2..4fc0c4d34aa8 100644 --- a/arch/powerpc/boot/dts/mpc832x_mds.dts +++ b/arch/powerpc/boot/dts/mpc832x_mds.dts | |||
@@ -272,7 +272,13 @@ | |||
272 | reg = <2200 200>; | 272 | reg = <2200 200>; |
273 | interrupts = <22>; | 273 | interrupts = <22>; |
274 | interrupt-parent = < &qeic >; | 274 | interrupt-parent = < &qeic >; |
275 | mac-address = [ 00 04 9f 00 23 23 ]; | 275 | /* |
276 | * mac-address is deprecated and will be removed | ||
277 | * in 2.6.25. Only recent versions of | ||
278 | * U-Boot support local-mac-address, however. | ||
279 | */ | ||
280 | mac-address = [ 00 00 00 00 00 00 ]; | ||
281 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
276 | rx-clock = <19>; | 282 | rx-clock = <19>; |
277 | tx-clock = <1a>; | 283 | tx-clock = <1a>; |
278 | phy-handle = < &phy3 >; | 284 | phy-handle = < &phy3 >; |
@@ -287,7 +293,13 @@ | |||
287 | reg = <3000 200>; | 293 | reg = <3000 200>; |
288 | interrupts = <23>; | 294 | interrupts = <23>; |
289 | interrupt-parent = < &qeic >; | 295 | interrupt-parent = < &qeic >; |
290 | mac-address = [ 00 11 22 33 44 55 ]; | 296 | /* |
297 | * mac-address is deprecated and will be removed | ||
298 | * in 2.6.25. Only recent versions of | ||
299 | * U-Boot support local-mac-address, however. | ||
300 | */ | ||
301 | mac-address = [ 00 00 00 00 00 00 ]; | ||
302 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
291 | rx-clock = <17>; | 303 | rx-clock = <17>; |
292 | tx-clock = <18>; | 304 | tx-clock = <18>; |
293 | phy-handle = < &phy4 >; | 305 | phy-handle = < &phy4 >; |
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts index be4c35784e49..447c03ffabbc 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts | |||
@@ -231,7 +231,13 @@ | |||
231 | reg = <3000 200>; | 231 | reg = <3000 200>; |
232 | interrupts = <21>; | 232 | interrupts = <21>; |
233 | interrupt-parent = <&qeic>; | 233 | interrupt-parent = <&qeic>; |
234 | mac-address = [ 00 04 9f ef 03 02 ]; | 234 | /* |
235 | * mac-address is deprecated and will be removed | ||
236 | * in 2.6.25. Only recent versions of | ||
237 | * U-Boot support local-mac-address, however. | ||
238 | */ | ||
239 | mac-address = [ 00 00 00 00 00 00 ]; | ||
240 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
235 | rx-clock = <20>; | 241 | rx-clock = <20>; |
236 | tx-clock = <13>; | 242 | tx-clock = <13>; |
237 | phy-handle = <&phy00>; | 243 | phy-handle = <&phy00>; |
@@ -246,7 +252,13 @@ | |||
246 | reg = <2200 200>; | 252 | reg = <2200 200>; |
247 | interrupts = <22>; | 253 | interrupts = <22>; |
248 | interrupt-parent = <&qeic>; | 254 | interrupt-parent = <&qeic>; |
249 | mac-address = [ 00 04 9f ef 03 01 ]; | 255 | /* |
256 | * mac-address is deprecated and will be removed | ||
257 | * in 2.6.25. Only recent versions of | ||
258 | * U-Boot support local-mac-address, however. | ||
259 | */ | ||
260 | mac-address = [ 00 00 00 00 00 00 ]; | ||
261 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
250 | rx-clock = <19>; | 262 | rx-clock = <19>; |
251 | tx-clock = <1a>; | 263 | tx-clock = <1a>; |
252 | phy-handle = <&phy04>; | 264 | phy-handle = <&phy04>; |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index db0d00303275..ae9bca575453 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -131,6 +131,11 @@ | |||
131 | model = "TSEC"; | 131 | model = "TSEC"; |
132 | compatible = "gianfar"; | 132 | compatible = "gianfar"; |
133 | reg = <24000 1000>; | 133 | reg = <24000 1000>; |
134 | /* | ||
135 | * address is deprecated and will be removed | ||
136 | * in 2.6.25. Only recent versions of | ||
137 | * U-Boot support local-mac-address, however. | ||
138 | */ | ||
134 | address = [ 00 00 00 00 00 00 ]; | 139 | address = [ 00 00 00 00 00 00 ]; |
135 | local-mac-address = [ 00 00 00 00 00 00 ]; | 140 | local-mac-address = [ 00 00 00 00 00 00 ]; |
136 | interrupts = <20 8 21 8 22 8>; | 141 | interrupts = <20 8 21 8 22 8>; |
@@ -145,6 +150,11 @@ | |||
145 | model = "TSEC"; | 150 | model = "TSEC"; |
146 | compatible = "gianfar"; | 151 | compatible = "gianfar"; |
147 | reg = <25000 1000>; | 152 | reg = <25000 1000>; |
153 | /* | ||
154 | * address is deprecated and will be removed | ||
155 | * in 2.6.25. Only recent versions of | ||
156 | * U-Boot support local-mac-address, however. | ||
157 | */ | ||
148 | address = [ 00 00 00 00 00 00 ]; | 158 | address = [ 00 00 00 00 00 00 ]; |
149 | local-mac-address = [ 00 00 00 00 00 00 ]; | 159 | local-mac-address = [ 00 00 00 00 00 00 ]; |
150 | interrupts = <23 8 24 8 25 8>; | 160 | interrupts = <23 8 24 8 25 8>; |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index df773fafe9d1..310e877826b4 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -136,6 +136,11 @@ | |||
136 | model = "TSEC"; | 136 | model = "TSEC"; |
137 | compatible = "gianfar"; | 137 | compatible = "gianfar"; |
138 | reg = <24000 1000>; | 138 | reg = <24000 1000>; |
139 | /* | ||
140 | * address is deprecated and will be removed | ||
141 | * in 2.6.25. Only recent versions of | ||
142 | * U-Boot support local-mac-address, however. | ||
143 | */ | ||
139 | address = [ 00 00 00 00 00 00 ]; | 144 | address = [ 00 00 00 00 00 00 ]; |
140 | local-mac-address = [ 00 00 00 00 00 00 ]; | 145 | local-mac-address = [ 00 00 00 00 00 00 ]; |
141 | interrupts = <20 8 21 8 22 8>; | 146 | interrupts = <20 8 21 8 22 8>; |
@@ -150,6 +155,11 @@ | |||
150 | model = "TSEC"; | 155 | model = "TSEC"; |
151 | compatible = "gianfar"; | 156 | compatible = "gianfar"; |
152 | reg = <25000 1000>; | 157 | reg = <25000 1000>; |
158 | /* | ||
159 | * address is deprecated and will be removed | ||
160 | * in 2.6.25. Only recent versions of | ||
161 | * U-Boot support local-mac-address, however. | ||
162 | */ | ||
153 | address = [ 00 00 00 00 00 00 ]; | 163 | address = [ 00 00 00 00 00 00 ]; |
154 | local-mac-address = [ 00 00 00 00 00 00 ]; | 164 | local-mac-address = [ 00 00 00 00 00 00 ]; |
155 | interrupts = <23 8 24 8 25 8>; | 165 | interrupts = <23 8 24 8 25 8>; |
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts index 38c8594df3a4..1e914f31dd92 100644 --- a/arch/powerpc/boot/dts/mpc836x_mds.dts +++ b/arch/powerpc/boot/dts/mpc836x_mds.dts | |||
@@ -301,7 +301,13 @@ | |||
301 | reg = <2000 200>; | 301 | reg = <2000 200>; |
302 | interrupts = <20>; | 302 | interrupts = <20>; |
303 | interrupt-parent = < &qeic >; | 303 | interrupt-parent = < &qeic >; |
304 | mac-address = [ 00 04 9f 00 23 23 ]; | 304 | /* |
305 | * mac-address is deprecated and will be removed | ||
306 | * in 2.6.25. Only recent versions of | ||
307 | * U-Boot support local-mac-address, however. | ||
308 | */ | ||
309 | mac-address = [ 00 00 00 00 00 00 ]; | ||
310 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
305 | rx-clock = <0>; | 311 | rx-clock = <0>; |
306 | tx-clock = <19>; | 312 | tx-clock = <19>; |
307 | phy-handle = < &phy0 >; | 313 | phy-handle = < &phy0 >; |
@@ -317,7 +323,13 @@ | |||
317 | reg = <3000 200>; | 323 | reg = <3000 200>; |
318 | interrupts = <21>; | 324 | interrupts = <21>; |
319 | interrupt-parent = < &qeic >; | 325 | interrupt-parent = < &qeic >; |
320 | mac-address = [ 00 11 22 33 44 55 ]; | 326 | /* |
327 | * mac-address is deprecated and will be removed | ||
328 | * in 2.6.25. Only recent versions of | ||
329 | * U-Boot support local-mac-address, however. | ||
330 | */ | ||
331 | mac-address = [ 00 00 00 00 00 00 ]; | ||
332 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
321 | rx-clock = <0>; | 333 | rx-clock = <0>; |
322 | tx-clock = <14>; | 334 | tx-clock = <14>; |
323 | phy-handle = < &phy1 >; | 335 | phy-handle = < &phy1 >; |
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts index d91e81c009f5..78828b239d0e 100644 --- a/arch/powerpc/boot/dts/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/mpc8540ads.dts | |||
@@ -106,8 +106,13 @@ | |||
106 | model = "TSEC"; | 106 | model = "TSEC"; |
107 | compatible = "gianfar"; | 107 | compatible = "gianfar"; |
108 | reg = <24000 1000>; | 108 | reg = <24000 1000>; |
109 | address = [ 00 E0 0C 00 73 00 ]; | 109 | /* |
110 | local-mac-address = [ 00 E0 0C 00 73 00 ]; | 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 ]; | ||
111 | interrupts = <d 2 e 2 12 2>; | 116 | interrupts = <d 2 e 2 12 2>; |
112 | interrupt-parent = <&mpic>; | 117 | interrupt-parent = <&mpic>; |
113 | phy-handle = <&phy0>; | 118 | phy-handle = <&phy0>; |
@@ -120,8 +125,13 @@ | |||
120 | model = "TSEC"; | 125 | model = "TSEC"; |
121 | compatible = "gianfar"; | 126 | compatible = "gianfar"; |
122 | reg = <25000 1000>; | 127 | reg = <25000 1000>; |
123 | address = [ 00 E0 0C 00 73 01 ]; | 128 | /* |
124 | local-mac-address = [ 00 E0 0C 00 73 01 ]; | 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 ]; | ||
125 | interrupts = <13 2 14 2 18 2>; | 135 | interrupts = <13 2 14 2 18 2>; |
126 | interrupt-parent = <&mpic>; | 136 | interrupt-parent = <&mpic>; |
127 | phy-handle = <&phy1>; | 137 | phy-handle = <&phy1>; |
@@ -134,8 +144,13 @@ | |||
134 | model = "FEC"; | 144 | model = "FEC"; |
135 | compatible = "gianfar"; | 145 | compatible = "gianfar"; |
136 | reg = <26000 1000>; | 146 | reg = <26000 1000>; |
137 | address = [ 00 E0 0C 00 73 02 ]; | 147 | /* |
138 | local-mac-address = [ 00 E0 0C 00 73 02 ]; | 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 ]; | ||
139 | interrupts = <19 2>; | 154 | interrupts = <19 2>; |
140 | interrupt-parent = <&mpic>; | 155 | interrupt-parent = <&mpic>; |
141 | phy-handle = <&phy3>; | 156 | phy-handle = <&phy3>; |
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts index 4f2c3af2e052..2a0afbcebe37 100644 --- a/arch/powerpc/boot/dts/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/mpc8541cds.dts | |||
@@ -100,7 +100,7 @@ | |||
100 | model = "TSEC"; | 100 | model = "TSEC"; |
101 | compatible = "gianfar"; | 101 | compatible = "gianfar"; |
102 | reg = <24000 1000>; | 102 | reg = <24000 1000>; |
103 | local-mac-address = [ 00 E0 0C 00 73 00 ]; | 103 | local-mac-address = [ 00 00 00 00 00 00 ]; |
104 | interrupts = <d 2 e 2 12 2>; | 104 | interrupts = <d 2 e 2 12 2>; |
105 | interrupt-parent = <&mpic>; | 105 | interrupt-parent = <&mpic>; |
106 | phy-handle = <&phy0>; | 106 | phy-handle = <&phy0>; |
@@ -113,7 +113,7 @@ | |||
113 | model = "TSEC"; | 113 | model = "TSEC"; |
114 | compatible = "gianfar"; | 114 | compatible = "gianfar"; |
115 | reg = <25000 1000>; | 115 | reg = <25000 1000>; |
116 | local-mac-address = [ 00 E0 0C 00 73 01 ]; | 116 | local-mac-address = [ 00 00 00 00 00 00 ]; |
117 | interrupts = <13 2 14 2 18 2>; | 117 | interrupts = <13 2 14 2 18 2>; |
118 | interrupt-parent = <&mpic>; | 118 | interrupt-parent = <&mpic>; |
119 | phy-handle = <&phy1>; | 119 | phy-handle = <&phy1>; |
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index 0550a3c391aa..ea9b12662630 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -112,7 +112,7 @@ | |||
112 | model = "eTSEC"; | 112 | model = "eTSEC"; |
113 | compatible = "gianfar"; | 113 | compatible = "gianfar"; |
114 | reg = <24000 1000>; | 114 | reg = <24000 1000>; |
115 | local-mac-address = [ 00 E0 0C 00 73 00 ]; | 115 | local-mac-address = [ 00 00 00 00 00 00 ]; |
116 | interrupts = <d 2 e 2 12 2>; | 116 | interrupts = <d 2 e 2 12 2>; |
117 | interrupt-parent = <&mpic>; | 117 | interrupt-parent = <&mpic>; |
118 | phy-handle = <&phy0>; | 118 | phy-handle = <&phy0>; |
@@ -125,7 +125,7 @@ | |||
125 | model = "eTSEC"; | 125 | model = "eTSEC"; |
126 | compatible = "gianfar"; | 126 | compatible = "gianfar"; |
127 | reg = <25000 1000>; | 127 | reg = <25000 1000>; |
128 | local-mac-address = [ 00 E0 0C 00 73 01 ]; | 128 | local-mac-address = [ 00 00 00 00 00 00 ]; |
129 | interrupts = <13 2 14 2 18 2>; | 129 | interrupts = <13 2 14 2 18 2>; |
130 | interrupt-parent = <&mpic>; | 130 | interrupt-parent = <&mpic>; |
131 | phy-handle = <&phy1>; | 131 | phy-handle = <&phy1>; |
@@ -139,7 +139,7 @@ | |||
139 | model = "eTSEC"; | 139 | model = "eTSEC"; |
140 | compatible = "gianfar"; | 140 | compatible = "gianfar"; |
141 | reg = <26000 1000>; | 141 | reg = <26000 1000>; |
142 | local-mac-address = [ 00 E0 0C 00 73 02 ]; | 142 | local-mac-address = [ 00 00 00 00 00 00 ]; |
143 | interrupts = <f 2 10 2 11 2>; | 143 | interrupts = <f 2 10 2 11 2>; |
144 | interrupt-parent = <&mpic>; | 144 | interrupt-parent = <&mpic>; |
145 | phy-handle = <&phy2>; | 145 | phy-handle = <&phy2>; |
@@ -152,7 +152,7 @@ | |||
152 | model = "eTSEC"; | 152 | model = "eTSEC"; |
153 | compatible = "gianfar"; | 153 | compatible = "gianfar"; |
154 | reg = <27000 1000>; | 154 | reg = <27000 1000>; |
155 | local-mac-address = [ 00 E0 0C 00 73 03 ]; | 155 | local-mac-address = [ 00 00 00 00 00 00 ]; |
156 | interrupts = <15 2 16 2 17 2>; | 156 | interrupts = <15 2 16 2 17 2>; |
157 | interrupt-parent = <&mpic>; | 157 | interrupt-parent = <&mpic>; |
158 | phy-handle = <&phy3>; | 158 | phy-handle = <&phy3>; |
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index 951ed92f1154..c41ee616603e 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -100,7 +100,7 @@ | |||
100 | model = "TSEC"; | 100 | model = "TSEC"; |
101 | compatible = "gianfar"; | 101 | compatible = "gianfar"; |
102 | reg = <24000 1000>; | 102 | reg = <24000 1000>; |
103 | local-mac-address = [ 00 E0 0C 00 73 00 ]; | 103 | local-mac-address = [ 00 00 00 00 00 00 ]; |
104 | interrupts = <0d 2 0e 2 12 2>; | 104 | interrupts = <0d 2 0e 2 12 2>; |
105 | interrupt-parent = <&mpic>; | 105 | interrupt-parent = <&mpic>; |
106 | phy-handle = <&phy0>; | 106 | phy-handle = <&phy0>; |
@@ -113,7 +113,7 @@ | |||
113 | model = "TSEC"; | 113 | model = "TSEC"; |
114 | compatible = "gianfar"; | 114 | compatible = "gianfar"; |
115 | reg = <25000 1000>; | 115 | reg = <25000 1000>; |
116 | local-mac-address = [ 00 E0 0C 00 73 01 ]; | 116 | local-mac-address = [ 00 00 00 00 00 00 ]; |
117 | interrupts = <13 2 14 2 18 2>; | 117 | interrupts = <13 2 14 2 18 2>; |
118 | interrupt-parent = <&mpic>; | 118 | interrupt-parent = <&mpic>; |
119 | phy-handle = <&phy1>; | 119 | phy-handle = <&phy1>; |
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts index 80682152b0cf..205ee3219ec6 100644 --- a/arch/powerpc/boot/dts/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/mpc8560ads.dts | |||
@@ -101,7 +101,13 @@ | |||
101 | model = "TSEC"; | 101 | model = "TSEC"; |
102 | compatible = "gianfar"; | 102 | compatible = "gianfar"; |
103 | reg = <24000 1000>; | 103 | reg = <24000 1000>; |
104 | address = [ 00 00 0C 00 00 FD ]; | 104 | /* |
105 | * address is deprecated and will be removed | ||
106 | * in 2.6.25. Only recent versions of | ||
107 | * U-Boot support local-mac-address, however. | ||
108 | */ | ||
109 | address = [ 00 00 00 00 00 00 ]; | ||
110 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
105 | interrupts = <d 2 e 2 12 2>; | 111 | interrupts = <d 2 e 2 12 2>; |
106 | interrupt-parent = <&mpic>; | 112 | interrupt-parent = <&mpic>; |
107 | phy-handle = <&phy0>; | 113 | phy-handle = <&phy0>; |
@@ -114,7 +120,13 @@ | |||
114 | model = "TSEC"; | 120 | model = "TSEC"; |
115 | compatible = "gianfar"; | 121 | compatible = "gianfar"; |
116 | reg = <25000 1000>; | 122 | reg = <25000 1000>; |
117 | address = [ 00 00 0C 00 01 FD ]; | 123 | /* |
124 | * address is deprecated and will be removed | ||
125 | * in 2.6.25. Only recent versions of | ||
126 | * U-Boot support local-mac-address, however. | ||
127 | */ | ||
128 | address = [ 00 00 00 00 00 00 ]; | ||
129 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
118 | interrupts = <13 2 14 2 18 2>; | 130 | interrupts = <13 2 14 2 18 2>; |
119 | interrupt-parent = <&mpic>; | 131 | interrupt-parent = <&mpic>; |
120 | phy-handle = <&phy1>; | 132 | phy-handle = <&phy1>; |
@@ -275,7 +287,13 @@ | |||
275 | model = "FCC"; | 287 | model = "FCC"; |
276 | device-id = <2>; | 288 | device-id = <2>; |
277 | reg = <91320 20 88500 100 913a0 30>; | 289 | reg = <91320 20 88500 100 913a0 30>; |
278 | mac-address = [ 00 00 0C 00 02 FD ]; | 290 | /* |
291 | * mac-address is deprecated and will be removed | ||
292 | * in 2.6.25. Only recent versions of | ||
293 | * U-Boot support local-mac-address, however. | ||
294 | */ | ||
295 | mac-address = [ 00 00 00 00 00 00 ]; | ||
296 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
279 | clock-setup = <ff00ffff 250000>; | 297 | clock-setup = <ff00ffff 250000>; |
280 | rx-clock = <15>; | 298 | rx-clock = <15>; |
281 | tx-clock = <16>; | 299 | tx-clock = <16>; |
@@ -290,7 +308,13 @@ | |||
290 | model = "FCC"; | 308 | model = "FCC"; |
291 | device-id = <3>; | 309 | device-id = <3>; |
292 | reg = <91340 20 88600 100 913d0 30>; | 310 | reg = <91340 20 88600 100 913d0 30>; |
293 | mac-address = [ 00 00 0C 00 03 FD ]; | 311 | /* |
312 | * mac-address is deprecated and will be removed | ||
313 | * in 2.6.25. Only recent versions of | ||
314 | * U-Boot support local-mac-address, however. | ||
315 | */ | ||
316 | mac-address = [ 00 00 00 00 00 00 ]; | ||
317 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
294 | clock-setup = <ffff00ff 3700>; | 318 | clock-setup = <ffff00ff 3700>; |
295 | rx-clock = <17>; | 319 | rx-clock = <17>; |
296 | tx-clock = <18>; | 320 | tx-clock = <18>; |
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts index a123ec9456bc..479a7a55ede2 100644 --- a/arch/powerpc/boot/dts/mpc8568mds.dts +++ b/arch/powerpc/boot/dts/mpc8568mds.dts | |||
@@ -130,7 +130,13 @@ | |||
130 | model = "eTSEC"; | 130 | model = "eTSEC"; |
131 | compatible = "gianfar"; | 131 | compatible = "gianfar"; |
132 | reg = <24000 1000>; | 132 | reg = <24000 1000>; |
133 | /* | ||
134 | * mac-address is deprecated and will be removed | ||
135 | * in 2.6.25. Only recent versions of | ||
136 | * U-Boot support local-mac-address, however. | ||
137 | */ | ||
133 | mac-address = [ 00 00 00 00 00 00 ]; | 138 | mac-address = [ 00 00 00 00 00 00 ]; |
139 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
134 | interrupts = <d 2 e 2 12 2>; | 140 | interrupts = <d 2 e 2 12 2>; |
135 | interrupt-parent = <&mpic>; | 141 | interrupt-parent = <&mpic>; |
136 | phy-handle = <&phy2>; | 142 | phy-handle = <&phy2>; |
@@ -143,7 +149,13 @@ | |||
143 | model = "eTSEC"; | 149 | model = "eTSEC"; |
144 | compatible = "gianfar"; | 150 | compatible = "gianfar"; |
145 | reg = <25000 1000>; | 151 | reg = <25000 1000>; |
146 | mac-address = [ 00 00 00 00 00 00]; | 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 ]; | ||
147 | interrupts = <13 2 14 2 18 2>; | 159 | interrupts = <13 2 14 2 18 2>; |
148 | interrupt-parent = <&mpic>; | 160 | interrupt-parent = <&mpic>; |
149 | phy-handle = <&phy3>; | 161 | phy-handle = <&phy3>; |
@@ -300,7 +312,13 @@ | |||
300 | reg = <2000 200>; | 312 | reg = <2000 200>; |
301 | interrupts = <20>; | 313 | interrupts = <20>; |
302 | interrupt-parent = <&qeic>; | 314 | interrupt-parent = <&qeic>; |
303 | mac-address = [ 00 04 9f 00 23 23 ]; | 315 | /* |
316 | * mac-address is deprecated and will be removed | ||
317 | * in 2.6.25. Only recent versions of | ||
318 | * U-Boot support local-mac-address, however. | ||
319 | */ | ||
320 | mac-address = [ 00 00 00 00 00 00 ]; | ||
321 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
304 | rx-clock = <0>; | 322 | rx-clock = <0>; |
305 | tx-clock = <19>; | 323 | tx-clock = <19>; |
306 | phy-handle = <&qe_phy0>; | 324 | phy-handle = <&qe_phy0>; |
@@ -316,7 +334,13 @@ | |||
316 | reg = <3000 200>; | 334 | reg = <3000 200>; |
317 | interrupts = <21>; | 335 | interrupts = <21>; |
318 | interrupt-parent = <&qeic>; | 336 | interrupt-parent = <&qeic>; |
319 | mac-address = [ 00 11 22 33 44 55 ]; | 337 | /* |
338 | * mac-address is deprecated and will be removed | ||
339 | * in 2.6.25. Only recent versions of | ||
340 | * U-Boot support local-mac-address, however. | ||
341 | */ | ||
342 | mac-address = [ 00 00 00 00 00 00 ]; | ||
343 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
320 | rx-clock = <0>; | 344 | rx-clock = <0>; |
321 | tx-clock = <14>; | 345 | tx-clock = <14>; |
322 | phy-handle = <&qe_phy1>; | 346 | phy-handle = <&qe_phy1>; |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index 393cfdf92ff5..4b8ac7231ac9 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -121,7 +121,13 @@ | |||
121 | model = "TSEC"; | 121 | model = "TSEC"; |
122 | compatible = "gianfar"; | 122 | compatible = "gianfar"; |
123 | reg = <24000 1000>; | 123 | reg = <24000 1000>; |
124 | mac-address = [ 00 E0 0C 00 73 00 ]; | 124 | /* |
125 | * mac-address is deprecated and will be removed | ||
126 | * in 2.6.25. Only recent versions of | ||
127 | * U-Boot support local-mac-address, however. | ||
128 | */ | ||
129 | mac-address = [ 00 00 00 00 00 00 ]; | ||
130 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
125 | interrupts = <1d 2 1e 2 22 2>; | 131 | interrupts = <1d 2 1e 2 22 2>; |
126 | interrupt-parent = <&mpic>; | 132 | interrupt-parent = <&mpic>; |
127 | phy-handle = <&phy0>; | 133 | phy-handle = <&phy0>; |
@@ -134,7 +140,13 @@ | |||
134 | model = "TSEC"; | 140 | model = "TSEC"; |
135 | compatible = "gianfar"; | 141 | compatible = "gianfar"; |
136 | reg = <25000 1000>; | 142 | reg = <25000 1000>; |
137 | mac-address = [ 00 E0 0C 00 73 01 ]; | 143 | /* |
144 | * mac-address is deprecated and will be removed | ||
145 | * in 2.6.25. Only recent versions of | ||
146 | * U-Boot support local-mac-address, however. | ||
147 | */ | ||
148 | mac-address = [ 00 00 00 00 00 00 ]; | ||
149 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
138 | interrupts = <23 2 24 2 28 2>; | 150 | interrupts = <23 2 24 2 28 2>; |
139 | interrupt-parent = <&mpic>; | 151 | interrupt-parent = <&mpic>; |
140 | phy-handle = <&phy1>; | 152 | phy-handle = <&phy1>; |
@@ -147,7 +159,13 @@ | |||
147 | model = "TSEC"; | 159 | model = "TSEC"; |
148 | compatible = "gianfar"; | 160 | compatible = "gianfar"; |
149 | reg = <26000 1000>; | 161 | reg = <26000 1000>; |
150 | mac-address = [ 00 E0 0C 00 02 FD ]; | 162 | /* |
163 | * mac-address is deprecated and will be removed | ||
164 | * in 2.6.25. Only recent versions of | ||
165 | * U-Boot support local-mac-address, however. | ||
166 | */ | ||
167 | mac-address = [ 00 00 00 00 00 00 ]; | ||
168 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
151 | interrupts = <1F 2 20 2 21 2>; | 169 | interrupts = <1F 2 20 2 21 2>; |
152 | interrupt-parent = <&mpic>; | 170 | interrupt-parent = <&mpic>; |
153 | phy-handle = <&phy2>; | 171 | phy-handle = <&phy2>; |
@@ -160,7 +178,13 @@ | |||
160 | model = "TSEC"; | 178 | model = "TSEC"; |
161 | compatible = "gianfar"; | 179 | compatible = "gianfar"; |
162 | reg = <27000 1000>; | 180 | reg = <27000 1000>; |
163 | mac-address = [ 00 E0 0C 00 03 FD ]; | 181 | /* |
182 | * mac-address is deprecated and will be removed | ||
183 | * in 2.6.25. Only recent versions of | ||
184 | * U-Boot support local-mac-address, however. | ||
185 | */ | ||
186 | mac-address = [ 00 00 00 00 00 00 ]; | ||
187 | local-mac-address = [ 00 00 00 00 00 00 ]; | ||
164 | interrupts = <25 2 26 2 27 2>; | 188 | interrupts = <25 2 26 2 27 2>; |
165 | interrupt-parent = <&mpic>; | 189 | interrupt-parent = <&mpic>; |
166 | phy-handle = <&phy3>; | 190 | phy-handle = <&phy3>; |