1 files changed, 51 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 4111c0fa8d09..7a96c6577234 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -8,12 +8,62 @@
 
 #include <linux/irqchip.h>
 #include <linux/of_platform.h>
+#include <linux/phy.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
 #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;
+
+        gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sx-iomuxc-gpr");
+        if (!IS_ERR(gpr)) {
+                regmap_update_bits(gpr, IOMUXC_GPR1,
+                                   IMX6SX_GPR1_FEC_CLOCK_MUX_SEL_MASK, 0);
+                regmap_update_bits(gpr, IOMUXC_GPR1,
+                                   IMX6SX_GPR1_FEC_CLOCK_PAD_DIR_MASK, 0);
+        } else {
+                pr_err("failed to find fsl,imx6sx-iomux-gpr regmap\n");
+        }
+}
+
+static inline void imx6sx_enet_init(void)
+{
+        imx6sx_enet_phy_init();
+        imx6sx_enet_clk_sel();
+}
+
 static void __init imx6sx_init_machine(void)
 {
         struct device *parent;
@@ -24,6 +74,7 @@ static void __init imx6sx_init_machine(void)
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
 
+        imx6sx_enet_init();
         imx_anatop_init();
         imx6sx_pm_init();
 }