diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock2430_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index c97dafef894d..3e16eab4691d 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c | |||
@@ -123,6 +123,7 @@ static struct clk dpll_ck = { | |||
123 | .name = "dpll_ck", | 123 | .name = "dpll_ck", |
124 | .ops = &clkops_omap2xxx_dpll_ops, | 124 | .ops = &clkops_omap2xxx_dpll_ops, |
125 | .parent = &sys_ck, /* Can be func_32k also */ | 125 | .parent = &sys_ck, /* Can be func_32k also */ |
126 | .init = &omap2xxx_clkt_dpllcore_init, | ||
126 | .dpll_data = &dpll_dd, | 127 | .dpll_data = &dpll_dd, |
127 | .clkdm_name = "wkup_clkdm", | 128 | .clkdm_name = "wkup_clkdm", |
128 | .recalc = &omap2_dpllcore_recalc, | 129 | .recalc = &omap2_dpllcore_recalc, |
@@ -2052,7 +2053,7 @@ int __init omap2430_clk_init(void) | |||
2052 | omap_clk_disable_autoidle_all(); | 2053 | omap_clk_disable_autoidle_all(); |
2053 | 2054 | ||
2054 | /* Check the MPU rate set by bootloader */ | 2055 | /* Check the MPU rate set by bootloader */ |
2055 | clkrate = omap2xxx_clk_get_core_rate(&dpll_ck); | 2056 | clkrate = omap2xxx_clk_get_core_rate(); |
2056 | for (prcm = rate_table; prcm->mpu_speed; prcm++) { | 2057 | for (prcm = rate_table; prcm->mpu_speed; prcm++) { |
2057 | if (!(prcm->flags & cpu_mask)) | 2058 | if (!(prcm->flags & cpu_mask)) |
2058 | continue; | 2059 | continue; |
@@ -2078,7 +2079,6 @@ int __init omap2430_clk_init(void) | |||
2078 | /* Avoid sleeping sleeping during omap2_clk_prepare_for_reboot() */ | 2079 | /* Avoid sleeping sleeping during omap2_clk_prepare_for_reboot() */ |
2079 | vclk = clk_get(NULL, "virt_prcm_set"); | 2080 | vclk = clk_get(NULL, "virt_prcm_set"); |
2080 | sclk = clk_get(NULL, "sys_ck"); | 2081 | sclk = clk_get(NULL, "sys_ck"); |
2081 | dclk = clk_get(NULL, "dpll_ck"); | ||
2082 | 2082 | ||
2083 | return 0; | 2083 | return 0; |
2084 | } | 2084 | } |