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/boot/dts/mpc8641_hpcn.dts | |
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/boot/dts/mpc8641_hpcn.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8641_hpcn.dts | 32 |
1 files changed, 28 insertions, 4 deletions
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>; |