diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2013-01-07 06:53:22 -0500 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2013-03-19 03:27:00 -0400 |
commit | 960cba672bcecc6357984101703e70a8c819ccaa (patch) | |
tree | 2583e1d36883329632c3d3617c167968efdcacc3 /arch/arm/mach-omap2/timer.c | |
parent | 5a898a782fee197c6d12d2d5d81868d69090df7b (diff) |
ARM: OMAP5: timer: Update the clocksource name as per clock data
OMAP5 clockdata has different sys clock node name. Fix the timer code
to take care of it.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 2bdd4cf17a8f..773733fccd83 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #define OMAP2_MPU_SOURCE "sys_ck" | 62 | #define OMAP2_MPU_SOURCE "sys_ck" |
63 | #define OMAP3_MPU_SOURCE OMAP2_MPU_SOURCE | 63 | #define OMAP3_MPU_SOURCE OMAP2_MPU_SOURCE |
64 | #define OMAP4_MPU_SOURCE "sys_clkin_ck" | 64 | #define OMAP4_MPU_SOURCE "sys_clkin_ck" |
65 | #define OMAP5_MPU_SOURCE "sys_clkin" | ||
65 | #define OMAP2_32K_SOURCE "func_32k_ck" | 66 | #define OMAP2_32K_SOURCE "func_32k_ck" |
66 | #define OMAP3_32K_SOURCE "omap_32k_fck" | 67 | #define OMAP3_32K_SOURCE "omap_32k_fck" |
67 | #define OMAP4_32K_SOURCE "sys_32k_ck" | 68 | #define OMAP4_32K_SOURCE "sys_32k_ck" |
@@ -487,7 +488,7 @@ static void __init realtime_counter_init(void) | |||
487 | pr_err("%s: ioremap failed\n", __func__); | 488 | pr_err("%s: ioremap failed\n", __func__); |
488 | return; | 489 | return; |
489 | } | 490 | } |
490 | sys_clk = clk_get(NULL, "sys_clkin_ck"); | 491 | sys_clk = clk_get(NULL, OMAP5_MPU_SOURCE); |
491 | if (IS_ERR(sys_clk)) { | 492 | if (IS_ERR(sys_clk)) { |
492 | pr_err("%s: failed to get system clock handle\n", __func__); | 493 | pr_err("%s: failed to get system clock handle\n", __func__); |
493 | iounmap(base); | 494 | iounmap(base); |
@@ -616,7 +617,7 @@ void __init omap4_local_timer_init(void) | |||
616 | 617 | ||
617 | #ifdef CONFIG_SOC_OMAP5 | 618 | #ifdef CONFIG_SOC_OMAP5 |
618 | OMAP_SYS_32K_TIMER_INIT(5, 1, OMAP4_32K_SOURCE, "ti,timer-alwon", | 619 | OMAP_SYS_32K_TIMER_INIT(5, 1, OMAP4_32K_SOURCE, "ti,timer-alwon", |
619 | 2, OMAP4_MPU_SOURCE); | 620 | 2, OMAP5_MPU_SOURCE); |
620 | void __init omap5_realtime_timer_init(void) | 621 | void __init omap5_realtime_timer_init(void) |
621 | { | 622 | { |
622 | int err; | 623 | int err; |