aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/boot/dts/mpc832x_mds.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc836x_mds.dts3
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts2
-rw-r--r--drivers/net/ucc_geth_mii.c3
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index e300df4d3e05..1bb75ef389ff 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -304,8 +304,7 @@
304 #address-cells = <1>; 304 #address-cells = <1>;
305 #size-cells = <0>; 305 #size-cells = <0>;
306 reg = <2320 18>; 306 reg = <2320 18>;
307 device_type = "mdio"; 307 compatible = "fsl,ucc-mdio";
308 compatible = "ucc_geth_phy";
309 308
310 phy3: ethernet-phy@03 { 309 phy3: ethernet-phy@03 {
311 interrupt-parent = < &ipic >; 310 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 4d5cfd32cd7c..f6a86336c8e0 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -237,8 +237,7 @@
237 #address-cells = <1>; 237 #address-cells = <1>;
238 #size-cells = <0>; 238 #size-cells = <0>;
239 reg = <3120 18>; 239 reg = <3120 18>;
240 device_type = "mdio"; 240 compatible = "fsl,ucc-mdio";
241 compatible = "ucc_geth_phy";
242 241
243 phy00:ethernet-phy@00 { 242 phy00:ethernet-phy@00 {
244 interrupt-parent = <&pic>; 243 interrupt-parent = <&pic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 9a2581b6a170..fa98bdf0de8c 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -288,8 +288,7 @@
288 #address-cells = <1>; 288 #address-cells = <1>;
289 #size-cells = <0>; 289 #size-cells = <0>;
290 reg = <2120 18>; 290 reg = <2120 18>;
291 device_type = "mdio"; 291 compatible = "fsl,ucc-mdio";
292 compatible = "ucc_geth_phy";
293 292
294 phy0: ethernet-phy@00 { 293 phy0: ethernet-phy@00 {
295 interrupt-parent = < &ipic >; 294 interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 04f5c6f68256..692d5bd81e70 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -357,7 +357,7 @@
357 #address-cells = <1>; 357 #address-cells = <1>;
358 #size-cells = <0>; 358 #size-cells = <0>;
359 reg = <2120 18>; 359 reg = <2120 18>;
360 compatible = "ucc_geth_phy"; 360 compatible = "fsl,ucc-mdio";
361 361
362 /* These are the same PHYs as on 362 /* These are the same PHYs as on
363 * gianfar's MDIO bus */ 363 * gianfar's MDIO bus */
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index df884f0ad8e5..e3ba14a19915 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -256,6 +256,9 @@ static struct of_device_id uec_mdio_match[] = {
256 .type = "mdio", 256 .type = "mdio",
257 .compatible = "ucc_geth_phy", 257 .compatible = "ucc_geth_phy",
258 }, 258 },
259 {
260 .compatible = "fsl,ucc-mdio",
261 },
259 {}, 262 {},
260}; 263};
261 264