diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-03-19 14:01:48 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-03-24 09:35:13 -0400 |
commit | 84ba4a5899e613a396c5bea5feadba923534801b (patch) | |
tree | 8f5c39fc7dbde9451995ac5b771423707afe8bda /arch/powerpc/boot/dts/mpc8555cds.dts | |
parent | 70b3adbba056f5d9081f1ec9b4a629e3c7502072 (diff) |
powerpc/85xx: 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/mpc8555cds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8555cds.dts | 78 |
1 files changed, 42 insertions, 36 deletions
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts index 053b01e1c93b..9484f0729b10 100644 --- a/arch/powerpc/boot/dts/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/mpc8555cds.dts | |||
@@ -126,66 +126,72 @@ | |||
126 | }; | 126 | }; |
127 | }; | 127 | }; |
128 | 128 | ||
129 | mdio@24520 { | ||
130 | #address-cells = <1>; | ||
131 | #size-cells = <0>; | ||
132 | compatible = "fsl,gianfar-mdio"; | ||
133 | reg = <0x24520 0x20>; | ||
134 | |||
135 | phy0: ethernet-phy@0 { | ||
136 | interrupt-parent = <&mpic>; | ||
137 | interrupts = <5 1>; | ||
138 | reg = <0x0>; | ||
139 | device_type = "ethernet-phy"; | ||
140 | }; | ||
141 | phy1: ethernet-phy@1 { | ||
142 | interrupt-parent = <&mpic>; | ||
143 | interrupts = <5 1>; | ||
144 | reg = <0x1>; | ||
145 | device_type = "ethernet-phy"; | ||
146 | }; | ||
147 | tbi0: tbi-phy@11 { | ||
148 | reg = <0x11>; | ||
149 | device_type = "tbi-phy"; | ||
150 | }; | ||
151 | }; | ||
152 | |||
153 | mdio@25520 { | ||
154 | #address-cells = <1>; | ||
155 | #size-cells = <0>; | ||
156 | compatible = "fsl,gianfar-tbi"; | ||
157 | reg = <0x25520 0x20>; | ||
158 | |||
159 | tbi1: tbi-phy@11 { | ||
160 | reg = <0x11>; | ||
161 | device_type = "tbi-phy"; | ||
162 | }; | ||
163 | }; | ||
164 | |||
165 | enet0: ethernet@24000 { | 129 | enet0: ethernet@24000 { |
130 | #address-cells = <1>; | ||
131 | #size-cells = <1>; | ||
166 | cell-index = <0>; | 132 | cell-index = <0>; |
167 | device_type = "network"; | 133 | device_type = "network"; |
168 | model = "TSEC"; | 134 | model = "TSEC"; |
169 | compatible = "gianfar"; | 135 | compatible = "gianfar"; |
170 | reg = <0x24000 0x1000>; | 136 | reg = <0x24000 0x1000>; |
137 | ranges = <0x0 0x24000 0x1000>; | ||
171 | local-mac-address = [ 00 00 00 00 00 00 ]; | 138 | local-mac-address = [ 00 00 00 00 00 00 ]; |
172 | interrupts = <29 2 30 2 34 2>; | 139 | interrupts = <29 2 30 2 34 2>; |
173 | interrupt-parent = <&mpic>; | 140 | interrupt-parent = <&mpic>; |
174 | tbi-handle = <&tbi0>; | 141 | tbi-handle = <&tbi0>; |
175 | phy-handle = <&phy0>; | 142 | phy-handle = <&phy0>; |
143 | |||
144 | mdio@520 { | ||
145 | #address-cells = <1>; | ||
146 | #size-cells = <0>; | ||
147 | compatible = "fsl,gianfar-mdio"; | ||
148 | reg = <0x520 0x20>; | ||
149 | |||
150 | phy0: ethernet-phy@0 { | ||
151 | interrupt-parent = <&mpic>; | ||
152 | interrupts = <5 1>; | ||
153 | reg = <0x0>; | ||
154 | device_type = "ethernet-phy"; | ||
155 | }; | ||
156 | phy1: ethernet-phy@1 { | ||
157 | interrupt-parent = <&mpic>; | ||
158 | interrupts = <5 1>; | ||
159 | reg = <0x1>; | ||
160 | device_type = "ethernet-phy"; | ||
161 | }; | ||
162 | tbi0: tbi-phy@11 { | ||
163 | reg = <0x11>; | ||
164 | device_type = "tbi-phy"; | ||
165 | }; | ||
166 | }; | ||
176 | }; | 167 | }; |
177 | 168 | ||
178 | enet1: ethernet@25000 { | 169 | enet1: ethernet@25000 { |
170 | #address-cells = <1>; | ||
171 | #size-cells = <1>; | ||
179 | cell-index = <1>; | 172 | cell-index = <1>; |
180 | device_type = "network"; | 173 | device_type = "network"; |
181 | model = "TSEC"; | 174 | model = "TSEC"; |
182 | compatible = "gianfar"; | 175 | compatible = "gianfar"; |
183 | reg = <0x25000 0x1000>; | 176 | reg = <0x25000 0x1000>; |
177 | ranges = <0x0 0x25000 0x1000>; | ||
184 | local-mac-address = [ 00 00 00 00 00 00 ]; | 178 | local-mac-address = [ 00 00 00 00 00 00 ]; |
185 | interrupts = <35 2 36 2 40 2>; | 179 | interrupts = <35 2 36 2 40 2>; |
186 | interrupt-parent = <&mpic>; | 180 | interrupt-parent = <&mpic>; |
187 | tbi-handle = <&tbi1>; | 181 | tbi-handle = <&tbi1>; |
188 | phy-handle = <&phy1>; | 182 | phy-handle = <&phy1>; |
183 | |||
184 | mdio@520 { | ||
185 | #address-cells = <1>; | ||
186 | #size-cells = <0>; | ||
187 | compatible = "fsl,gianfar-tbi"; | ||
188 | reg = <0x520 0x20>; | ||
189 | |||
190 | tbi1: tbi-phy@11 { | ||
191 | reg = <0x11>; | ||
192 | device_type = "tbi-phy"; | ||
193 | }; | ||
194 | }; | ||
189 | }; | 195 | }; |
190 | 196 | ||
191 | serial0: serial@4500 { | 197 | serial0: serial@4500 { |