3 files changed, 21 insertions, 1 deletions

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);
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index d7a1a58de766..f92690555dd9 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -420,8 +420,18 @@ static phy_interface_t gfar_get_interface(struct net_device *dev)
         if (ecntrl & ECNTRL_REDUCED_MODE) {
                 if (ecntrl & ECNTRL_REDUCED_MII_MODE)
                         return PHY_INTERFACE_MODE_RMII;
-                else
+                else {
+                        phy_interface_t interface = priv->einfo->interface;
+
+                        /*
+                         * This isn't autodetected right now, so it must
+                         * be set by the device tree or platform code.
+                         */
+                        if (interface == PHY_INTERFACE_MODE_RGMII_ID)
+                                return PHY_INTERFACE_MODE_RGMII_ID;
+
                         return PHY_INTERFACE_MODE_RGMII;
+                }
         }
 
         if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT)
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 695741b0e420..1831b196c70a 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -53,6 +53,7 @@ struct gianfar_platform_data {
         u32     bus_id;
         u32     phy_id;
         u8      mac_addr[6];
+        phy_interface_t interface;
 };
 
 struct gianfar_mdio_data {