clk: nomadik: move src init out of nomadik_clk_init

nomadik_clk_init currently also maps system reset controller base address
used by clocks and registers a reboot notifier. To allow further cleanup of
nomadik clk setup, this moves system reset controller setup from
nomadik_clk_init to its own function.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>

1 files changed, 74 insertions, 70 deletions

diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c
index 4d978a3c88f7..06b29c264dbe 100644
--- a/drivers/clk/clk-nomadik.c
+++ b/drivers/clk/clk-nomadik.c
@@ -62,6 +62,79 @@ static DEFINE_SPINLOCK(src_lock);
 /* Base address of the SRC */
 static void __iomem *src_base;
 
+static int nomadik_clk_reboot_handler(struct notifier_block *this,
+                                unsigned long code,
+                                void *unused)
+{
+        u32 val;
+
+        /* The main chrystal need to be enabled for reboot to work */
+        val = readl(src_base + SRC_XTALCR);
+        val &= ~SRC_XTALCR_MXTALOVER;
+        val |= SRC_XTALCR_MXTALEN;
+        pr_crit("force-enabling MXTALO\n");
+        writel(val, src_base + SRC_XTALCR);
+        return NOTIFY_OK;
+}
+
+static struct notifier_block nomadik_clk_reboot_notifier = {
+        .notifier_call = nomadik_clk_reboot_handler,
+};
+
+static const struct of_device_id nomadik_src_match[] __initconst = {
+        { .compatible = "stericsson,nomadik-src" },
+        { /* sentinel */ }
+};
+
+static void nomadik_src_init(void)
+{
+        struct device_node *np;
+        u32 val;
+
+        np = of_find_matching_node(NULL, nomadik_src_match);
+        if (!np) {
+                pr_crit("no matching node for SRC, aborting clock init\n");
+                return;
+        }
+        src_base = of_iomap(np, 0);
+        if (!src_base) {
+                pr_err("%s: must have src parent node with REGS (%s)\n",
+                       __func__, np->name);
+                return;
+        }
+
+        /* Set all timers to use the 2.4 MHz TIMCLK */
+        val = readl(src_base + SRC_CR);
+        val |= SRC_CR_T0_ENSEL;
+        val |= SRC_CR_T1_ENSEL;
+        val |= SRC_CR_T2_ENSEL;
+        val |= SRC_CR_T3_ENSEL;
+        val |= SRC_CR_T4_ENSEL;
+        val |= SRC_CR_T5_ENSEL;
+        val |= SRC_CR_T6_ENSEL;
+        val |= SRC_CR_T7_ENSEL;
+        writel(val, src_base + SRC_CR);
+
+        val = readl(src_base + SRC_XTALCR);
+        pr_info("SXTALO is %s\n",
+                (val & SRC_XTALCR_SXTALDIS) ? "disabled" : "enabled");
+        pr_info("MXTAL is %s\n",
+                (val & SRC_XTALCR_MXTALSTAT) ? "enabled" : "disabled");
+        if (of_property_read_bool(np, "disable-sxtalo")) {
+                /* The machine uses an external oscillator circuit */
+                val |= SRC_XTALCR_SXTALDIS;
+                pr_info("disabling SXTALO\n");
+        }
+        if (of_property_read_bool(np, "disable-mxtalo")) {
+                /* Disable this too: also run by external oscillator */
+                val |= SRC_XTALCR_MXTALOVER;
+                val &= ~SRC_XTALCR_MXTALEN;
+                pr_info("disabling MXTALO\n");
+        }
+        writel(val, src_base + SRC_XTALCR);
+        register_reboot_notifier(&nomadik_clk_reboot_notifier);
+}
+
 /**
  * struct clk_pll1 - Nomadik PLL1 clock
  * @hw: corresponding clock hardware entry
@@ -487,11 +560,6 @@ static void __init of_nomadik_src_clk_setup(struct device_node *np)
                 of_clk_add_provider(np, of_clk_src_simple_get, clk);
 }
 
-static const struct of_device_id nomadik_src_match[] __initconst = {
-        { .compatible = "stericsson,nomadik-src" },
-        { /* sentinel */ }
-};
-
 static const struct of_device_id nomadik_src_clk_match[] __initconst = {
         {
                 .compatible = "fixed-clock",
@@ -516,72 +584,8 @@ static const struct of_device_id nomadik_src_clk_match[] __initconst = {
         { /* sentinel */ }
 };
 
-static int nomadik_clk_reboot_handler(struct notifier_block *this,
-                                unsigned long code,
-                                void *unused)
-{
-        u32 val;
-
-        /* The main chrystal need to be enabled for reboot to work */
-        val = readl(src_base + SRC_XTALCR);
-        val &= ~SRC_XTALCR_MXTALOVER;
-        val |= SRC_XTALCR_MXTALEN;
-        pr_crit("force-enabling MXTALO\n");
-        writel(val, src_base + SRC_XTALCR);
-        return NOTIFY_OK;
-}
-
-static struct notifier_block nomadik_clk_reboot_notifier = {
-        .notifier_call = nomadik_clk_reboot_handler,
-};
-
 void __init nomadik_clk_init(void)
 {
-        struct device_node *np;
-        u32 val;
-
-        np = of_find_matching_node(NULL, nomadik_src_match);
-        if (!np) {
-                pr_crit("no matching node for SRC, aborting clock init\n");
-                return;
-        }
-        src_base = of_iomap(np, 0);
-        if (!src_base) {
-                pr_err("%s: must have src parent node with REGS (%s)\n",
-                       __func__, np->name);
-                return;
-        }
-
-        /* Set all timers to use the 2.4 MHz TIMCLK */
-        val = readl(src_base + SRC_CR);
-        val |= SRC_CR_T0_ENSEL;
-        val |= SRC_CR_T1_ENSEL;
-        val |= SRC_CR_T2_ENSEL;
-        val |= SRC_CR_T3_ENSEL;
-        val |= SRC_CR_T4_ENSEL;
-        val |= SRC_CR_T5_ENSEL;
-        val |= SRC_CR_T6_ENSEL;
-        val |= SRC_CR_T7_ENSEL;
-        writel(val, src_base + SRC_CR);
-
-        val = readl(src_base + SRC_XTALCR);
-        pr_info("SXTALO is %s\n",
-                (val & SRC_XTALCR_SXTALDIS) ? "disabled" : "enabled");
-        pr_info("MXTAL is %s\n",
-                (val & SRC_XTALCR_MXTALSTAT) ? "enabled" : "disabled");
-        if (of_property_read_bool(np, "disable-sxtalo")) {
-                /* The machine uses an external oscillator circuit */
-                val |= SRC_XTALCR_SXTALDIS;
-                pr_info("disabling SXTALO\n");
-        }
-        if (of_property_read_bool(np, "disable-mxtalo")) {
-                /* Disable this too: also run by external oscillator */
-                val |= SRC_XTALCR_MXTALOVER;
-                val &= ~SRC_XTALCR_MXTALEN;
-                pr_info("disabling MXTALO\n");
-        }
-        writel(val, src_base + SRC_XTALCR);
-        register_reboot_notifier(&nomadik_clk_reboot_notifier);
-
+        nomadik_src_init();
         of_clk_init(nomadik_src_clk_match);
 }