ibm_newemac: Add MII mode support to the EMAC RGMII bridge.

This patch adds support to the RGMII handler in the EMAC driver for
the MII PHY mode such that device tree entries of the form `phy-mode = "mii";'
are recognized and handled appropriately.

While logically, in software, "gmii" and "mii" modes are the same,
they are wired differently, so it makes sense to allow DTS authors to
specify each explicitly.

Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index e32da3de2695de79564bfcfa5707d48b507c0ebd..1d5379de6900f5558e8130b0e4c84b5e3e85f818 100644 (file)
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -39,6 +39,7 @@
 #define RGMII_FER_RGMII(idx)   (0x5 << ((idx) * 4))
 #define RGMII_FER_TBI(idx)     (0x6 << ((idx) * 4))
 #define RGMII_FER_GMII(idx)    (0x7 << ((idx) * 4))
+#define RGMII_FER_MII(idx)     RGMII_FER_GMII(idx)
 
 /* RGMIIx_SSR */
 #define RGMII_SSR_MASK(idx)    (0x7 << ((idx) * 8))
@@ -49,6 +50,7 @@
 static inline int rgmii_valid_mode(int phy_mode)
 {
        return  phy_mode == PHY_MODE_GMII ||
+               phy_mode == PHY_MODE_MII ||
                phy_mode == PHY_MODE_RGMII ||
                phy_mode == PHY_MODE_TBI ||
                phy_mode == PHY_MODE_RTBI;
@@ -63,6 +65,8 @@ static inline const char *rgmii_mode_name(int mode)
                return "TBI";
        case PHY_MODE_GMII:
                return "GMII";
+       case PHY_MODE_MII:
+               return "MII";
        case PHY_MODE_RTBI:
                return "RTBI";
        default:
@@ -79,6 +83,8 @@ static inline u32 rgmii_mode_mask(int mode, int input)
                return RGMII_FER_TBI(input);
        case PHY_MODE_GMII:
                return RGMII_FER_GMII(input);
+       case PHY_MODE_MII:
+               return RGMII_FER_MII(input);
        case PHY_MODE_RTBI:
                return RGMII_FER_RTBI(input);
        default: