diff mbox

[2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data

Message ID 1361374034-21831-3-git-send-email-santosh.shilimkar@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Santosh Shilimkar Feb. 20, 2013, 3:27 p.m. UTC 
OMAP5 clockdata has different sys clock clock node name. Fix the timer code
to take care of it.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
 arch/arm/mach-omap2/timer.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov Feb. 21, 2013, 12:52 p.m. UTC | #1 
Hello.

On 20-02-2013 19:27, Santosh Shilimkar wrote:

> OMAP5 clockdata has different sys clock clock node name. Fix the timer code

    One "clock" too many. :-)

> to take care of it.

> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

WBR, Sergei
Santosh Shilimkar Feb. 21, 2013, 12:57 p.m. UTC | #2 
On Thursday 21 February 2013 06:22 PM, Sergei Shtylyov wrote:
> Hello.
>
> On 20-02-2013 19:27, Santosh Shilimkar wrote:
>
>> OMAP5 clockdata has different sys clock clock node name. Fix the timer
>> code
>
>     One "clock" too many. :-)
>
Indeed. Will fix that.

Regards
Santosh
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b8ad6e6..3c29450 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -62,6 +62,7 @@ 
 #define OMAP2_MPU_SOURCE	"sys_ck"
 #define OMAP3_MPU_SOURCE	OMAP2_MPU_SOURCE
 #define OMAP4_MPU_SOURCE	"sys_clkin_ck"
+#define OMAP5_MPU_SOURCE	"sys_clkin"
 #define OMAP2_32K_SOURCE	"func_32k_ck"
 #define OMAP3_32K_SOURCE	"omap_32k_fck"
 #define OMAP4_32K_SOURCE	"sys_32k_ck"
@@ -494,7 +495,7 @@  static void __init realtime_counter_init(void)
 		pr_err("%s: ioremap failed\n", __func__);
 		return;
 	}
-	sys_clk = clk_get(NULL, "sys_clkin_ck");
+	sys_clk = clk_get(NULL, OMAP5_MPU_SOURCE);
 	if (IS_ERR(sys_clk)) {
 		pr_err("%s: failed to get system clock handle\n", __func__);
 		iounmap(base);
@@ -634,7 +635,7 @@  OMAP_SYS_TIMER(4, local);
 
 #ifdef CONFIG_SOC_OMAP5
 OMAP_SYS_32K_TIMER_INIT(5, 1, OMAP4_32K_SOURCE, "ti,timer-alwon",
-			2, OMAP4_MPU_SOURCE);
+			2, OMAP5_MPU_SOURCE);
 static void __init omap5_realtime_timer_init(void)
 {
 	int err;