ucc_geth: get rid of device_type for mdio

device_type property is bogus, thus use proper compatible.

Also change compatible property to "fsl,ucc-mdio".

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

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 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <2320 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        compatible = "fsl,ucc-mdio";
 
                         phy3: ethernet-phy@03 {
                                 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 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <3120 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        compatible = "fsl,ucc-mdio";
 
                         phy00:ethernet-phy@00 {
                                 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 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <2120 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        compatible = "fsl,ucc-mdio";
 
                         phy0: ethernet-phy@00 {
                                 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 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <2120 18>;
-                        compatible = "ucc_geth_phy";
+                        compatible = "fsl,ucc-mdio";
 
                         /* These are the same PHYs as on
                          * 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[] = {
                 .type = "mdio",
                 .compatible = "ucc_geth_phy",
         },
+        {
+                .compatible = "fsl,ucc-mdio",
+        },
         {},
 };