1 files changed, 32 insertions, 8 deletions

diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index 0d75dc54f715..2f952e3fcf89 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -7,35 +7,60 @@
  *
  */
 
-#include <linux/clk-provider.h>
 #include <linux/irqchip.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
+#include <linux/regmap.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
 #include "common.h"
 
+static void __init imx6sl_fec_init(void)
+{
+        struct regmap *gpr;
+
+        /* set FEC clock from internal PLL clock source */
+        gpr = syscon_regmap_lookup_by_compatible("fsl,imx6sl-iomuxc-gpr");
+        if (!IS_ERR(gpr)) {
+                regmap_update_bits(gpr, IOMUXC_GPR1,
+                        IMX6SL_GPR1_FEC_CLOCK_MUX2_SEL_MASK, 0);
+                regmap_update_bits(gpr, IOMUXC_GPR1,
+                        IMX6SL_GPR1_FEC_CLOCK_MUX1_SEL_MASK, 0);
+        } else {
+                pr_err("failed to find fsl,imx6sl-iomux-gpr regmap\n");
+        }
+}
+
 static void __init imx6sl_init_machine(void)
 {
+        struct device *parent;
+
         mxc_arch_reset_init_dt();
 
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+        parent = imx_soc_device_init();
+        if (parent == NULL)
+                pr_warn("failed to initialize soc device\n");
+
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
+
+        imx6sl_fec_init();
+        imx_anatop_init();
+        /* Reuse imx6q pm code */
+        imx6q_pm_init();
 }
 
 static void __init imx6sl_init_irq(void)
 {
+        imx_init_revision_from_anatop();
         imx_init_l2cache();
         imx_src_init();
         imx_gpc_init();
         irqchip_init();
 }
 
-static void __init imx6sl_timer_init(void)
-{
-        of_clk_init(NULL);
-}
-
 static const char *imx6sl_dt_compat[] __initdata = {
         "fsl,imx6sl",
         NULL,
@@ -44,7 +69,6 @@ static const char *imx6sl_dt_compat[] __initdata = {
 DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)")
         .map_io         = debug_ll_io_init,
         .init_irq       = imx6sl_init_irq,
-        .init_time      = imx6sl_timer_init,
         .init_machine   = imx6sl_init_machine,
         .dt_compat      = imx6sl_dt_compat,
         .restart        = mxc_restart,