diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-29 23:38:59 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-29 23:38:59 -0700 |
| commit | 82de1bc86c493ad832db270635fbf4e8c237f02f (patch) | |
| tree | f70562cf3ae0a777ff55da734466627e2ab2478c /arch/arm/mach-omap2 | |
| parent | 6e18ff26c2b529de06207caa2be9e5f1cf520972 (diff) | |
| parent | 04ed831f224d4553682f48e1b4a6b68f2622b68e (diff) | |
| download | linux-82de1bc86c493ad832db270635fbf4e8c237f02f.tar.bz2 | |
Merge branch 'for-v3.18/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/prm_common.c | 2 |
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; } |