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-imx6sx.c

diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 781e2a9..e65ed52 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -15,31 +15,6 @@
 #include "common.h"
 #include "cpuidle.h"
 
-static int ar8031_phy_fixup(struct phy_device *dev)
-{
-       u16 val;
-
-       /* Set RGMII IO voltage to 1.8V */
-       phy_write(dev, 0x1d, 0x1f);
-       phy_write(dev, 0x1e, 0x8);
-
-       /* 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 void __init imx6sx_enet_phy_init(void)
-{
-       if (IS_BUILTIN(CONFIG_PHYLIB))
-               phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
-                                          ar8031_phy_fixup);
-}
-
 static void __init imx6sx_enet_clk_sel(void)
 {
        struct regmap *gpr;
@@ -57,7 +32,6 @@ static void __init imx6sx_enet_clk_sel(void)
 
 static inline void imx6sx_enet_init(void)
 {
-       imx6sx_enet_phy_init();
        imx6sx_enet_clk_sel();
 }