summaryrefslogtreecommitdiffstats
path: root/drivers/clk/ti/clk-54xx.c
diff options
context:
space:
mode:
authorGrygorii Strashko <grygorii.strashko@ti.com>2015-12-10 19:03:45 +0200
committerStephen Boyd <sboyd@codeaurora.org>2016-04-15 17:30:07 -0700
commitd5630b7a557aff4d107e5af2e73fb91ed707f442 (patch)
tree3909f5921aff8cc375ea681f1a69d4ae43c06239 /drivers/clk/ti/clk-54xx.c
parent3db5ca27c80c15d20d0f1152dc34a5bcfa432ae6 (diff)
downloadtalos-obmc-linux-d5630b7a557aff4d107e5af2e73fb91ed707f442.tar.gz
talos-obmc-linux-d5630b7a557aff4d107e5af2e73fb91ed707f442.zip
clk: ti: dra7: fix kernel boot with arg 'clocksource=gp_timer'
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>
Diffstat (limited to 'drivers/clk/ti/clk-54xx.c')
-rw-r--r--drivers/clk/ti/clk-54xx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c
index 59ce2fa2c104..294bc03ec067 100644
--- a/drivers/clk/ti/clk-54xx.c
+++ b/drivers/clk/ti/clk-54xx.c
@@ -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"),
OpenPOWER on IntegriCloud