Merge branch 'for-v3.18/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next

2 files changed, 10 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 5d0667c119f6..a1b82a994842 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -734,8 +734,16 @@ int __init omap_clk_init(void)
         ti_clk_init_features();
 
         ret = of_prcm_init();
-        if (!ret)
-                ret = omap_clk_soc_init();
+        if (ret)
+                return ret;
+
+        of_clk_init(NULL);
+
+        ti_dt_clk_init_retry_clks();
+
+        ti_dt_clockdomains_setup();
+
+        ret = omap_clk_soc_init();
 
         return ret;
 }
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 76ca320f007c..3b890807f5e6 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -525,8 +525,6 @@ int __init of_prcm_init(void)
                 memmap_index++;
         }
 
-        ti_dt_clockdomains_setup();
-
         return 0;
 }