summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/cclock2420_data.c
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2013-01-19 00:48:16 +0100
committerPaul Walmsley <paul@pwsan.com>2013-01-19 00:48:16 +0100
commitbdcc61275232db897ba831f87a16df98ab248571 (patch)
tree4cb2045643fa2e76ac85903ff43d5708865bf452 /arch/arm/mach-omap2/cclock2420_data.c
parentARM: OMAP4: hwmod_data: Correct IDLEMODE for McPDM (diff)
downloadlinux-bdcc61275232db897ba831f87a16df98ab248571.tar.xz
linux-bdcc61275232db897ba831f87a16df98ab248571.zip
ARM: OMAP2: Fix missing omap2xxx_clkt_vps_late_init function calls
During the migration to the common clock framework, calls to the functions omap2xxx_clkt_vps_late_init() were not preserved for OMAP2420 and OMAP2430. This causes the variables "sys_ck_rate" and "curr_prcm_set" to be uninitialised on boot. On reboot, this causes the following error message to be displayed because the appropriate MPU clock frequency (derived from sys_ck_rate) cannot be found. "Could not set MPU rate to 4294MHz" Fix this by adding back calls to omap2xxx_clkt_vps_late_init() in the OMAP2420 and OMAP2430 clock initialisation code. Signed-off-by: Jon Hunter <jon-hunter@ti.com> [paul@pwsan.com: dropped the duplicated call to omap2xxx_clkt_vps_check_bootloader_rates() after consultation with Jon; updated patch description] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/cclock2420_data.c')
-rw-r--r--arch/arm/mach-omap2/cclock2420_data.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cclock2420_data.c b/arch/arm/mach-omap2/cclock2420_data.c
index 7e5febe456d9..ab7e952d2070 100644
--- a/arch/arm/mach-omap2/cclock2420_data.c
+++ b/arch/arm/mach-omap2/cclock2420_data.c
@@ -1935,6 +1935,8 @@ int __init omap2420_clk_init(void)
omap2_init_clk_hw_omap_clocks(c->lk.clk);
}
+ omap2xxx_clkt_vps_late_init();
+
omap2_clk_disable_autoidle_all();
omap2_clk_enable_init_clocks(enable_init_clks,