ARM: imx6q: remove PHY fixup for KSZ9031

[linux-2.6-microblaze.git] / arch / arm / mach-imx / mach-imx6q.c

diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 703998e..78205f9 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -40,27 +40,6 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)
        return 0;
 }
 
-static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
-{
-       phy_write(dev, 0x0d, device);
-       phy_write(dev, 0x0e, reg);
-       phy_write(dev, 0x0d, (1 << 14) | device);
-       phy_write(dev, 0x0e, val);
-}
-
-static int ksz9031rn_phy_fixup(struct phy_device *dev)
-{
-       /*
-        * min rx data delay, max rx/tx clock delay,
-        * min rx/tx control delay
-        */
-       mmd_write_reg(dev, 2, 4, 0);
-       mmd_write_reg(dev, 2, 5, 0);
-       mmd_write_reg(dev, 2, 8, 0x003ff);
-
-       return 0;
-}
-
 /*
  * fixup for PLX PEX8909 bridge to configure GPIO1-7 as output High
  * as they are used for slots1-7 PERST#
@@ -152,8 +131,6 @@ static void __init imx6q_enet_phy_init(void)
        if (IS_BUILTIN(CONFIG_PHYLIB)) {
                phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
                                ksz9021rn_phy_fixup);
-               phy_register_fixup_for_uid(PHY_ID_KSZ9031, MICREL_PHY_ID_MASK,
-                               ksz9031rn_phy_fixup);
                phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffef,
                                ar8031_phy_fixup);
                phy_register_fixup_for_uid(PHY_ID_AR8035, 0xffffffef,