Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[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..11dcc36 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#
@@ -89,75 +68,11 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8609, ventana_pciesw_early_fixup);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8606, ventana_pciesw_early_fixup);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_PLX, 0x8604, ventana_pciesw_early_fixup);
 
-static int ar8031_phy_fixup(struct phy_device *dev)
-{
-       u16 val;
-
-       /* To enable AR8031 output a 125MHz clk from CLK_25M */
-       phy_write(dev, 0xd, 0x7);
-       phy_write(dev, 0xe, 0x8016);
-       phy_write(dev, 0xd, 0x4007);
-
-       val = phy_read(dev, 0xe);
-       val &= 0xffe3;
-       val |= 0x18;
-       phy_write(dev, 0xe, val);
-
-       /* introduce tx clock delay */
-       phy_write(dev, 0x1d, 0x5);
-       val = phy_read(dev, 0x1e);
-       val |= 0x0100;
-       phy_write(dev, 0x1e, val);
-
-       return 0;
-}
-
-#define PHY_ID_AR8031  0x004dd074
-
-static int ar8035_phy_fixup(struct phy_device *dev)
-{
-       u16 val;
-
-       /* Ar803x phy SmartEEE feature cause link status generates glitch,
-        * which cause ethernet link down/up issue, so disable SmartEEE
-        */
-       phy_write(dev, 0xd, 0x3);
-       phy_write(dev, 0xe, 0x805d);
-       phy_write(dev, 0xd, 0x4003);
-
-       val = phy_read(dev, 0xe);
-       phy_write(dev, 0xe, val & ~(1 << 8));
-
-       /*
-        * Enable 125MHz clock from CLK_25M on the AR8031.  This
-        * is fed in to the IMX6 on the ENET_REF_CLK (V22) pad.
-        * Also, introduce a tx clock delay.
-        *
-        * This is the same as is the AR8031 fixup.
-        */
-       ar8031_phy_fixup(dev);
-
-       /*check phy power*/
-       val = phy_read(dev, 0x0);
-       if (val & BMCR_PDOWN)
-               phy_write(dev, 0x0, val & ~BMCR_PDOWN);
-
-       return 0;
-}
-
-#define PHY_ID_AR8035 0x004dd072
-
 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,
-                               ar8035_phy_fixup);
        }
 }
 
@@ -257,9 +172,6 @@ static void __init imx6q_init_machine(void)
                                imx_get_soc_revision());
 
        imx6q_enet_phy_init();
-
-       of_platform_default_populate(NULL, NULL, NULL);
-
        imx_anatop_init();
        cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();
        imx6q_1588_init();