6 files changed, 106 insertions, 21 deletions

diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h
index 6222e87a79b6..748ac338812b 100644
--- a/arch/arm/mach-omap2/cm.h
+++ b/arch/arm/mach-omap2/cm.h
@@ -70,6 +70,7 @@ int omap_cm_module_enable(u8 mode, u8 part, u16 inst, u16 clkctrl_offs);
 int omap_cm_module_disable(u8 part, u16 inst, u16 clkctrl_offs);
 extern int cm_register(struct cm_ll_data *cld);
 extern int cm_unregister(struct cm_ll_data *cld);
+int omap_cm_init(void);
 
 # endif
 
diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c
index 8fe02fcedc48..f3d578be3272 100644
--- a/arch/arm/mach-omap2/cm_common.c
+++ b/arch/arm/mach-omap2/cm_common.c
@@ -15,10 +15,13 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/bug.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 
 #include "cm2xxx.h"
 #include "cm3xxx.h"
 #include "cm44xx.h"
+#include "clock.h"
 
 /*
  * cm_ll_data: function pointers to SoC-specific implementations of
@@ -212,3 +215,51 @@ int cm_unregister(struct cm_ll_data *cld)
 
         return 0;
 }
+
+static struct omap_prcm_init_data cm_data = {
+        .index = TI_CLKM_CM,
+};
+
+static struct omap_prcm_init_data cm2_data = {
+        .index = TI_CLKM_CM2,
+};
+
+static const struct of_device_id omap_cm_dt_match_table[] = {
+        { .compatible = "ti,omap3-cm", .data = &cm_data },
+        { .compatible = "ti,omap4-cm1", .data = &cm_data },
+        { .compatible = "ti,omap4-cm2", .data = &cm2_data },
+        { .compatible = "ti,omap5-cm-core-aon", .data = &cm_data },
+        { .compatible = "ti,omap5-cm-core", .data = &cm2_data },
+        { .compatible = "ti,dra7-cm-core-aon", .data = &cm_data },
+        { .compatible = "ti,dra7-cm-core", .data = &cm2_data },
+        { }
+};
+
+/**
+ * omap_cm_init - low level init for the CM drivers
+ *
+ * Initializes the low level clock infrastructure for CM drivers.
+ * Returns 0 in success, negative error value in failure.
+ */
+int __init omap_cm_init(void)
+{
+        struct device_node *np;
+        void __iomem *mem;
+        const struct of_device_id *match;
+        const struct omap_prcm_init_data *data;
+        int ret;
+
+        for_each_matching_node_and_match(np, omap_cm_dt_match_table, &match) {
+                data = match->data;
+
+                mem = of_iomap(np, 0);
+                if (!mem)
+                        return -ENOMEM;
+
+                ret = omap2_clk_provider_init(np, data->index, mem);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index da041b4ab29c..e8818242f968 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -14,6 +14,7 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
 
 #include "soc.h"
 #include "iomap.h"
@@ -25,6 +26,7 @@
 #include "sdrc.h"
 #include "pm.h"
 #include "control.h"
+#include "clock.h"
 
 /* Used by omap3_ctrl_save_padconf() */
 #define START_PADCONF_SAVE              0x2
@@ -611,3 +613,48 @@ void __init omap3_ctrl_init(void)
         omap3_ctrl_setup_d2d_padconf();
 }
 #endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */
+
+struct control_init_data {
+        int index;
+};
+
+static struct control_init_data ctrl_data = {
+        .index = TI_CLKM_CTRL,
+};
+
+static const struct of_device_id omap_scrm_dt_match_table[] = {
+        { .compatible = "ti,am3-scrm", .data = &ctrl_data },
+        { .compatible = "ti,am4-scrm", .data = &ctrl_data },
+        { .compatible = "ti,omap2-scrm", .data = &ctrl_data },
+        { .compatible = "ti,omap3-scrm", .data = &ctrl_data },
+        { }
+};
+
+/**
+ * omap_control_init - low level init for the control driver
+ *
+ * Initializes the low level clock infrastructure for control driver.
+ * Returns 0 in success, negative error value in failure.
+ */
+int __init omap_control_init(void)
+{
+        struct device_node *np;
+        void __iomem *mem;
+        const struct of_device_id *match;
+        const struct omap_prcm_init_data *data;
+        int ret;
+
+        for_each_matching_node_and_match(np, omap_scrm_dt_match_table, &match) {
+                data = match->data;
+
+                mem = of_iomap(np, 0);
+                if (!mem)
+                        return -ENOMEM;
+
+                ret = omap2_clk_provider_init(np, data->index, mem);
+                if (ret)
+                        return ret;
+        }
+
+        return 0;
+}
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index b8a487181210..baf5783cb05d 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -464,6 +464,7 @@ extern void omap_ctrl_write_dsp_boot_mode(u8 bootmode);
 extern void omap3630_ctrl_disable_rta(void);
 extern int omap3_ctrl_save_padconf(void);
 void omap3_ctrl_init(void);
+int omap_control_init(void);
 extern void omap2_set_globals_control(void __iomem *ctrl,
                                       void __iomem *ctrl_pad);
 #else
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 460da22a005c..46640c0ddc0f 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -756,6 +756,10 @@ int __init omap_clk_init(void)
         ti_clk_init_features();
 
         if (of_have_populated_dt()) {
+                ret = omap_control_init();
+                if (ret)
+                        return ret;
+
                 ret = omap_prcm_init();
                 if (ret)
                         return ret;
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 1bfd00e10f76..6cbebbe252c4 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -637,43 +637,22 @@ static struct omap_prcm_init_data prm_data = {
         .index = TI_CLKM_PRM,
 };
 
-static struct omap_prcm_init_data cm_data = {
-        .index = TI_CLKM_CM,
-};
-
-static struct omap_prcm_init_data cm2_data = {
-        .index = TI_CLKM_CM2,
-};
-
 static struct omap_prcm_init_data scrm_data = {
         .index = TI_CLKM_SCRM,
 };
 
 static const struct of_device_id omap_prcm_dt_match_table[] = {
         { .compatible = "ti,am3-prcm", .data = &prm_data },
-        { .compatible = "ti,am3-scrm", .data = &scrm_data },
         { .compatible = "ti,am4-prcm", .data = &prm_data },
-        { .compatible = "ti,am4-scrm", .data = &scrm_data },
         { .compatible = "ti,dm814-prcm", .data = &prm_data },
-        { .compatible = "ti,dm814-scrm", .data = &scrm_data },
         { .compatible = "ti,dm816-prcm", .data = &prm_data },
-        { .compatible = "ti,dm816-scrm", .data = &scrm_data },
         { .compatible = "ti,omap2-prcm", .data = &prm_data },
-        { .compatible = "ti,omap2-scrm", .data = &scrm_data },
         { .compatible = "ti,omap3-prm", .data = &prm_data },
-        { .compatible = "ti,omap3-cm", .data = &cm_data },
-        { .compatible = "ti,omap3-scrm", .data = &scrm_data },
-        { .compatible = "ti,omap4-cm1", .data = &cm_data },
         { .compatible = "ti,omap4-prm", .data = &prm_data },
-        { .compatible = "ti,omap4-cm2", .data = &cm2_data },
         { .compatible = "ti,omap4-scrm", .data = &scrm_data },
         { .compatible = "ti,omap5-prm", .data = &prm_data },
-        { .compatible = "ti,omap5-cm-core-aon", .data = &cm_data },
         { .compatible = "ti,omap5-scrm", .data = &scrm_data },
-        { .compatible = "ti,omap5-cm-core", .data = &cm2_data },
         { .compatible = "ti,dra7-prm", .data = &prm_data },
-        { .compatible = "ti,dra7-cm-core-aon", .data = &cm_data },
-        { .compatible = "ti,dra7-cm-core", .data = &cm2_data },
         { }
 };
 
@@ -703,6 +682,8 @@ int __init omap_prcm_init(void)
                         return ret;
         }
 
+        omap_cm_init();
+
         return 0;
 }