diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-03-19 14:01:45 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-03-24 09:35:04 -0400 |
commit | 70b3adbba056f5d9081f1ec9b4a629e3c7502072 (patch) | |
tree | ef7a299becef375b9d59f8d2d4a56e036e17b6d9 /arch/powerpc/boot/dts/asp834x-redboot.dts | |
parent | 125a00d74ea57a901fd4cc3d84baf2e825704b68 (diff) |
powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes
Currently it doesn't matter where the mdio nodes are placed, but with
power management support (i.e. when sleep = <> properties will take
effect), mdio nodes placement will become important: mdio controller
is a part of the ethernet block, so the mdio nodes should be placed
correctly. Otherwise we may wrongly assume that MDIO controllers are
available during sleep.
Suggested-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/dts/asp834x-redboot.dts')
-rw-r--r-- | arch/powerpc/boot/dts/asp834x-redboot.dts | 82 |
1 files changed, 44 insertions, 38 deletions
diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts index 524af7ef9f26..7da84fd7be93 100644 --- a/arch/powerpc/boot/dts/asp834x-redboot.dts +++ b/arch/powerpc/boot/dts/asp834x-redboot.dts | |||
@@ -181,70 +181,76 @@ | |||
181 | phy_type = "ulpi"; | 181 | phy_type = "ulpi"; |
182 | }; | 182 | }; |
183 | 183 | ||
184 | mdio@24520 { | ||
185 | #address-cells = <1>; | ||
186 | #size-cells = <0>; | ||
187 | compatible = "fsl,gianfar-mdio"; | ||
188 | reg = <0x24520 0x20>; | ||
189 | |||
190 | phy0: ethernet-phy@0 { | ||
191 | interrupt-parent = <&ipic>; | ||
192 | interrupts = <17 0x8>; | ||
193 | reg = <0x1>; | ||
194 | device_type = "ethernet-phy"; | ||
195 | }; | ||
196 | phy1: ethernet-phy@1 { | ||
197 | interrupt-parent = <&ipic>; | ||
198 | interrupts = <18 0x8>; | ||
199 | reg = <0x2>; | ||
200 | device_type = "ethernet-phy"; | ||
201 | }; | ||
202 | |||
203 | tbi0: tbi-phy@11 { | ||
204 | reg = <0x11>; | ||
205 | device_type = "tbi-phy"; | ||
206 | }; | ||
207 | }; | ||
208 | |||
209 | mdio@25520 { | ||
210 | #address-cells = <1>; | ||
211 | #size-cells = <0>; | ||
212 | compatible = "fsl,gianfar-tbi"; | ||
213 | reg = <0x25520 0x20>; | ||
214 | |||
215 | tbi1: tbi-phy@11 { | ||
216 | reg = <0x11>; | ||
217 | device_type = "tbi-phy"; | ||
218 | }; | ||
219 | }; | ||
220 | |||
221 | |||
222 | enet0: ethernet@24000 { | 184 | enet0: ethernet@24000 { |
185 | #address-cells = <1>; | ||
186 | #size-cells = <1>; | ||
223 | cell-index = <0>; | 187 | cell-index = <0>; |
224 | device_type = "network"; | 188 | device_type = "network"; |
225 | model = "TSEC"; | 189 | model = "TSEC"; |
226 | compatible = "gianfar"; | 190 | compatible = "gianfar"; |
227 | reg = <0x24000 0x1000>; | 191 | reg = <0x24000 0x1000>; |
192 | ranges = <0x0 0x24000 0x1000>; | ||
228 | local-mac-address = [ 00 08 e5 11 32 33 ]; | 193 | local-mac-address = [ 00 08 e5 11 32 33 ]; |
229 | interrupts = <32 0x8 33 0x8 34 0x8>; | 194 | interrupts = <32 0x8 33 0x8 34 0x8>; |
230 | interrupt-parent = <&ipic>; | 195 | interrupt-parent = <&ipic>; |
231 | tbi-handle = <&tbi0>; | 196 | tbi-handle = <&tbi0>; |
232 | phy-handle = <&phy0>; | 197 | phy-handle = <&phy0>; |
233 | linux,network-index = <0>; | 198 | linux,network-index = <0>; |
199 | |||
200 | mdio@520 { | ||
201 | #address-cells = <1>; | ||
202 | #size-cells = <0>; | ||
203 | compatible = "fsl,gianfar-mdio"; | ||
204 | reg = <0x520 0x20>; | ||
205 | |||
206 | phy0: ethernet-phy@0 { | ||
207 | interrupt-parent = <&ipic>; | ||
208 | interrupts = <17 0x8>; | ||
209 | reg = <0x1>; | ||
210 | device_type = "ethernet-phy"; | ||
211 | }; | ||
212 | |||
213 | phy1: ethernet-phy@1 { | ||
214 | interrupt-parent = <&ipic>; | ||
215 | interrupts = <18 0x8>; | ||
216 | reg = <0x2>; | ||
217 | device_type = "ethernet-phy"; | ||
218 | }; | ||
219 | |||
220 | tbi0: tbi-phy@11 { | ||
221 | reg = <0x11>; | ||
222 | device_type = "tbi-phy"; | ||
223 | }; | ||
224 | }; | ||
234 | }; | 225 | }; |
235 | 226 | ||
236 | enet1: ethernet@25000 { | 227 | enet1: ethernet@25000 { |
228 | #address-cells = <1>; | ||
229 | #size-cells = <1>; | ||
237 | cell-index = <1>; | 230 | cell-index = <1>; |
238 | device_type = "network"; | 231 | device_type = "network"; |
239 | model = "TSEC"; | 232 | model = "TSEC"; |
240 | compatible = "gianfar"; | 233 | compatible = "gianfar"; |
241 | reg = <0x25000 0x1000>; | 234 | reg = <0x25000 0x1000>; |
235 | ranges = <0x0 0x25000 0x1000>; | ||
242 | local-mac-address = [ 00 08 e5 11 32 34 ]; | 236 | local-mac-address = [ 00 08 e5 11 32 34 ]; |
243 | interrupts = <35 0x8 36 0x8 37 0x8>; | 237 | interrupts = <35 0x8 36 0x8 37 0x8>; |
244 | interrupt-parent = <&ipic>; | 238 | interrupt-parent = <&ipic>; |
245 | tbi-handle = <&tbi1>; | 239 | tbi-handle = <&tbi1>; |
246 | phy-handle = <&phy1>; | 240 | phy-handle = <&phy1>; |
247 | linux,network-index = <1>; | 241 | linux,network-index = <1>; |
242 | |||
243 | mdio@520 { | ||
244 | #address-cells = <1>; | ||
245 | #size-cells = <0>; | ||
246 | compatible = "fsl,gianfar-tbi"; | ||
247 | reg = <0x520 0x20>; | ||
248 | |||
249 | tbi1: tbi-phy@11 { | ||
250 | reg = <0x11>; | ||
251 | device_type = "tbi-phy"; | ||
252 | }; | ||
253 | }; | ||
248 | }; | 254 | }; |
249 | 255 | ||
250 | serial0: serial@4500 { | 256 | serial0: serial@4500 { |