ARM: highbank: remove custom .init_time hook

With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks. Highbank clock provider need a reference
to system registers, as a workaround current clk driver maps those
independent of arch code now.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Mike Turquette <mturquette@linaro.org>

2 files changed, 14 insertions, 19 deletions

diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 8e63ccdb0de3..e6d6eacea9d0 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -24,7 +24,6 @@
 #include <linux/of_platform.h>
 #include <linux/of_address.h>
 #include <linux/amba/bus.h>
-#include <linux/clk-provider.h>
 
 #include <asm/cacheflush.h>
 #include <asm/cputype.h>
@@ -83,20 +82,6 @@ static void __init highbank_init_irq(void)
         }
 }
 
-static void __init highbank_timer_init(void)
-{
-        struct device_node *np;
-
-        /* Map system registers */
-        np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
-        sregs_base = of_iomap(np, 0);
-        WARN_ON(!sregs_base);
-
-        of_clk_init(NULL);
-
-        clocksource_of_init();
-}
-
 static void highbank_power_off(void)
 {
         highbank_set_pwr_shutdown();
@@ -155,6 +140,13 @@ static struct notifier_block highbank_platform_nb = {
 
 static void __init highbank_init(void)
 {
+        struct device_node *np;
+
+        /* Map system registers */
+        np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
+        sregs_base = of_iomap(np, 0);
+        WARN_ON(!sregs_base);
+
         pm_power_off = highbank_power_off;
         highbank_pm_init();
 
@@ -176,7 +168,6 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
 #endif
         .smp            = smp_ops(highbank_smp_ops),
         .init_irq       = highbank_init_irq,
-        .init_time      = highbank_timer_init,
         .init_machine   = highbank_init,
         .dt_compat      = highbank_match,
         .restart        = highbank_restart,
diff --git a/drivers/clk/clk-highbank.c b/drivers/clk/clk-highbank.c
index 2e08cb001936..2e7e9d9798cb 100644
--- a/drivers/clk/clk-highbank.c
+++ b/drivers/clk/clk-highbank.c
@@ -20,8 +20,7 @@
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/of.h>
-
-extern void __iomem *sregs_base;
+#include <linux/of_address.h>
 
 #define HB_PLL_LOCK_500         0x20000000
 #define HB_PLL_LOCK             0x10000000
@@ -280,6 +279,7 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
         const char *clk_name = node->name;
         const char *parent_name;
         struct clk_init_data init;
+        struct device_node *srnp;
         int rc;
 
         rc = of_property_read_u32(node, "reg", &reg);
@@ -290,7 +290,11 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
         if (WARN_ON(!hb_clk))
                 return NULL;
 
-        hb_clk->reg = sregs_base + reg;
+        /* Map system registers */
+        srnp = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
+        hb_clk->reg = of_iomap(srnp, 0);
+        BUG_ON(!hb_clk->reg);
+        hb_clk->reg += reg;
 
         of_property_read_string(node, "clock-output-names", &clk_name);