diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-10-30 03:55:53 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-08 20:33:08 +0100 |
| commit | 5f03937700e3991a0de801ade8374628f2c982d5 (patch) | |
| tree | 06679db2cd46c3063a058ce9540e78294538d53b /arch/arm/mach-omap2/clock2420_data.c | |
| parent | ARM: OMAP2/3: PRM: add SoC reset functions (using the CORE DPLL method) (diff) | |
| download | linux-5f03937700e3991a0de801ade8374628f2c982d5.tar.xz linux-5f03937700e3991a0de801ade8374628f2c982d5.zip | |
ARM: OMAP2xxx: clock: remove global 'dclk' variable
Remove the global 'dclk' variable, instead replacing it with a
variable local to the dpllcore clock type C file. This removes some
of the special-case code surrounding the OMAP2xxx clock init.
This patch is a prerequisite for the removal of the
omap_prcm_restart() code from arch/arm/mach-omap2/prcm.c. It also
cleans up some special-case OMAP2xxx clock code in the process.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Vaibhav Hiremath <hvaibhav@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index da1e388f22f7..d1034858b87a 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -124,6 +124,7 @@ static struct clk dpll_ck = { .name = "dpll_ck", .ops = &clkops_omap2xxx_dpll_ops, .parent = &sys_ck, /* Can be func_32k also */ + .init = &omap2xxx_clkt_dpllcore_init, .dpll_data = &dpll_dd, .clkdm_name = "wkup_clkdm", .recalc = &omap2_dpllcore_recalc, @@ -1953,7 +1954,7 @@ int __init omap2420_clk_init(void) omap_clk_disable_autoidle_all(); /* Check the MPU rate set by bootloader */ - clkrate = omap2xxx_clk_get_core_rate(&dpll_ck); + clkrate = omap2xxx_clk_get_core_rate(); for (prcm = rate_table; prcm->mpu_speed; prcm++) { if (!(prcm->flags & cpu_mask)) continue; @@ -1979,7 +1980,6 @@ int __init omap2420_clk_init(void) /* Avoid sleeping sleeping during omap2_clk_prepare_for_reboot() */ vclk = clk_get(NULL, "virt_prcm_set"); sclk = clk_get(NULL, "sys_ck"); - dclk = clk_get(NULL, "dpll_ck"); return 0; } |