ARM: imx: add a common function to initialize revision from anatop

The patch creates a common function imx_init_revision_from_anatop() by
merging imx6q_init_revision() and imx_anatop_get_digprog(), so that any
SoC that encodes revision info in anatop can use it to initialize
revision.

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

3 files changed, 23 insertions, 31 deletions

diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index ad3b755abb78..b2d600f14937 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -16,6 +16,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 #include "common.h"
+#include "hardware.h"
 
 #define REG_SET         0x4
 #define REG_CLR         0x8
@@ -76,21 +77,35 @@ static void imx_anatop_usb_chrg_detect_disable(void)
                 BM_ANADIG_USB_CHRG_DETECT_CHK_CHRG_B);
 }
 
-u32 imx_anatop_get_digprog(void)
+void __init imx_init_revision_from_anatop(void)
 {
         struct device_node *np;
         void __iomem *anatop_base;
-        static u32 digprog;
-
-        if (digprog)
-                return digprog;
+        unsigned int revision;
+        u32 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);
+        iounmap(anatop_base);
+
+        switch (digprog & 0xff) {
+        case 0:
+                revision = IMX_CHIP_REVISION_1_0;
+                break;
+        case 1:
+                revision = IMX_CHIP_REVISION_1_1;
+                break;
+        case 2:
+                revision = IMX_CHIP_REVISION_1_2;
+                break;
+        default:
+                revision = IMX_CHIP_REVISION_UNKNOWN;
+        }
 
-        return digprog;
+        mxc_set_cpu_type(digprog >> 16 & 0xff);
+        imx_set_soc_revision(revision);
 }
 
 void __init imx_anatop_init(void)
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index cac12870efb3..d0191152807d 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -78,6 +78,7 @@ extern void imx_set_aips(void __iomem *);
 extern int mxc_device_init(void);
 void imx_set_soc_revision(unsigned int rev);
 unsigned int imx_get_soc_revision(void);
+void imx_init_revision_from_anatop(void);
 
 enum mxc_cpu_pwr_mode {
         WAIT_CLOCKED,           /* wfi only */
@@ -134,7 +135,6 @@ extern void imx_gpc_restore_all(void);
 extern void imx_anatop_init(void);
 extern void imx_anatop_pre_suspend(void);
 extern void imx_anatop_post_resume(void);
-extern u32 imx_anatop_get_digprog(void);
 extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
 extern void imx6q_set_chicken_bit(void);
 
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index f260aad9850b..1bdd0be429b9 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -38,29 +38,6 @@
 #include "cpuidle.h"
 #include "hardware.h"
 
-static void __init imx6q_init_revision(void)
-{
-        u32 rev = imx_anatop_get_digprog();
-        u32 chip_revision;
-
-        switch (rev & 0xff) {
-        case 0:
-                chip_revision = IMX_CHIP_REVISION_1_0;
-                break;
-        case 1:
-                chip_revision = IMX_CHIP_REVISION_1_1;
-                break;
-        case 2:
-                chip_revision = IMX_CHIP_REVISION_1_2;
-                break;
-        default:
-                chip_revision = IMX_CHIP_REVISION_UNKNOWN;
-        }
-
-        mxc_set_cpu_type(rev >> 16 & 0xff);
-        imx_set_soc_revision(chip_revision);
-}
-
 static void imx6q_restart(enum reboot_mode mode, const char *cmd)
 {
         struct device_node *np;
@@ -282,7 +259,7 @@ static void __init imx6q_map_io(void)
 
 static void __init imx6q_init_irq(void)
 {
-        imx6q_init_revision();
+        imx_init_revision_from_anatop();
         imx_init_l2cache();
         imx_src_init();
         imx_gpc_init();