Merge remote-tracking branch 'imx-mxs/for-next'

[karo-tx-linux.git] / arch / arm / mach-imx / mach-imx6sl.c

diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index c70bd7c649746fdab1022a2c67af0df84d230267..f01aaabd325464c0995465f6c281d2c1a1ba33cd 100644 (file)
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -10,20 +10,48 @@
 #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();
 }
 
 static void __init imx6sl_init_irq(void)
 {
+       imx_init_revision_from_anatop();
        imx_init_l2cache();
        imx_src_init();
        imx_gpc_init();