ARM: imx: use imx_init_revision_from_anatop() on imx6sl

Add imx6sl support into imx_init_revision_from_anatop(), so that it can
be used to initialize cpu type and revision on imx6sl.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

3 files changed, 9 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index c46651e4d966..177d9e791a01 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -380,7 +380,9 @@
                         };
 
                         anatop: anatop@020c8000 {
-                                compatible = "fsl,imx6sl-anatop", "syscon", "simple-bus";
+                                compatible = "fsl,imx6sl-anatop",
+                                             "fsl,imx6q-anatop",
+                                             "syscon", "simple-bus";
                                 reg = <0x020c8000 0x1000>;
                                 interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
 
diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index b2d600f14937..4a40bbb46183 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -27,6 +27,7 @@
 #define ANADIG_USB1_CHRG_DETECT 0x1b0
 #define ANADIG_USB2_CHRG_DETECT 0x210
 #define ANADIG_DIGPROG          0x260
+#define ANADIG_DIGPROG_IMX6SL   0x280
 
 #define BM_ANADIG_REG_2P5_ENABLE_WEAK_LINREG    0x40000
 #define BM_ANADIG_REG_CORE_FET_ODRIVE           0x20000000
@@ -83,11 +84,14 @@ void __init imx_init_revision_from_anatop(void)
         void __iomem *anatop_base;
         unsigned int revision;
         u32 digprog;
+        u16 offset = ANADIG_DIGPROG;
 
         np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
         anatop_base = of_iomap(np, 0);
         WARN_ON(!anatop_base);
-        digprog = readl_relaxed(anatop_base + ANADIG_DIGPROG);
+        if (of_device_is_compatible(np, "fsl,imx6sl-anatop"))
+                offset = ANADIG_DIGPROG_IMX6SL;
+        digprog = readl_relaxed(anatop_base + offset);
         iounmap(anatop_base);
 
         switch (digprog & 0xff) {
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index 21cde21daf9b..4ce9ae58ed0c 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -45,6 +45,7 @@ static void __init imx6sl_init_machine(void)
 
 static void __init imx6sl_init_irq(void)
 {
+        imx_init_revision_from_anatop();
         imx_init_l2cache();
         imx_src_init();
         imx_gpc_init();