diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-03-16 06:40:58 -0400 |
---|---|---|
committer | Tero Kristo <t-kristo@ti.com> | 2015-03-24 14:23:50 -0400 |
commit | c8d382921299a32e4ed9b690d3865e01a73ea02c (patch) | |
tree | 4e6da0f2339b793f338c4d433037fd9fe8adc305 /drivers/clk/ti | |
parent | f757d1b047dfe704d459746c289f27934de6f91e (diff) |
clk: ti: clk-3xxx-legacy: Correct McBSP related clock aliases
Correct the McBSP2/4 ick mapping (they were 2->4 and 4->2).
Add missing mcbsp clock aliases.
Collect the McBSP clock definition in one location at the same time.
Fixes the following warning on boot:
[ 0.307739] omap_hwmod: mcbsp2: _wait_target_ready failed: -16
[ 0.307769] omap_hwmod: mcbsp2: cannot be enabled for reset (3)
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'drivers/clk/ti')
-rw-r--r-- | drivers/clk/ti/clk-3xxx-legacy.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/clk/ti/clk-3xxx-legacy.c b/drivers/clk/ti/clk-3xxx-legacy.c index e0732a4c8f26..0b61548d569b 100644 --- a/drivers/clk/ti/clk-3xxx-legacy.c +++ b/drivers/clk/ti/clk-3xxx-legacy.c | |||
@@ -4320,7 +4320,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { | |||
4320 | CLK(NULL, "dpll3_m3x2_ck", &dpll3_m3x2_ck), | 4320 | CLK(NULL, "dpll3_m3x2_ck", &dpll3_m3x2_ck), |
4321 | CLK("etb", "emu_core_alwon_ck", &emu_core_alwon_ck), | 4321 | CLK("etb", "emu_core_alwon_ck", &emu_core_alwon_ck), |
4322 | CLK(NULL, "sys_altclk", &sys_altclk), | 4322 | CLK(NULL, "sys_altclk", &sys_altclk), |
4323 | CLK(NULL, "mcbsp_clks", &mcbsp_clks), | ||
4324 | CLK(NULL, "sys_clkout1", &sys_clkout1), | 4323 | CLK(NULL, "sys_clkout1", &sys_clkout1), |
4325 | CLK(NULL, "dpll3_m2_ck", &dpll3_m2_ck), | 4324 | CLK(NULL, "dpll3_m2_ck", &dpll3_m2_ck), |
4326 | CLK(NULL, "core_ck", &core_ck), | 4325 | CLK(NULL, "core_ck", &core_ck), |
@@ -4369,8 +4368,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { | |||
4369 | CLK(NULL, "i2c3_fck", &i2c3_fck), | 4368 | CLK(NULL, "i2c3_fck", &i2c3_fck), |
4370 | CLK(NULL, "i2c2_fck", &i2c2_fck), | 4369 | CLK(NULL, "i2c2_fck", &i2c2_fck), |
4371 | CLK(NULL, "i2c1_fck", &i2c1_fck), | 4370 | CLK(NULL, "i2c1_fck", &i2c1_fck), |
4372 | CLK(NULL, "mcbsp5_fck", &mcbsp5_fck), | ||
4373 | CLK(NULL, "mcbsp1_fck", &mcbsp1_fck), | ||
4374 | CLK(NULL, "core_48m_fck", &core_48m_fck), | 4371 | CLK(NULL, "core_48m_fck", &core_48m_fck), |
4375 | CLK(NULL, "mcspi4_fck", &mcspi4_fck), | 4372 | CLK(NULL, "mcspi4_fck", &mcspi4_fck), |
4376 | CLK(NULL, "mcspi3_fck", &mcspi3_fck), | 4373 | CLK(NULL, "mcspi3_fck", &mcspi3_fck), |
@@ -4409,8 +4406,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { | |||
4409 | CLK(NULL, "uart1_ick", &uart1_ick), | 4406 | CLK(NULL, "uart1_ick", &uart1_ick), |
4410 | CLK(NULL, "gpt11_ick", &gpt11_ick), | 4407 | CLK(NULL, "gpt11_ick", &gpt11_ick), |
4411 | CLK(NULL, "gpt10_ick", &gpt10_ick), | 4408 | CLK(NULL, "gpt10_ick", &gpt10_ick), |
4412 | CLK("omap-mcbsp.5", "ick", &mcbsp5_ick), | ||
4413 | CLK("omap-mcbsp.1", "ick", &mcbsp1_ick), | ||
4414 | CLK(NULL, "mcbsp5_ick", &mcbsp5_ick), | 4409 | CLK(NULL, "mcbsp5_ick", &mcbsp5_ick), |
4415 | CLK(NULL, "mcbsp1_ick", &mcbsp1_ick), | 4410 | CLK(NULL, "mcbsp1_ick", &mcbsp1_ick), |
4416 | CLK(NULL, "omapctrl_ick", &omapctrl_ick), | 4411 | CLK(NULL, "omapctrl_ick", &omapctrl_ick), |
@@ -4467,15 +4462,22 @@ static struct ti_clk_alias omap3xxx_clks[] = { | |||
4467 | CLK(NULL, "gpt4_ick", &gpt4_ick), | 4462 | CLK(NULL, "gpt4_ick", &gpt4_ick), |
4468 | CLK(NULL, "gpt3_ick", &gpt3_ick), | 4463 | CLK(NULL, "gpt3_ick", &gpt3_ick), |
4469 | CLK(NULL, "gpt2_ick", &gpt2_ick), | 4464 | CLK(NULL, "gpt2_ick", &gpt2_ick), |
4465 | CLK(NULL, "mcbsp_clks", &mcbsp_clks), | ||
4466 | CLK("omap-mcbsp.1", "ick", &mcbsp1_ick), | ||
4470 | CLK("omap-mcbsp.2", "ick", &mcbsp2_ick), | 4467 | CLK("omap-mcbsp.2", "ick", &mcbsp2_ick), |
4471 | CLK("omap-mcbsp.3", "ick", &mcbsp3_ick), | 4468 | CLK("omap-mcbsp.3", "ick", &mcbsp3_ick), |
4472 | CLK("omap-mcbsp.4", "ick", &mcbsp4_ick), | 4469 | CLK("omap-mcbsp.4", "ick", &mcbsp4_ick), |
4473 | CLK(NULL, "mcbsp4_ick", &mcbsp2_ick), | 4470 | CLK("omap-mcbsp.5", "ick", &mcbsp5_ick), |
4471 | CLK(NULL, "mcbsp1_ick", &mcbsp1_ick), | ||
4472 | CLK(NULL, "mcbsp2_ick", &mcbsp2_ick), | ||
4474 | CLK(NULL, "mcbsp3_ick", &mcbsp3_ick), | 4473 | CLK(NULL, "mcbsp3_ick", &mcbsp3_ick), |
4475 | CLK(NULL, "mcbsp2_ick", &mcbsp4_ick), | 4474 | CLK(NULL, "mcbsp4_ick", &mcbsp4_ick), |
4475 | CLK(NULL, "mcbsp5_ick", &mcbsp5_ick), | ||
4476 | CLK(NULL, "mcbsp1_fck", &mcbsp1_fck), | ||
4476 | CLK(NULL, "mcbsp2_fck", &mcbsp2_fck), | 4477 | CLK(NULL, "mcbsp2_fck", &mcbsp2_fck), |
4477 | CLK(NULL, "mcbsp3_fck", &mcbsp3_fck), | 4478 | CLK(NULL, "mcbsp3_fck", &mcbsp3_fck), |
4478 | CLK(NULL, "mcbsp4_fck", &mcbsp4_fck), | 4479 | CLK(NULL, "mcbsp4_fck", &mcbsp4_fck), |
4480 | CLK(NULL, "mcbsp5_fck", &mcbsp5_fck), | ||
4479 | CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck), | 4481 | CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck), |
4480 | CLK("etb", "emu_src_ck", &emu_src_ck), | 4482 | CLK("etb", "emu_src_ck", &emu_src_ck), |
4481 | CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck), | 4483 | CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck), |