clk: ti: dra7: fix kernel boot with arg 'clocksource=gp_timer' (d5630b7a) · Commits · 戴 / test

The OMAP Platform code provides possibility to select GP Timer as default clocksource instead of counter_32K by using bootcmd parameter 'clocksource', but the system will crash during early boot when this option is used on dra7 or omap5 platforms, because it will hit BUG() statement: omap2_gptimer_clocksource_init ->BUG_ON(res); This happens because clk_dev alias "sys_clkin_ck" is not registered. Hence, fix it by adding missing "sys_clkin_ck" clk_dev aliases definitions for omap5 and dra7. Acked-by:

Tero Kristo <t-kristo@ti.com> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by:

Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by:

Stephen Boyd <sboyd@codeaurora.org>

drivers/clk/ti/clk-54xx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ static struct ti_dt_clk omap54xx_clks[] = {
		DT_CLK("usbhs_omap", "usbtll_fck", "dummy_ck"),
		DT_CLK("omap_wdt", "ick", "dummy_ck"),
		DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
		DT_CLK(NULL, "sys_clkin_ck", "sys_clkin"),
		DT_CLK("4ae18000.timer", "timer_sys_ck", "sys_clkin"),
		DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin"),
		DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin"),

drivers/clk/ti/clk-7xx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,7 @@ static struct ti_dt_clk dra7xx_clks[] = {
		DT_CLK("usbhs_omap", "usbtll_fck", "dummy_ck"),
		DT_CLK("omap_wdt", "ick", "dummy_ck"),
		DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),
		DT_CLK(NULL, "sys_clkin_ck", "timer_sys_clk_div"),
		DT_CLK("4ae18000.timer", "timer_sys_ck", "timer_sys_clk_div"),
		DT_CLK("48032000.timer", "timer_sys_ck", "timer_sys_clk_div"),
		DT_CLK("48034000.timer", "timer_sys_ck", "timer_sys_clk_div"),

Admin message