ARM: imx: do not use regmap_read for ANADIG_DIGPROG

Function imx_anatop_get_digprog() that reads register ANADIG_DIGPROG is
called to identify silicon version.  Users might query silicon version
earlier than regmap subsystem is ready.  For example, imx6q clock driver
query revision in mx6q_clocks_init(), where regmap is not initialized
yet.

Change imx_anatop_get_digprog() to map anatop block and read
ANADIG_DIGPROG in the native way, so that the function can work at very
early stage.

While at it, let's move imx_print_silicon_rev() back to
imx6q_timer_init() to have the message show up a little earlier.

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

1 files changed, 12 insertions, 3 deletions

diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index 472beee9cd98..0cfa07dd9aa4 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -78,10 +78,19 @@ void imx_anatop_usb_chrg_detect_disable(void)
 
 u32 imx_anatop_get_digprog(void)
 {
-        u32  val;
+        struct device_node *np;
+        void __iomem *anatop_base;
+        static u32 digprog;
 
-        regmap_read(anatop, ANADIG_DIGPROG, &val);
-        return val;
+        if (digprog)
+                return 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);
+
+        return digprog;
 }
 
 void __init imx_anatop_init(void)