2 files changed, 13 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index db56a02b748f..6a78a2b37c08 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -131,6 +131,7 @@
                         interrupts = <1d 2 1e 2 22 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 ethernet@25000 {
@@ -150,6 +151,7 @@
                         interrupts = <23 2 24 2 28 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
                 };
                 
                 ethernet@26000 {
@@ -169,6 +171,7 @@
                         interrupts = <1F 2 20 2 21 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy2>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 ethernet@27000 {
@@ -188,6 +191,7 @@
                         interrupts = <25 2 26 2 27 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
+                        phy-connection-type = "rgmii-id";
                 };
                 serial@4500 {
                         device_type = "serial";
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index c0ddc80d8160..3289fab01e92 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -197,6 +197,7 @@ static int __init gfar_of_init(void)
                 struct gianfar_platform_data gfar_data;
                 const unsigned int *id;
                 const char *model;
+                const char *ctype;
                 const void *mac_addr;
                 const phandle *ph;
                 int n_res = 2;
@@ -254,6 +255,14 @@ static int __init gfar_of_init(void)
                             FSL_GIANFAR_DEV_HAS_VLAN |
                             FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
 
+                ctype = of_get_property(np, "phy-connection-type", NULL);
+
+                /* We only care about rgmii-id.  The rest are autodetected */
+                if (ctype && !strcmp(ctype, "rgmii-id"))
+                        gfar_data.interface = PHY_INTERFACE_MODE_RGMII_ID;
+                else
+                        gfar_data.interface = PHY_INTERFACE_MODE_MII;
+
                 ph = of_get_property(np, "phy-handle", NULL);
                 phy = of_find_node_by_phandle(*ph);