timer*_fck are going to be renamed as timer*_mod_ck:s. Fix the init time configuration of timer3/timer6 to take this into account, and lookup for the module clock in case the lookup for fck fails. Signed-off-by: Tero Kristo <t-kristo@xxxxxx> --- drivers/clk/ti/clk-33xx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index ef2ec64..c69fed5 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -144,9 +144,15 @@ int __init am33xx_dt_clk_init(void) clk1 = clk_get_sys(NULL, "sys_clkin_ck"); clk2 = clk_get_sys(NULL, "timer3_fck"); + if (IS_ERR(clk2)) + clk2 = clk_get_sys(NULL, "timer3_mod_ck"); + clk_set_parent(clk2, clk1); clk2 = clk_get_sys(NULL, "timer6_fck"); + if (IS_ERR(clk2)) + clk2 = clk_get_sys(NULL, "timer6_mod_ck"); + clk_set_parent(clk2, clk1); /* * The On-Chip 32K RC Osc clock is not an accurate clock-source as per -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
