Commit bdcc6127 authored Jan 18, 2013 by Jon Hunter Committed by Paul Walmsley Jan 18, 2013

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>

parent 12d82e4b

arch/arm/mach-omap2/cclock2420_data.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1935,6 +1935,8 @@ int __init omap2420_clk_init(void)
	omap2_init_clk_hw_omap_clocks(c->lk.clk);		omap2_init_clk_hw_omap_clocks(c->lk.clk);
	}		}

			omap2xxx_clkt_vps_late_init();

	omap2_clk_disable_autoidle_all();		omap2_clk_disable_autoidle_all();

	omap2_clk_enable_init_clocks(enable_init_clks,		omap2_clk_enable_init_clocks(enable_init_clks,

arch/arm/mach-omap2/cclock2430_data.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2050,6 +2050,8 @@ int __init omap2430_clk_init(void)
	omap2_init_clk_hw_omap_clocks(c->lk.clk);		omap2_init_clk_hw_omap_clocks(c->lk.clk);
	}		}

			omap2xxx_clkt_vps_late_init();

	omap2_clk_disable_autoidle_all();		omap2_clk_disable_autoidle_all();

	omap2_clk_enable_init_clocks(enable_init_clks,		omap2_clk_enable_init_clocks(enable_init_clks,