With omap_hwmod_get_main_clk() now available, this can be passed to
clk_get() to extract the fclk and thus avoid construction of fclk name.
Corrected the timer fck name mis-match between clock44xx_data.c and
omap_hwmod_44xx_data.c. For other platforms this is already taken care.
Cc: Cousson, Benoit <b-cous...@ti.com>
Cc: Paul Walmsley <p...@pwsan.com>
Cc: Tony Lindgren <t...@atomide.com>
Cc: Kevin Hilman <khil...@ti.com>
Cc: Rajendra Nayak <rna...@ti.com>
Cc: Santosh Shilimkar <santosh.shilim...@ti.com>
Signed-off-by: Tarun Kanti DebBarma <tarun.ka...@ti.com>
---
arch/arm/mach-omap2/clock44xx_data.c | 22 +++++++++++-----------
arch/arm/mach-omap2/timer.c | 3 +--
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-omap2/clock44xx_data.c
b/arch/arm/mach-omap2/clock44xx_data.c
index 2172f66..17f3bcd 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3294,17 +3294,17 @@ static struct omap_clk omap44xx_clks[] = {
CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck,
CK_443X),
CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck,
CK_443X),
CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck,
CK_443X),
- CLK(NULL, "gpt1_fck", &timer1_fck,
CK_443X),
- CLK(NULL, "gpt10_fck", &timer10_fck,
CK_443X),
- CLK(NULL, "gpt11_fck", &timer11_fck,
CK_443X),
- CLK(NULL, "gpt2_fck", &timer2_fck,
CK_443X),
- CLK(NULL, "gpt3_fck", &timer3_fck,
CK_443X),
- CLK(NULL, "gpt4_fck", &timer4_fck,
CK_443X),
- CLK(NULL, "gpt5_fck", &timer5_fck,
CK_443X),
- CLK(NULL, "gpt6_fck", &timer6_fck,
CK_443X),
- CLK(NULL, "gpt7_fck", &timer7_fck,
CK_443X),
- CLK(NULL, "gpt8_fck", &timer8_fck,
CK_443X),
- CLK(NULL, "gpt9_fck", &timer9_fck,
CK_443X),
+ CLK(NULL, "timer1_fck", &timer1_fck,
CK_443X),
+ CLK(NULL, "timer10_fck", &timer10_fck,
CK_443X),
+ CLK(NULL, "timer11_fck", &timer11_fck,
CK_443X),
+ CLK(NULL, "timer2_fck", &timer2_fck,
CK_443X),
+ CLK(NULL, "timer3_fck", &timer3_fck,
CK_443X),
+ CLK(NULL, "timer4_fck", &timer4_fck,
CK_443X),
+ CLK(NULL, "timer5_fck", &timer5_fck,
CK_443X),
+ CLK(NULL, "timer6_fck", &timer6_fck,
CK_443X),
+ CLK(NULL, "timer7_fck", &timer7_fck,
CK_443X),
+ CLK(NULL, "timer8_fck", &timer8_fck,
CK_443X),
+ CLK(NULL, "timer9_fck", &timer9_fck,
CK_443X),
CLK(NULL, "uart1_fck", &uart1_fck,
CK_443X),
CLK(NULL, "uart2_fck", &uart2_fck,
CK_443X),
CLK(NULL, "uart3_fck", &uart3_fck,
CK_443X),
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 5d7a0ee..80c9667 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -164,8 +164,7 @@ static int __init omap_dm_timer_init_one(struct
omap_dm_timer *timer,
return -ENXIO;
/* After the dmtimer is using hwmod these clocks won't be needed */
- sprintf(name, "gpt%d_fck", gptimer_id);
- timer->fclk = clk_get(NULL, name);
+ timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh));
if (IS_ERR(timer->fclk))
return -ENODEV;
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
