diff options
-rw-r--r-- | arch/powerpc/boot/dts/asp834x-redboot.dts | 82 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8315erdb.dts | 80 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 69 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitxgp.dts | 42 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc834x_mds.dts | 81 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_mds.dts | 80 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_rdb.dts | 67 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_mds.dts | 80 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8378_rdb.dts | 69 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_mds.dts | 79 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/mpc8379_rdb.dts | 66 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/sbc8349.dts | 80 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/asp834x.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_itx.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_mds.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_mds.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/sbc834x.c | 1 |
18 files changed, 488 insertions, 393 deletions
diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts index 524af7ef9f2..7da84fd7be9 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 { |
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts index 88d691cccb3..3f4c5fb988a 100644 --- a/arch/powerpc/boot/dts/mpc8315erdb.dts +++ b/arch/powerpc/boot/dts/mpc8315erdb.dts | |||
@@ -190,66 +190,74 @@ | |||
190 | phy_type = "utmi"; | 190 | phy_type = "utmi"; |
191 | }; | 191 | }; |
192 | 192 | ||
193 | mdio@24520 { | ||
194 | #address-cells = <1>; | ||
195 | #size-cells = <0>; | ||
196 | compatible = "fsl,gianfar-mdio"; | ||
197 | reg = <0x24520 0x20>; | ||
198 | phy0: ethernet-phy@0 { | ||
199 | interrupt-parent = <&ipic>; | ||
200 | interrupts = <20 0x8>; | ||
201 | reg = <0x0>; | ||
202 | device_type = "ethernet-phy"; | ||
203 | }; | ||
204 | phy1: ethernet-phy@1 { | ||
205 | interrupt-parent = <&ipic>; | ||
206 | interrupts = <19 0x8>; | ||
207 | reg = <0x1>; | ||
208 | device_type = "ethernet-phy"; | ||
209 | }; | ||
210 | tbi0: tbi-phy@11 { | ||
211 | reg = <0x11>; | ||
212 | device_type = "tbi-phy"; | ||
213 | }; | ||
214 | }; | ||
215 | |||
216 | mdio@25520 { | ||
217 | #address-cells = <1>; | ||
218 | #size-cells = <0>; | ||
219 | compatible = "fsl,gianfar-tbi"; | ||
220 | reg = <0x25520 0x20>; | ||
221 | |||
222 | tbi1: tbi-phy@11 { | ||
223 | reg = <0x11>; | ||
224 | device_type = "tbi-phy"; | ||
225 | }; | ||
226 | }; | ||
227 | |||
228 | |||
229 | enet0: ethernet@24000 { | 193 | enet0: ethernet@24000 { |
194 | #address-cells = <1>; | ||
195 | #size-cells = <1>; | ||
230 | cell-index = <0>; | 196 | cell-index = <0>; |
231 | device_type = "network"; | 197 | device_type = "network"; |
232 | model = "eTSEC"; | 198 | model = "eTSEC"; |
233 | compatible = "gianfar"; | 199 | compatible = "gianfar"; |
234 | reg = <0x24000 0x1000>; | 200 | reg = <0x24000 0x1000>; |
201 | ranges = <0x0 0x24000 0x1000>; | ||
235 | local-mac-address = [ 00 00 00 00 00 00 ]; | 202 | local-mac-address = [ 00 00 00 00 00 00 ]; |
236 | interrupts = <32 0x8 33 0x8 34 0x8>; | 203 | interrupts = <32 0x8 33 0x8 34 0x8>; |
237 | interrupt-parent = <&ipic>; | 204 | interrupt-parent = <&ipic>; |
238 | tbi-handle = <&tbi0>; | 205 | tbi-handle = <&tbi0>; |
239 | phy-handle = < &phy0 >; | 206 | phy-handle = < &phy0 >; |
207 | |||
208 | mdio@520 { | ||
209 | #address-cells = <1>; | ||
210 | #size-cells = <0>; | ||
211 | compatible = "fsl,gianfar-mdio"; | ||
212 | reg = <0x520 0x20>; | ||
213 | |||
214 | phy0: ethernet-phy@0 { | ||
215 | interrupt-parent = <&ipic>; | ||
216 | interrupts = <20 0x8>; | ||
217 | reg = <0x0>; | ||
218 | device_type = "ethernet-phy"; | ||
219 | }; | ||
220 | |||
221 | phy1: ethernet-phy@1 { | ||
222 | interrupt-parent = <&ipic>; | ||
223 | interrupts = <19 0x8>; | ||
224 | reg = <0x1>; | ||
225 | device_type = "ethernet-phy"; | ||
226 | }; | ||
227 | |||
228 | tbi0: tbi-phy@11 { | ||
229 | reg = <0x11>; | ||
230 | device_type = "tbi-phy"; | ||
231 | }; | ||
232 | }; | ||
240 | }; | 233 | }; |
241 | 234 | ||
242 | enet1: ethernet@25000 { | 235 | enet1: ethernet@25000 { |
236 | #address-cells = <1>; | ||
237 | #size-cells = <1>; | ||
243 | cell-index = <1>; | 238 | cell-index = <1>; |
244 | device_type = "network"; | 239 | device_type = "network"; |
245 | model = "eTSEC"; | 240 | model = "eTSEC"; |
246 | compatible = "gianfar"; | 241 | compatible = "gianfar"; |
247 | reg = <0x25000 0x1000>; | 242 | reg = <0x25000 0x1000>; |
243 | ranges = <0x0 0x25000 0x1000>; | ||
248 | local-mac-address = [ 00 00 00 00 00 00 ]; | 244 | local-mac-address = [ 00 00 00 00 00 00 ]; |
249 | interrupts = <35 0x8 36 0x8 37 0x8>; | 245 | interrupts = <35 0x8 36 0x8 37 0x8>; |
250 | interrupt-parent = <&ipic>; | 246 | interrupt-parent = <&ipic>; |
251 | tbi-handle = <&tbi1>; | 247 | tbi-handle = <&tbi1>; |
252 | phy-handle = < &phy1 >; | 248 | phy-handle = < &phy1 >; |
249 | |||
250 | mdio@520 { | ||
251 | #address-cells = <1>; | ||
252 | #size-cells = <0>; | ||
253 | compatible = "fsl,gianfar-tbi"; | ||
254 | reg = <0x520 0x20>; | ||
255 | |||
256 | tbi1: tbi-phy@11 { | ||
257 | reg = <0x11>; | ||
258 | device_type = "tbi-phy"; | ||
259 | }; | ||
260 | }; | ||
253 | }; | 261 | }; |
254 | 262 | ||
255 | serial0: serial@4500 { | 263 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index b5eda94a8e2..1ae38f0ddef 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts | |||
@@ -170,57 +170,52 @@ | |||
170 | phy_type = "ulpi"; | 170 | phy_type = "ulpi"; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | mdio@24520 { | ||
174 | #address-cells = <1>; | ||
175 | #size-cells = <0>; | ||
176 | compatible = "fsl,gianfar-mdio"; | ||
177 | reg = <0x24520 0x20>; | ||
178 | |||
179 | /* Vitesse 8201 */ | ||
180 | phy1c: ethernet-phy@1c { | ||
181 | interrupt-parent = <&ipic>; | ||
182 | interrupts = <18 0x8>; | ||
183 | reg = <0x1c>; | ||
184 | device_type = "ethernet-phy"; | ||
185 | }; | ||
186 | tbi0: tbi-phy@11 { | ||
187 | reg = <0x11>; | ||
188 | device_type = "tbi-phy"; | ||
189 | }; | ||
190 | }; | ||
191 | |||
192 | mdio@25520 { | ||
193 | #address-cells = <1>; | ||
194 | #size-cells = <0>; | ||
195 | compatible = "fsl,gianfar-tbi"; | ||
196 | reg = <0x25520 0x20>; | ||
197 | |||
198 | tbi1: tbi-phy@11 { | ||
199 | reg = <0x11>; | ||
200 | device_type = "tbi-phy"; | ||
201 | }; | ||
202 | }; | ||
203 | |||
204 | enet0: ethernet@24000 { | 173 | enet0: ethernet@24000 { |
174 | #address-cells = <1>; | ||
175 | #size-cells = <1>; | ||
205 | cell-index = <0>; | 176 | cell-index = <0>; |
206 | device_type = "network"; | 177 | device_type = "network"; |
207 | model = "TSEC"; | 178 | model = "TSEC"; |
208 | compatible = "gianfar"; | 179 | compatible = "gianfar"; |
209 | reg = <0x24000 0x1000>; | 180 | reg = <0x24000 0x1000>; |
181 | ranges = <0x0 0x24000 0x1000>; | ||
210 | local-mac-address = [ 00 00 00 00 00 00 ]; | 182 | local-mac-address = [ 00 00 00 00 00 00 ]; |
211 | interrupts = <32 0x8 33 0x8 34 0x8>; | 183 | interrupts = <32 0x8 33 0x8 34 0x8>; |
212 | interrupt-parent = <&ipic>; | 184 | interrupt-parent = <&ipic>; |
213 | tbi-handle = <&tbi0>; | 185 | tbi-handle = <&tbi0>; |
214 | phy-handle = <&phy1c>; | 186 | phy-handle = <&phy1c>; |
215 | linux,network-index = <0>; | 187 | linux,network-index = <0>; |
188 | |||
189 | mdio@520 { | ||
190 | #address-cells = <1>; | ||
191 | #size-cells = <0>; | ||
192 | compatible = "fsl,gianfar-mdio"; | ||
193 | reg = <0x520 0x20>; | ||
194 | |||
195 | /* Vitesse 8201 */ | ||
196 | phy1c: ethernet-phy@1c { | ||
197 | interrupt-parent = <&ipic>; | ||
198 | interrupts = <18 0x8>; | ||
199 | reg = <0x1c>; | ||
200 | device_type = "ethernet-phy"; | ||
201 | }; | ||
202 | |||
203 | tbi0: tbi-phy@11 { | ||
204 | reg = <0x11>; | ||
205 | device_type = "tbi-phy"; | ||
206 | }; | ||
207 | }; | ||
216 | }; | 208 | }; |
217 | 209 | ||
218 | enet1: ethernet@25000 { | 210 | enet1: ethernet@25000 { |
211 | #address-cells = <1>; | ||
212 | #size-cells = <1>; | ||
219 | cell-index = <1>; | 213 | cell-index = <1>; |
220 | device_type = "network"; | 214 | device_type = "network"; |
221 | model = "TSEC"; | 215 | model = "TSEC"; |
222 | compatible = "gianfar"; | 216 | compatible = "gianfar"; |
223 | reg = <0x25000 0x1000>; | 217 | reg = <0x25000 0x1000>; |
218 | ranges = <0x0 0x25000 0x1000>; | ||
224 | local-mac-address = [ 00 00 00 00 00 00 ]; | 219 | local-mac-address = [ 00 00 00 00 00 00 ]; |
225 | interrupts = <35 0x8 36 0x8 37 0x8>; | 220 | interrupts = <35 0x8 36 0x8 37 0x8>; |
226 | interrupt-parent = <&ipic>; | 221 | interrupt-parent = <&ipic>; |
@@ -228,6 +223,18 @@ | |||
228 | fixed-link = <1 1 1000 0 0>; | 223 | fixed-link = <1 1 1000 0 0>; |
229 | linux,network-index = <1>; | 224 | linux,network-index = <1>; |
230 | tbi-handle = <&tbi1>; | 225 | tbi-handle = <&tbi1>; |
226 | |||
227 | mdio@520 { | ||
228 | #address-cells = <1>; | ||
229 | #size-cells = <0>; | ||
230 | compatible = "fsl,gianfar-tbi"; | ||
231 | reg = <0x520 0x20>; | ||
232 | |||
233 | tbi1: tbi-phy@11 { | ||
234 | reg = <0x11>; | ||
235 | device_type = "tbi-phy"; | ||
236 | }; | ||
237 | }; | ||
231 | }; | 238 | }; |
232 | 239 | ||
233 | serial0: serial@4500 { | 240 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts index c87a6015e16..662abe1fb80 100644 --- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts +++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts | |||
@@ -149,37 +149,41 @@ | |||
149 | phy_type = "ulpi"; | 149 | phy_type = "ulpi"; |
150 | }; | 150 | }; |
151 | 151 | ||
152 | mdio@24520 { | ||
153 | #address-cells = <1>; | ||
154 | #size-cells = <0>; | ||
155 | compatible = "fsl,gianfar-mdio"; | ||
156 | reg = <0x24520 0x20>; | ||
157 | |||
158 | /* Vitesse 8201 */ | ||
159 | phy1c: ethernet-phy@1c { | ||
160 | interrupt-parent = <&ipic>; | ||
161 | interrupts = <18 0x8>; | ||
162 | reg = <0x1c>; | ||
163 | device_type = "ethernet-phy"; | ||
164 | }; | ||
165 | tbi0: tbi-phy@11 { | ||
166 | reg = <0x11>; | ||
167 | device_type = "tbi-phy"; | ||
168 | }; | ||
169 | }; | ||
170 | |||
171 | enet0: ethernet@24000 { | 152 | enet0: ethernet@24000 { |
153 | #address-cells = <1>; | ||
154 | #size-cells = <1>; | ||
172 | cell-index = <0>; | 155 | cell-index = <0>; |
173 | device_type = "network"; | 156 | device_type = "network"; |
174 | model = "TSEC"; | 157 | model = "TSEC"; |
175 | compatible = "gianfar"; | 158 | compatible = "gianfar"; |
176 | reg = <0x24000 0x1000>; | 159 | reg = <0x24000 0x1000>; |
160 | ranges = <0x0 0x24000 0x1000>; | ||
177 | local-mac-address = [ 00 00 00 00 00 00 ]; | 161 | local-mac-address = [ 00 00 00 00 00 00 ]; |
178 | interrupts = <32 0x8 33 0x8 34 0x8>; | 162 | interrupts = <32 0x8 33 0x8 34 0x8>; |
179 | interrupt-parent = <&ipic>; | 163 | interrupt-parent = <&ipic>; |
180 | tbi-handle = <&tbi0>; | 164 | tbi-handle = <&tbi0>; |
181 | phy-handle = <&phy1c>; | 165 | phy-handle = <&phy1c>; |
182 | linux,network-index = <0>; | 166 | linux,network-index = <0>; |
167 | |||
168 | mdio@520 { | ||
169 | #address-cells = <1>; | ||
170 | #size-cells = <0>; | ||
171 | compatible = "fsl,gianfar-mdio"; | ||
172 | reg = <0x520 0x20>; | ||
173 | |||
174 | /* Vitesse 8201 */ | ||
175 | phy1c: ethernet-phy@1c { | ||
176 | interrupt-parent = <&ipic>; | ||
177 | interrupts = <18 0x8>; | ||
178 | reg = <0x1c>; | ||
179 | device_type = "ethernet-phy"; | ||
180 | }; | ||
181 | |||
182 | tbi0: tbi-phy@11 { | ||
183 | reg = <0x11>; | ||
184 | device_type = "tbi-phy"; | ||
185 | }; | ||
186 | }; | ||
183 | }; | 187 | }; |
184 | 188 | ||
185 | serial0: serial@4500 { | 189 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts index d9adba01c09..d9f0a2325fa 100644 --- a/arch/powerpc/boot/dts/mpc834x_mds.dts +++ b/arch/powerpc/boot/dts/mpc834x_mds.dts | |||
@@ -167,69 +167,76 @@ | |||
167 | phy_type = "ulpi"; | 167 | phy_type = "ulpi"; |
168 | }; | 168 | }; |
169 | 169 | ||
170 | mdio@24520 { | ||
171 | #address-cells = <1>; | ||
172 | #size-cells = <0>; | ||
173 | compatible = "fsl,gianfar-mdio"; | ||
174 | reg = <0x24520 0x20>; | ||
175 | |||
176 | phy0: ethernet-phy@0 { | ||
177 | interrupt-parent = <&ipic>; | ||
178 | interrupts = <17 0x8>; | ||
179 | reg = <0x0>; | ||
180 | device_type = "ethernet-phy"; | ||
181 | }; | ||
182 | phy1: ethernet-phy@1 { | ||
183 | interrupt-parent = <&ipic>; | ||
184 | interrupts = <18 0x8>; | ||
185 | reg = <0x1>; | ||
186 | device_type = "ethernet-phy"; | ||
187 | }; | ||
188 | tbi0: tbi-phy@11 { | ||
189 | reg = <0x11>; | ||
190 | device_type = "tbi-phy"; | ||
191 | }; | ||
192 | }; | ||
193 | |||
194 | mdio@25520 { | ||
195 | #address-cells = <1>; | ||
196 | #size-cells = <0>; | ||
197 | compatible = "fsl,gianfar-tbi"; | ||
198 | reg = <0x25520 0x20>; | ||
199 | |||
200 | tbi1: tbi-phy@11 { | ||
201 | reg = <0x11>; | ||
202 | device_type = "tbi-phy"; | ||
203 | }; | ||
204 | }; | ||
205 | |||
206 | |||
207 | enet0: ethernet@24000 { | 170 | enet0: ethernet@24000 { |
171 | #address-cells = <1>; | ||
172 | #size-cells = <1>; | ||
208 | cell-index = <0>; | 173 | cell-index = <0>; |
209 | device_type = "network"; | 174 | device_type = "network"; |
210 | model = "TSEC"; | 175 | model = "TSEC"; |
211 | compatible = "gianfar"; | 176 | compatible = "gianfar"; |
212 | reg = <0x24000 0x1000>; | 177 | reg = <0x24000 0x1000>; |
178 | ranges = <0x0 0x24000 0x1000>; | ||
213 | local-mac-address = [ 00 00 00 00 00 00 ]; | 179 | local-mac-address = [ 00 00 00 00 00 00 ]; |
214 | interrupts = <32 0x8 33 0x8 34 0x8>; | 180 | interrupts = <32 0x8 33 0x8 34 0x8>; |
215 | interrupt-parent = <&ipic>; | 181 | interrupt-parent = <&ipic>; |
216 | tbi-handle = <&tbi0>; | 182 | tbi-handle = <&tbi0>; |
217 | phy-handle = <&phy0>; | 183 | phy-handle = <&phy0>; |
218 | linux,network-index = <0>; | 184 | linux,network-index = <0>; |
185 | |||
186 | mdio@520 { | ||
187 | #address-cells = <1>; | ||
188 | #size-cells = <0>; | ||
189 | compatible = "fsl,gianfar-mdio"; | ||
190 | reg = <0x520 0x20>; | ||
191 | |||
192 | phy0: ethernet-phy@0 { | ||
193 | interrupt-parent = <&ipic>; | ||
194 | interrupts = <17 0x8>; | ||
195 | reg = <0x0>; | ||
196 | device_type = "ethernet-phy"; | ||
197 | }; | ||
198 | |||
199 | phy1: ethernet-phy@1 { | ||
200 | interrupt-parent = <&ipic>; | ||
201 | interrupts = <18 0x8>; | ||
202 | reg = <0x1>; | ||
203 | device_type = "ethernet-phy"; | ||
204 | }; | ||
205 | |||
206 | tbi0: tbi-phy@11 { | ||
207 | reg = <0x11>; | ||
208 | device_type = "tbi-phy"; | ||
209 | }; | ||
210 | }; | ||
219 | }; | 211 | }; |
220 | 212 | ||
221 | enet1: ethernet@25000 { | 213 | enet1: ethernet@25000 { |
214 | #address-cells = <1>; | ||
215 | #size-cells = <1>; | ||
222 | cell-index = <1>; | 216 | cell-index = <1>; |
223 | device_type = "network"; | 217 | device_type = "network"; |
224 | model = "TSEC"; | 218 | model = "TSEC"; |
225 | compatible = "gianfar"; | 219 | compatible = "gianfar"; |
226 | reg = <0x25000 0x1000>; | 220 | reg = <0x25000 0x1000>; |
221 | ranges = <0x0 0x25000 0x1000>; | ||
227 | local-mac-address = [ 00 00 00 00 00 00 ]; | 222 | local-mac-address = [ 00 00 00 00 00 00 ]; |
228 | interrupts = <35 0x8 36 0x8 37 0x8>; | 223 | interrupts = <35 0x8 36 0x8 37 0x8>; |
229 | interrupt-parent = <&ipic>; | 224 | interrupt-parent = <&ipic>; |
230 | tbi-handle = <&tbi1>; | 225 | tbi-handle = <&tbi1>; |
231 | phy-handle = <&phy1>; | 226 | phy-handle = <&phy1>; |
232 | linux,network-index = <1>; | 227 | linux,network-index = <1>; |
228 | |||
229 | mdio@520 { | ||
230 | #address-cells = <1>; | ||
231 | #size-cells = <0>; | ||
232 | compatible = "fsl,gianfar-tbi"; | ||
233 | reg = <0x520 0x20>; | ||
234 | |||
235 | tbi1: tbi-phy@11 { | ||
236 | reg = <0x11>; | ||
237 | device_type = "tbi-phy"; | ||
238 | }; | ||
239 | }; | ||
233 | }; | 240 | }; |
234 | 241 | ||
235 | serial0: serial@4500 { | 242 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts index cebfc50f4ce..963708017e6 100644 --- a/arch/powerpc/boot/dts/mpc8377_mds.dts +++ b/arch/powerpc/boot/dts/mpc8377_mds.dts | |||
@@ -196,48 +196,15 @@ | |||
196 | sleep = <&pmc 0x00c00000>; | 196 | sleep = <&pmc 0x00c00000>; |
197 | }; | 197 | }; |
198 | 198 | ||
199 | mdio@24520 { | ||
200 | #address-cells = <1>; | ||
201 | #size-cells = <0>; | ||
202 | compatible = "fsl,gianfar-mdio"; | ||
203 | reg = <0x24520 0x20>; | ||
204 | phy2: ethernet-phy@2 { | ||
205 | interrupt-parent = <&ipic>; | ||
206 | interrupts = <17 0x8>; | ||
207 | reg = <0x2>; | ||
208 | device_type = "ethernet-phy"; | ||
209 | }; | ||
210 | phy3: ethernet-phy@3 { | ||
211 | interrupt-parent = <&ipic>; | ||
212 | interrupts = <18 0x8>; | ||
213 | reg = <0x3>; | ||
214 | device_type = "ethernet-phy"; | ||
215 | }; | ||
216 | tbi0: tbi-phy@11 { | ||
217 | reg = <0x11>; | ||
218 | device_type = "tbi-phy"; | ||
219 | }; | ||
220 | }; | ||
221 | |||
222 | mdio@25520 { | ||
223 | #address-cells = <1>; | ||
224 | #size-cells = <0>; | ||
225 | compatible = "fsl,gianfar-tbi"; | ||
226 | reg = <0x25520 0x20>; | ||
227 | |||
228 | tbi1: tbi-phy@11 { | ||
229 | reg = <0x11>; | ||
230 | device_type = "tbi-phy"; | ||
231 | }; | ||
232 | }; | ||
233 | |||
234 | |||
235 | enet0: ethernet@24000 { | 199 | enet0: ethernet@24000 { |
200 | #address-cells = <1>; | ||
201 | #size-cells = <1>; | ||
236 | cell-index = <0>; | 202 | cell-index = <0>; |
237 | device_type = "network"; | 203 | device_type = "network"; |
238 | model = "eTSEC"; | 204 | model = "eTSEC"; |
239 | compatible = "gianfar"; | 205 | compatible = "gianfar"; |
240 | reg = <0x24000 0x1000>; | 206 | reg = <0x24000 0x1000>; |
207 | ranges = <0x0 0x24000 0x1000>; | ||
241 | local-mac-address = [ 00 00 00 00 00 00 ]; | 208 | local-mac-address = [ 00 00 00 00 00 00 ]; |
242 | interrupts = <32 0x8 33 0x8 34 0x8>; | 209 | interrupts = <32 0x8 33 0x8 34 0x8>; |
243 | phy-connection-type = "mii"; | 210 | phy-connection-type = "mii"; |
@@ -246,14 +213,43 @@ | |||
246 | phy-handle = <&phy2>; | 213 | phy-handle = <&phy2>; |
247 | sleep = <&pmc 0xc0000000>; | 214 | sleep = <&pmc 0xc0000000>; |
248 | fsl,magic-packet; | 215 | fsl,magic-packet; |
216 | |||
217 | mdio@520 { | ||
218 | #address-cells = <1>; | ||
219 | #size-cells = <0>; | ||
220 | compatible = "fsl,gianfar-mdio"; | ||
221 | reg = <0x520 0x20>; | ||
222 | |||
223 | phy2: ethernet-phy@2 { | ||
224 | interrupt-parent = <&ipic>; | ||
225 | interrupts = <17 0x8>; | ||
226 | reg = <0x2>; | ||
227 | device_type = "ethernet-phy"; | ||
228 | }; | ||
229 | |||
230 | phy3: ethernet-phy@3 { | ||
231 | interrupt-parent = <&ipic>; | ||
232 | interrupts = <18 0x8>; | ||
233 | reg = <0x3>; | ||
234 | device_type = "ethernet-phy"; | ||
235 | }; | ||
236 | |||
237 | tbi0: tbi-phy@11 { | ||
238 | reg = <0x11>; | ||
239 | device_type = "tbi-phy"; | ||
240 | }; | ||
241 | }; | ||
249 | }; | 242 | }; |
250 | 243 | ||
251 | enet1: ethernet@25000 { | 244 | enet1: ethernet@25000 { |
245 | #address-cells = <1>; | ||
246 | #size-cells = <1>; | ||
252 | cell-index = <1>; | 247 | cell-index = <1>; |
253 | device_type = "network"; | 248 | device_type = "network"; |
254 | model = "eTSEC"; | 249 | model = "eTSEC"; |
255 | compatible = "gianfar"; | 250 | compatible = "gianfar"; |
256 | reg = <0x25000 0x1000>; | 251 | reg = <0x25000 0x1000>; |
252 | ranges = <0x0 0x25000 0x1000>; | ||
257 | local-mac-address = [ 00 00 00 00 00 00 ]; | 253 | local-mac-address = [ 00 00 00 00 00 00 ]; |
258 | interrupts = <35 0x8 36 0x8 37 0x8>; | 254 | interrupts = <35 0x8 36 0x8 37 0x8>; |
259 | phy-connection-type = "mii"; | 255 | phy-connection-type = "mii"; |
@@ -262,6 +258,18 @@ | |||
262 | phy-handle = <&phy3>; | 258 | phy-handle = <&phy3>; |
263 | sleep = <&pmc 0x30000000>; | 259 | sleep = <&pmc 0x30000000>; |
264 | fsl,magic-packet; | 260 | fsl,magic-packet; |
261 | |||
262 | mdio@520 { | ||
263 | #address-cells = <1>; | ||
264 | #size-cells = <0>; | ||
265 | compatible = "fsl,gianfar-tbi"; | ||
266 | reg = <0x520 0x20>; | ||
267 | |||
268 | tbi1: tbi-phy@11 { | ||
269 | reg = <0x11>; | ||
270 | device_type = "tbi-phy"; | ||
271 | }; | ||
272 | }; | ||
265 | }; | 273 | }; |
266 | 274 | ||
267 | serial0: serial@4500 { | 275 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts index 32311c8f55d..053339390c2 100644 --- a/arch/powerpc/boot/dts/mpc8377_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts | |||
@@ -248,42 +248,15 @@ | |||
248 | sleep = <&pmc 0x00c00000>; | 248 | sleep = <&pmc 0x00c00000>; |
249 | }; | 249 | }; |
250 | 250 | ||
251 | mdio@24520 { | ||
252 | #address-cells = <1>; | ||
253 | #size-cells = <0>; | ||
254 | compatible = "fsl,gianfar-mdio"; | ||
255 | reg = <0x24520 0x20>; | ||
256 | phy2: ethernet-phy@2 { | ||
257 | interrupt-parent = <&ipic>; | ||
258 | interrupts = <17 0x8>; | ||
259 | reg = <0x2>; | ||
260 | device_type = "ethernet-phy"; | ||
261 | }; | ||
262 | tbi0: tbi-phy@11 { | ||
263 | reg = <0x11>; | ||
264 | device_type = "tbi-phy"; | ||
265 | }; | ||
266 | }; | ||
267 | |||
268 | mdio@25520 { | ||
269 | #address-cells = <1>; | ||
270 | #size-cells = <0>; | ||
271 | compatible = "fsl,gianfar-tbi"; | ||
272 | reg = <0x25520 0x20>; | ||
273 | |||
274 | tbi1: tbi-phy@11 { | ||
275 | reg = <0x11>; | ||
276 | device_type = "tbi-phy"; | ||
277 | }; | ||
278 | }; | ||
279 | |||
280 | |||
281 | enet0: ethernet@24000 { | 251 | enet0: ethernet@24000 { |
252 | #address-cells = <1>; | ||
253 | #size-cells = <1>; | ||
282 | cell-index = <0>; | 254 | cell-index = <0>; |
283 | device_type = "network"; | 255 | device_type = "network"; |
284 | model = "eTSEC"; | 256 | model = "eTSEC"; |
285 | compatible = "gianfar"; | 257 | compatible = "gianfar"; |
286 | reg = <0x24000 0x1000>; | 258 | reg = <0x24000 0x1000>; |
259 | ranges = <0x0 0x24000 0x1000>; | ||
287 | local-mac-address = [ 00 00 00 00 00 00 ]; | 260 | local-mac-address = [ 00 00 00 00 00 00 ]; |
288 | interrupts = <32 0x8 33 0x8 34 0x8>; | 261 | interrupts = <32 0x8 33 0x8 34 0x8>; |
289 | phy-connection-type = "mii"; | 262 | phy-connection-type = "mii"; |
@@ -292,14 +265,36 @@ | |||
292 | phy-handle = <&phy2>; | 265 | phy-handle = <&phy2>; |
293 | sleep = <&pmc 0xc0000000>; | 266 | sleep = <&pmc 0xc0000000>; |
294 | fsl,magic-packet; | 267 | fsl,magic-packet; |
268 | |||
269 | mdio@520 { | ||
270 | #address-cells = <1>; | ||
271 | #size-cells = <0>; | ||
272 | compatible = "fsl,gianfar-mdio"; | ||
273 | reg = <0x520 0x20>; | ||
274 | |||
275 | phy2: ethernet-phy@2 { | ||
276 | interrupt-parent = <&ipic>; | ||
277 | interrupts = <17 0x8>; | ||
278 | reg = <0x2>; | ||
279 | device_type = "ethernet-phy"; | ||
280 | }; | ||
281 | |||
282 | tbi0: tbi-phy@11 { | ||
283 | reg = <0x11>; | ||
284 | device_type = "tbi-phy"; | ||
285 | }; | ||
286 | }; | ||
295 | }; | 287 | }; |
296 | 288 | ||
297 | enet1: ethernet@25000 { | 289 | enet1: ethernet@25000 { |
290 | #address-cells = <1>; | ||
291 | #size-cells = <1>; | ||
298 | cell-index = <1>; | 292 | cell-index = <1>; |
299 | device_type = "network"; | 293 | device_type = "network"; |
300 | model = "eTSEC"; | 294 | model = "eTSEC"; |
301 | compatible = "gianfar"; | 295 | compatible = "gianfar"; |
302 | reg = <0x25000 0x1000>; | 296 | reg = <0x25000 0x1000>; |
297 | ranges = <0x0 0x25000 0x1000>; | ||
303 | local-mac-address = [ 00 00 00 00 00 00 ]; | 298 | local-mac-address = [ 00 00 00 00 00 00 ]; |
304 | interrupts = <35 0x8 36 0x8 37 0x8>; | 299 | interrupts = <35 0x8 36 0x8 37 0x8>; |
305 | phy-connection-type = "mii"; | 300 | phy-connection-type = "mii"; |
@@ -308,6 +303,18 @@ | |||
308 | tbi-handle = <&tbi1>; | 303 | tbi-handle = <&tbi1>; |
309 | sleep = <&pmc 0x30000000>; | 304 | sleep = <&pmc 0x30000000>; |
310 | fsl,magic-packet; | 305 | fsl,magic-packet; |
306 | |||
307 | mdio@520 { | ||
308 | #address-cells = <1>; | ||
309 | #size-cells = <0>; | ||
310 | compatible = "fsl,gianfar-tbi"; | ||
311 | reg = <0x520 0x20>; | ||
312 | |||
313 | tbi1: tbi-phy@11 { | ||
314 | reg = <0x11>; | ||
315 | device_type = "tbi-phy"; | ||
316 | }; | ||
317 | }; | ||
311 | }; | 318 | }; |
312 | 319 | ||
313 | serial0: serial@4500 { | 320 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts index 155841d4db2..651ff2f9db2 100644 --- a/arch/powerpc/boot/dts/mpc8378_mds.dts +++ b/arch/powerpc/boot/dts/mpc8378_mds.dts | |||
@@ -235,48 +235,15 @@ | |||
235 | sleep = <&pmc 0x00c00000>; | 235 | sleep = <&pmc 0x00c00000>; |
236 | }; | 236 | }; |
237 | 237 | ||
238 | mdio@24520 { | ||
239 | #address-cells = <1>; | ||
240 | #size-cells = <0>; | ||
241 | compatible = "fsl,gianfar-mdio"; | ||
242 | reg = <0x24520 0x20>; | ||
243 | phy2: ethernet-phy@2 { | ||
244 | interrupt-parent = <&ipic>; | ||
245 | interrupts = <17 0x8>; | ||
246 | reg = <0x2>; | ||
247 | device_type = "ethernet-phy"; | ||
248 | }; | ||
249 | phy3: ethernet-phy@3 { | ||
250 | interrupt-parent = <&ipic>; | ||
251 | interrupts = <18 0x8>; | ||
252 | reg = <0x3>; | ||
253 | device_type = "ethernet-phy"; | ||
254 | }; | ||
255 | tbi0: tbi-phy@11 { | ||
256 | reg = <0x11>; | ||
257 | device_type = "tbi-phy"; | ||
258 | }; | ||
259 | }; | ||
260 | |||
261 | mdio@25520 { | ||
262 | #address-cells = <1>; | ||
263 | #size-cells = <0>; | ||
264 | compatible = "fsl,gianfar-tbi"; | ||
265 | reg = <0x25520 0x20>; | ||
266 | |||
267 | tbi1: tbi-phy@11 { | ||
268 | reg = <0x11>; | ||
269 | device_type = "tbi-phy"; | ||
270 | }; | ||
271 | }; | ||
272 | |||
273 | |||
274 | enet0: ethernet@24000 { | 238 | enet0: ethernet@24000 { |
239 | #address-cells = <1>; | ||
240 | #size-cells = <1>; | ||
275 | cell-index = <0>; | 241 | cell-index = <0>; |
276 | device_type = "network"; | 242 | device_type = "network"; |
277 | model = "eTSEC"; | 243 | model = "eTSEC"; |
278 | compatible = "gianfar"; | 244 | compatible = "gianfar"; |
279 | reg = <0x24000 0x1000>; | 245 | reg = <0x24000 0x1000>; |
246 | ranges = <0x0 0x24000 0x1000>; | ||
280 | local-mac-address = [ 00 00 00 00 00 00 ]; | 247 | local-mac-address = [ 00 00 00 00 00 00 ]; |
281 | interrupts = <32 0x8 33 0x8 34 0x8>; | 248 | interrupts = <32 0x8 33 0x8 34 0x8>; |
282 | phy-connection-type = "mii"; | 249 | phy-connection-type = "mii"; |
@@ -285,14 +252,43 @@ | |||
285 | phy-handle = <&phy2>; | 252 | phy-handle = <&phy2>; |
286 | sleep = <&pmc 0xc0000000>; | 253 | sleep = <&pmc 0xc0000000>; |
287 | fsl,magic-packet; | 254 | fsl,magic-packet; |
255 | |||
256 | mdio@520 { | ||
257 | #address-cells = <1>; | ||
258 | #size-cells = <0>; | ||
259 | compatible = "fsl,gianfar-mdio"; | ||
260 | reg = <0x520 0x20>; | ||
261 | |||
262 | phy2: ethernet-phy@2 { | ||
263 | interrupt-parent = <&ipic>; | ||
264 | interrupts = <17 0x8>; | ||
265 | reg = <0x2>; | ||
266 | device_type = "ethernet-phy"; | ||
267 | }; | ||
268 | |||
269 | phy3: ethernet-phy@3 { | ||
270 | interrupt-parent = <&ipic>; | ||
271 | interrupts = <18 0x8>; | ||
272 | reg = <0x3>; | ||
273 | device_type = "ethernet-phy"; | ||
274 | }; | ||
275 | |||
276 | tbi0: tbi-phy@11 { | ||
277 | reg = <0x11>; | ||
278 | device_type = "tbi-phy"; | ||
279 | }; | ||
280 | }; | ||
288 | }; | 281 | }; |
289 | 282 | ||
290 | enet1: ethernet@25000 { | 283 | enet1: ethernet@25000 { |
284 | #address-cells = <1>; | ||
285 | #size-cells = <1>; | ||
291 | cell-index = <1>; | 286 | cell-index = <1>; |
292 | device_type = "network"; | 287 | device_type = "network"; |
293 | model = "eTSEC"; | 288 | model = "eTSEC"; |
294 | compatible = "gianfar"; | 289 | compatible = "gianfar"; |
295 | reg = <0x25000 0x1000>; | 290 | reg = <0x25000 0x1000>; |
291 | ranges = <0x0 0x25000 0x1000>; | ||
296 | local-mac-address = [ 00 00 00 00 00 00 ]; | 292 | local-mac-address = [ 00 00 00 00 00 00 ]; |
297 | interrupts = <35 0x8 36 0x8 37 0x8>; | 293 | interrupts = <35 0x8 36 0x8 37 0x8>; |
298 | phy-connection-type = "mii"; | 294 | phy-connection-type = "mii"; |
@@ -301,6 +297,18 @@ | |||
301 | phy-handle = <&phy3>; | 297 | phy-handle = <&phy3>; |
302 | sleep = <&pmc 0x30000000>; | 298 | sleep = <&pmc 0x30000000>; |
303 | fsl,magic-packet; | 299 | fsl,magic-packet; |
300 | |||
301 | mdio@520 { | ||
302 | #address-cells = <1>; | ||
303 | #size-cells = <0>; | ||
304 | compatible = "fsl,gianfar-tbi"; | ||
305 | reg = <0x520 0x20>; | ||
306 | |||
307 | tbi1: tbi-phy@11 { | ||
308 | reg = <0x11>; | ||
309 | device_type = "tbi-phy"; | ||
310 | }; | ||
311 | }; | ||
304 | }; | 312 | }; |
305 | 313 | ||
306 | serial0: serial@4500 { | 314 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts index 54ad96c1fc8..5d90e85704c 100644 --- a/arch/powerpc/boot/dts/mpc8378_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts | |||
@@ -248,64 +248,73 @@ | |||
248 | sleep = <&pmc 0x00c00000>; | 248 | sleep = <&pmc 0x00c00000>; |
249 | }; | 249 | }; |
250 | 250 | ||
251 | mdio@24520 { | ||
252 | #address-cells = <1>; | ||
253 | #size-cells = <0>; | ||
254 | compatible = "fsl,gianfar-mdio"; | ||
255 | reg = <0x24520 0x20>; | ||
256 | phy2: ethernet-phy@2 { | ||
257 | interrupt-parent = <&ipic>; | ||
258 | interrupts = <17 0x8>; | ||
259 | reg = <0x2>; | ||
260 | device_type = "ethernet-phy"; | ||
261 | }; | ||
262 | tbi0: tbi-phy@11 { | ||
263 | reg = <0x11>; | ||
264 | device_type = "tbi-phy"; | ||
265 | }; | ||
266 | }; | ||
267 | |||
268 | mdio@25520 { | ||
269 | #address-cells = <1>; | ||
270 | #size-cells = <0>; | ||
271 | compatible = "fsl,gianfar-tbi"; | ||
272 | reg = <0x25520 0x20>; | ||
273 | |||
274 | tbi1: tbi-phy@11 { | ||
275 | reg = <0x11>; | ||
276 | device_type = "tbi-phy"; | ||
277 | }; | ||
278 | }; | ||
279 | |||
280 | |||
281 | enet0: ethernet@24000 { | 251 | enet0: ethernet@24000 { |
252 | #address-cells = <1>; | ||
253 | #size-cells = <1>; | ||
282 | cell-index = <0>; | 254 | cell-index = <0>; |
283 | device_type = "network"; | 255 | device_type = "network"; |
284 | model = "eTSEC"; | 256 | model = "eTSEC"; |
285 | compatible = "gianfar"; | 257 | compatible = "gianfar"; |
286 | reg = <0x24000 0x1000>; | 258 | reg = <0x24000 0x1000>; |
259 | ranges = <0x0 0x24000 0x1000>; | ||
287 | local-mac-address = [ 00 00 00 00 00 00 ]; | 260 | local-mac-address = [ 00 00 00 00 00 00 ]; |
288 | interrupts = <32 0x8 33 0x8 34 0x8>; | 261 | interrupts = <32 0x8 33 0x8 34 0x8>; |
289 | phy-connection-type = "mii"; | 262 | phy-connection-type = "mii"; |
290 | interrupt-parent = <&ipic>; | 263 | interrupt-parent = <&ipic>; |
264 | tbi-handle = <&tbi0>; | ||
291 | phy-handle = <&phy2>; | 265 | phy-handle = <&phy2>; |
292 | sleep = <&pmc 0xc0000000>; | 266 | sleep = <&pmc 0xc0000000>; |
293 | fsl,magic-packet; | 267 | fsl,magic-packet; |
268 | |||
269 | mdio@520 { | ||
270 | #address-cells = <1>; | ||
271 | #size-cells = <0>; | ||
272 | compatible = "fsl,gianfar-mdio"; | ||
273 | reg = <0x520 0x20>; | ||
274 | |||
275 | phy2: ethernet-phy@2 { | ||
276 | interrupt-parent = <&ipic>; | ||
277 | interrupts = <17 0x8>; | ||
278 | reg = <0x2>; | ||
279 | device_type = "ethernet-phy"; | ||
280 | }; | ||
281 | |||
282 | tbi0: tbi-phy@11 { | ||
283 | reg = <0x11>; | ||
284 | device_type = "tbi-phy"; | ||
285 | }; | ||
286 | }; | ||
294 | }; | 287 | }; |
295 | 288 | ||
296 | enet1: ethernet@25000 { | 289 | enet1: ethernet@25000 { |
290 | #address-cells = <1>; | ||
291 | #size-cells = <1>; | ||
297 | cell-index = <1>; | 292 | cell-index = <1>; |
298 | device_type = "network"; | 293 | device_type = "network"; |
299 | model = "eTSEC"; | 294 | model = "eTSEC"; |
300 | compatible = "gianfar"; | 295 | compatible = "gianfar"; |
301 | reg = <0x25000 0x1000>; | 296 | reg = <0x25000 0x1000>; |
297 | ranges = <0x0 0x25000 0x1000>; | ||
302 | local-mac-address = [ 00 00 00 00 00 00 ]; | 298 | local-mac-address = [ 00 00 00 00 00 00 ]; |
303 | interrupts = <35 0x8 36 0x8 37 0x8>; | 299 | interrupts = <35 0x8 36 0x8 37 0x8>; |
304 | phy-connection-type = "mii"; | 300 | phy-connection-type = "mii"; |
305 | interrupt-parent = <&ipic>; | 301 | interrupt-parent = <&ipic>; |
306 | fixed-link = <1 1 1000 0 0>; | 302 | fixed-link = <1 1 1000 0 0>; |
303 | tbi-handle = <&tbi1>; | ||
307 | sleep = <&pmc 0x30000000>; | 304 | sleep = <&pmc 0x30000000>; |
308 | fsl,magic-packet; | 305 | fsl,magic-packet; |
306 | |||
307 | mdio@520 { | ||
308 | #address-cells = <1>; | ||
309 | #size-cells = <0>; | ||
310 | compatible = "fsl,gianfar-tbi"; | ||
311 | reg = <0x520 0x20>; | ||
312 | |||
313 | tbi1: tbi-phy@11 { | ||
314 | reg = <0x11>; | ||
315 | device_type = "tbi-phy"; | ||
316 | }; | ||
317 | }; | ||
309 | }; | 318 | }; |
310 | 319 | ||
311 | serial0: serial@4500 { | 320 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts index 9deb5b20f8a..d6f208b8297 100644 --- a/arch/powerpc/boot/dts/mpc8379_mds.dts +++ b/arch/powerpc/boot/dts/mpc8379_mds.dts | |||
@@ -233,47 +233,15 @@ | |||
233 | sleep = <&pmc 0x00c00000>; | 233 | sleep = <&pmc 0x00c00000>; |
234 | }; | 234 | }; |
235 | 235 | ||
236 | mdio@24520 { | ||
237 | #address-cells = <1>; | ||
238 | #size-cells = <0>; | ||
239 | compatible = "fsl,gianfar-mdio"; | ||
240 | reg = <0x24520 0x20>; | ||
241 | phy2: ethernet-phy@2 { | ||
242 | interrupt-parent = <&ipic>; | ||
243 | interrupts = <17 0x8>; | ||
244 | reg = <0x2>; | ||
245 | device_type = "ethernet-phy"; | ||
246 | }; | ||
247 | phy3: ethernet-phy@3 { | ||
248 | interrupt-parent = <&ipic>; | ||
249 | interrupts = <18 0x8>; | ||
250 | reg = <0x3>; | ||
251 | device_type = "ethernet-phy"; | ||
252 | }; | ||
253 | tbi0: tbi-phy@11 { | ||
254 | reg = <0x11>; | ||
255 | device_type = "tbi-phy"; | ||
256 | }; | ||
257 | }; | ||
258 | |||
259 | mdio@25520 { | ||
260 | #address-cells = <1>; | ||
261 | #size-cells = <0>; | ||
262 | compatible = "fsl,gianfar-tbi"; | ||
263 | reg = <0x25520 0x20>; | ||
264 | |||
265 | tbi1: tbi-phy@11 { | ||
266 | reg = <0x11>; | ||
267 | device_type = "tbi-phy"; | ||
268 | }; | ||
269 | }; | ||
270 | |||
271 | enet0: ethernet@24000 { | 236 | enet0: ethernet@24000 { |
237 | #address-cells = <1>; | ||
238 | #size-cells = <1>; | ||
272 | cell-index = <0>; | 239 | cell-index = <0>; |
273 | device_type = "network"; | 240 | device_type = "network"; |
274 | model = "eTSEC"; | 241 | model = "eTSEC"; |
275 | compatible = "gianfar"; | 242 | compatible = "gianfar"; |
276 | reg = <0x24000 0x1000>; | 243 | reg = <0x24000 0x1000>; |
244 | ranges = <0x0 0x24000 0x1000>; | ||
277 | local-mac-address = [ 00 00 00 00 00 00 ]; | 245 | local-mac-address = [ 00 00 00 00 00 00 ]; |
278 | interrupts = <32 0x8 33 0x8 34 0x8>; | 246 | interrupts = <32 0x8 33 0x8 34 0x8>; |
279 | phy-connection-type = "mii"; | 247 | phy-connection-type = "mii"; |
@@ -282,14 +250,43 @@ | |||
282 | phy-handle = <&phy2>; | 250 | phy-handle = <&phy2>; |
283 | sleep = <&pmc 0xc0000000>; | 251 | sleep = <&pmc 0xc0000000>; |
284 | fsl,magic-packet; | 252 | fsl,magic-packet; |
253 | |||
254 | mdio@520 { | ||
255 | #address-cells = <1>; | ||
256 | #size-cells = <0>; | ||
257 | compatible = "fsl,gianfar-mdio"; | ||
258 | reg = <0x520 0x20>; | ||
259 | |||
260 | phy2: ethernet-phy@2 { | ||
261 | interrupt-parent = <&ipic>; | ||
262 | interrupts = <17 0x8>; | ||
263 | reg = <0x2>; | ||
264 | device_type = "ethernet-phy"; | ||
265 | }; | ||
266 | |||
267 | phy3: ethernet-phy@3 { | ||
268 | interrupt-parent = <&ipic>; | ||
269 | interrupts = <18 0x8>; | ||
270 | reg = <0x3>; | ||
271 | device_type = "ethernet-phy"; | ||
272 | }; | ||
273 | |||
274 | tbi0: tbi-phy@11 { | ||
275 | reg = <0x11>; | ||
276 | device_type = "tbi-phy"; | ||
277 | }; | ||
278 | }; | ||
285 | }; | 279 | }; |
286 | 280 | ||
287 | enet1: ethernet@25000 { | 281 | enet1: ethernet@25000 { |
282 | #address-cells = <1>; | ||
283 | #size-cells = <1>; | ||
288 | cell-index = <1>; | 284 | cell-index = <1>; |
289 | device_type = "network"; | 285 | device_type = "network"; |
290 | model = "eTSEC"; | 286 | model = "eTSEC"; |
291 | compatible = "gianfar"; | 287 | compatible = "gianfar"; |
292 | reg = <0x25000 0x1000>; | 288 | reg = <0x25000 0x1000>; |
289 | ranges = <0x0 0x25000 0x1000>; | ||
293 | local-mac-address = [ 00 00 00 00 00 00 ]; | 290 | local-mac-address = [ 00 00 00 00 00 00 ]; |
294 | interrupts = <35 0x8 36 0x8 37 0x8>; | 291 | interrupts = <35 0x8 36 0x8 37 0x8>; |
295 | phy-connection-type = "mii"; | 292 | phy-connection-type = "mii"; |
@@ -298,6 +295,18 @@ | |||
298 | phy-handle = <&phy3>; | 295 | phy-handle = <&phy3>; |
299 | sleep = <&pmc 0x30000000>; | 296 | sleep = <&pmc 0x30000000>; |
300 | fsl,magic-packet; | 297 | fsl,magic-packet; |
298 | |||
299 | mdio@520 { | ||
300 | #address-cells = <1>; | ||
301 | #size-cells = <0>; | ||
302 | compatible = "fsl,gianfar-tbi"; | ||
303 | reg = <0x520 0x20>; | ||
304 | |||
305 | tbi1: tbi-phy@11 { | ||
306 | reg = <0x11>; | ||
307 | device_type = "tbi-phy"; | ||
308 | }; | ||
309 | }; | ||
301 | }; | 310 | }; |
302 | 311 | ||
303 | serial0: serial@4500 { | 312 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index 3f4778ff933..98ae95bd18f 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
@@ -246,41 +246,15 @@ | |||
246 | sleep = <&pmc 0x00c00000>; | 246 | sleep = <&pmc 0x00c00000>; |
247 | }; | 247 | }; |
248 | 248 | ||
249 | mdio@24520 { | ||
250 | #address-cells = <1>; | ||
251 | #size-cells = <0>; | ||
252 | compatible = "fsl,gianfar-mdio"; | ||
253 | reg = <0x24520 0x20>; | ||
254 | phy2: ethernet-phy@2 { | ||
255 | interrupt-parent = <&ipic>; | ||
256 | interrupts = <17 0x8>; | ||
257 | reg = <0x2>; | ||
258 | device_type = "ethernet-phy"; | ||
259 | }; | ||
260 | tbi0: tbi-phy@11 { | ||
261 | reg = <0x11>; | ||
262 | device_type = "tbi-phy"; | ||
263 | }; | ||
264 | }; | ||
265 | |||
266 | mdio@25520 { | ||
267 | #address-cells = <1>; | ||
268 | #size-cells = <0>; | ||
269 | compatible = "fsl,gianfar-tbi"; | ||
270 | reg = <0x25520 0x20>; | ||
271 | |||
272 | tbi1: tbi-phy@11 { | ||
273 | reg = <0x11>; | ||
274 | device_type = "tbi-phy"; | ||
275 | }; | ||
276 | }; | ||
277 | |||
278 | enet0: ethernet@24000 { | 249 | enet0: ethernet@24000 { |
250 | #address-cells = <1>; | ||
251 | #size-cells = <1>; | ||
279 | cell-index = <0>; | 252 | cell-index = <0>; |
280 | device_type = "network"; | 253 | device_type = "network"; |
281 | model = "eTSEC"; | 254 | model = "eTSEC"; |
282 | compatible = "gianfar"; | 255 | compatible = "gianfar"; |
283 | reg = <0x24000 0x1000>; | 256 | reg = <0x24000 0x1000>; |
257 | ranges = <0x0 0x24000 0x1000>; | ||
284 | local-mac-address = [ 00 00 00 00 00 00 ]; | 258 | local-mac-address = [ 00 00 00 00 00 00 ]; |
285 | interrupts = <32 0x8 33 0x8 34 0x8>; | 259 | interrupts = <32 0x8 33 0x8 34 0x8>; |
286 | phy-connection-type = "mii"; | 260 | phy-connection-type = "mii"; |
@@ -289,14 +263,36 @@ | |||
289 | phy-handle = <&phy2>; | 263 | phy-handle = <&phy2>; |
290 | sleep = <&pmc 0xc0000000>; | 264 | sleep = <&pmc 0xc0000000>; |
291 | fsl,magic-packet; | 265 | fsl,magic-packet; |
266 | |||
267 | mdio@520 { | ||
268 | #address-cells = <1>; | ||
269 | #size-cells = <0>; | ||
270 | compatible = "fsl,gianfar-mdio"; | ||
271 | reg = <0x520 0x20>; | ||
272 | |||
273 | phy2: ethernet-phy@2 { | ||
274 | interrupt-parent = <&ipic>; | ||
275 | interrupts = <17 0x8>; | ||
276 | reg = <0x2>; | ||
277 | device_type = "ethernet-phy"; | ||
278 | }; | ||
279 | |||
280 | tbi0: tbi-phy@11 { | ||
281 | reg = <0x11>; | ||
282 | device_type = "tbi-phy"; | ||
283 | }; | ||
284 | }; | ||
292 | }; | 285 | }; |
293 | 286 | ||
294 | enet1: ethernet@25000 { | 287 | enet1: ethernet@25000 { |
288 | #address-cells = <1>; | ||
289 | #size-cells = <1>; | ||
295 | cell-index = <1>; | 290 | cell-index = <1>; |
296 | device_type = "network"; | 291 | device_type = "network"; |
297 | model = "eTSEC"; | 292 | model = "eTSEC"; |
298 | compatible = "gianfar"; | 293 | compatible = "gianfar"; |
299 | reg = <0x25000 0x1000>; | 294 | reg = <0x25000 0x1000>; |
295 | ranges = <0x0 0x25000 0x1000>; | ||
300 | local-mac-address = [ 00 00 00 00 00 00 ]; | 296 | local-mac-address = [ 00 00 00 00 00 00 ]; |
301 | interrupts = <35 0x8 36 0x8 37 0x8>; | 297 | interrupts = <35 0x8 36 0x8 37 0x8>; |
302 | phy-connection-type = "mii"; | 298 | phy-connection-type = "mii"; |
@@ -305,6 +301,18 @@ | |||
305 | tbi-handle = <&tbi1>; | 301 | tbi-handle = <&tbi1>; |
306 | sleep = <&pmc 0x30000000>; | 302 | sleep = <&pmc 0x30000000>; |
307 | fsl,magic-packet; | 303 | fsl,magic-packet; |
304 | |||
305 | mdio@520 { | ||
306 | #address-cells = <1>; | ||
307 | #size-cells = <0>; | ||
308 | compatible = "fsl,gianfar-tbi"; | ||
309 | reg = <0x520 0x20>; | ||
310 | |||
311 | tbi1: tbi-phy@11 { | ||
312 | reg = <0x11>; | ||
313 | device_type = "tbi-phy"; | ||
314 | }; | ||
315 | }; | ||
308 | }; | 316 | }; |
309 | 317 | ||
310 | serial0: serial@4500 { | 318 | serial0: serial@4500 { |
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts index 8d365a57ebc..a36dbbc4869 100644 --- a/arch/powerpc/boot/dts/sbc8349.dts +++ b/arch/powerpc/boot/dts/sbc8349.dts | |||
@@ -159,68 +159,76 @@ | |||
159 | phy_type = "ulpi"; | 159 | phy_type = "ulpi"; |
160 | }; | 160 | }; |
161 | 161 | ||
162 | mdio@24520 { | ||
163 | #address-cells = <1>; | ||
164 | #size-cells = <0>; | ||
165 | compatible = "fsl,gianfar-mdio"; | ||
166 | reg = <0x24520 0x20>; | ||
167 | |||
168 | phy0: ethernet-phy@19 { | ||
169 | interrupt-parent = <&ipic>; | ||
170 | interrupts = <20 0x8>; | ||
171 | reg = <0x19>; | ||
172 | device_type = "ethernet-phy"; | ||
173 | }; | ||
174 | phy1: ethernet-phy@1a { | ||
175 | interrupt-parent = <&ipic>; | ||
176 | interrupts = <21 0x8>; | ||
177 | reg = <0x1a>; | ||
178 | device_type = "ethernet-phy"; | ||
179 | }; | ||
180 | tbi0: tbi-phy@11 { | ||
181 | reg = <0x11>; | ||
182 | device_type = "tbi-phy"; | ||
183 | }; | ||
184 | }; | ||
185 | |||
186 | mdio@25520 { | ||
187 | #address-cells = <1>; | ||
188 | #size-cells = <0>; | ||
189 | compatible = "fsl,gianfar-tbi"; | ||
190 | reg = <0x25520 0x20>; | ||
191 | |||
192 | tbi1: tbi-phy@11 { | ||
193 | reg = <0x11>; | ||
194 | device_type = "tbi-phy"; | ||
195 | }; | ||
196 | }; | ||
197 | |||
198 | enet0: ethernet@24000 { | 162 | enet0: ethernet@24000 { |
163 | #address-cells = <1>; | ||
164 | #size-cells = <1>; | ||
199 | cell-index = <0>; | 165 | cell-index = <0>; |
200 | device_type = "network"; | 166 | device_type = "network"; |
201 | model = "TSEC"; | 167 | model = "TSEC"; |
202 | compatible = "gianfar"; | 168 | compatible = "gianfar"; |
203 | reg = <0x24000 0x1000>; | 169 | reg = <0x24000 0x1000>; |
170 | ranges = <0x0 0x24000 0x1000>; | ||
204 | local-mac-address = [ 00 00 00 00 00 00 ]; | 171 | local-mac-address = [ 00 00 00 00 00 00 ]; |
205 | interrupts = <32 0x8 33 0x8 34 0x8>; | 172 | interrupts = <32 0x8 33 0x8 34 0x8>; |
206 | interrupt-parent = <&ipic>; | 173 | interrupt-parent = <&ipic>; |
207 | tbi-handle = <&tbi0>; | 174 | tbi-handle = <&tbi0>; |
208 | phy-handle = <&phy0>; | 175 | phy-handle = <&phy0>; |
209 | linux,network-index = <0>; | 176 | linux,network-index = <0>; |
177 | |||
178 | mdio@520 { | ||
179 | #address-cells = <1>; | ||
180 | #size-cells = <0>; | ||
181 | compatible = "fsl,gianfar-mdio"; | ||
182 | reg = <0x520 0x20>; | ||
183 | |||
184 | phy0: ethernet-phy@19 { | ||
185 | interrupt-parent = <&ipic>; | ||
186 | interrupts = <20 0x8>; | ||
187 | reg = <0x19>; | ||
188 | device_type = "ethernet-phy"; | ||
189 | }; | ||
190 | |||
191 | phy1: ethernet-phy@1a { | ||
192 | interrupt-parent = <&ipic>; | ||
193 | interrupts = <21 0x8>; | ||
194 | reg = <0x1a>; | ||
195 | device_type = "ethernet-phy"; | ||
196 | }; | ||
197 | |||
198 | tbi0: tbi-phy@11 { | ||
199 | reg = <0x11>; | ||
200 | device_type = "tbi-phy"; | ||
201 | }; | ||
202 | }; | ||
210 | }; | 203 | }; |
211 | 204 | ||
212 | enet1: ethernet@25000 { | 205 | enet1: ethernet@25000 { |
206 | #address-cells = <1>; | ||
207 | #size-cells = <1>; | ||
213 | cell-index = <1>; | 208 | cell-index = <1>; |
214 | device_type = "network"; | 209 | device_type = "network"; |
215 | model = "TSEC"; | 210 | model = "TSEC"; |
216 | compatible = "gianfar"; | 211 | compatible = "gianfar"; |
217 | reg = <0x25000 0x1000>; | 212 | reg = <0x25000 0x1000>; |
213 | ranges = <0x0 0x25000 0x1000>; | ||
218 | local-mac-address = [ 00 00 00 00 00 00 ]; | 214 | local-mac-address = [ 00 00 00 00 00 00 ]; |
219 | interrupts = <35 0x8 36 0x8 37 0x8>; | 215 | interrupts = <35 0x8 36 0x8 37 0x8>; |
220 | interrupt-parent = <&ipic>; | 216 | interrupt-parent = <&ipic>; |
221 | tbi-handle = <&tbi1>; | 217 | tbi-handle = <&tbi1>; |
222 | phy-handle = <&phy1>; | 218 | phy-handle = <&phy1>; |
223 | linux,network-index = <1>; | 219 | linux,network-index = <1>; |
220 | |||
221 | mdio@520 { | ||
222 | #address-cells = <1>; | ||
223 | #size-cells = <0>; | ||
224 | compatible = "fsl,gianfar-tbi"; | ||
225 | reg = <0x520 0x20>; | ||
226 | |||
227 | tbi1: tbi-phy@11 { | ||
228 | reg = <0x11>; | ||
229 | device_type = "tbi-phy"; | ||
230 | }; | ||
231 | }; | ||
224 | }; | 232 | }; |
225 | 233 | ||
226 | serial0: serial@4500 { | 234 | serial0: serial@4500 { |
diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c index bb30d67ad0a..aa0d84d2258 100644 --- a/arch/powerpc/platforms/83xx/asp834x.c +++ b/arch/powerpc/platforms/83xx/asp834x.c | |||
@@ -58,6 +58,7 @@ static struct __initdata of_device_id asp8347_ids[] = { | |||
58 | { .type = "soc", }, | 58 | { .type = "soc", }, |
59 | { .compatible = "soc", }, | 59 | { .compatible = "soc", }, |
60 | { .compatible = "simple-bus", }, | 60 | { .compatible = "simple-bus", }, |
61 | { .compatible = "gianfar", }, | ||
61 | {}, | 62 | {}, |
62 | }; | 63 | }; |
63 | 64 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c index 76092d37c7d..81e44fa1c64 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_itx.c +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c | |||
@@ -42,6 +42,7 @@ | |||
42 | static struct of_device_id __initdata mpc834x_itx_ids[] = { | 42 | static struct of_device_id __initdata mpc834x_itx_ids[] = { |
43 | { .compatible = "fsl,pq2pro-localbus", }, | 43 | { .compatible = "fsl,pq2pro-localbus", }, |
44 | { .compatible = "simple-bus", }, | 44 | { .compatible = "simple-bus", }, |
45 | { .compatible = "gianfar", }, | ||
45 | {}, | 46 | {}, |
46 | }; | 47 | }; |
47 | 48 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c index fc3f2ed1f3e..d0a634b056c 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c | |||
@@ -112,6 +112,7 @@ static struct of_device_id mpc834x_ids[] = { | |||
112 | { .type = "soc", }, | 112 | { .type = "soc", }, |
113 | { .compatible = "soc", }, | 113 | { .compatible = "soc", }, |
114 | { .compatible = "simple-bus", }, | 114 | { .compatible = "simple-bus", }, |
115 | { .compatible = "gianfar", }, | ||
115 | {}, | 116 | {}, |
116 | }; | 117 | }; |
117 | 118 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c index 634785cc452..51df7e75469 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c | |||
@@ -96,6 +96,7 @@ static struct of_device_id mpc837x_ids[] = { | |||
96 | { .type = "soc", }, | 96 | { .type = "soc", }, |
97 | { .compatible = "soc", }, | 97 | { .compatible = "soc", }, |
98 | { .compatible = "simple-bus", }, | 98 | { .compatible = "simple-bus", }, |
99 | { .compatible = "gianfar", }, | ||
99 | {}, | 100 | {}, |
100 | }; | 101 | }; |
101 | 102 | ||
diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c index 3d7b953d40e..76f3b32a155 100644 --- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c | |||
@@ -48,6 +48,7 @@ static struct of_device_id mpc837x_ids[] = { | |||
48 | { .type = "soc", }, | 48 | { .type = "soc", }, |
49 | { .compatible = "soc", }, | 49 | { .compatible = "soc", }, |
50 | { .compatible = "simple-bus", }, | 50 | { .compatible = "simple-bus", }, |
51 | { .compatible = "gianfar", }, | ||
51 | {}, | 52 | {}, |
52 | }; | 53 | }; |
53 | 54 | ||
diff --git a/arch/powerpc/platforms/83xx/sbc834x.c b/arch/powerpc/platforms/83xx/sbc834x.c index 156c4e21800..49023dbe157 100644 --- a/arch/powerpc/platforms/83xx/sbc834x.c +++ b/arch/powerpc/platforms/83xx/sbc834x.c | |||
@@ -84,6 +84,7 @@ static struct __initdata of_device_id sbc834x_ids[] = { | |||
84 | { .type = "soc", }, | 84 | { .type = "soc", }, |
85 | { .compatible = "soc", }, | 85 | { .compatible = "soc", }, |
86 | { .compatible = "simple-bus", }, | 86 | { .compatible = "simple-bus", }, |
87 | { .compatible = "gianfar", }, | ||
87 | {}, | 88 | {}, |
88 | }; | 89 | }; |
89 | 90 | ||