linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, tony@atomide.com,
	Santosh Shilimkar <santosh.shilimkar@ti.com>
Subject: [PATCH 2/5] ARM: OMAP2+: timer: Update the OMAP5 clocksource name as per clock data
Date: Fri, 18 Jan 2013 21:02:18 +0530	[thread overview]
Message-ID: <1358523141-12295-3-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1358523141-12295-1-git-send-email-santosh.shilimkar@ti.com>

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(-)

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 691aa67..a0a1b14 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"
@@ -498,7 +499,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);
@@ -638,7 +639,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;
-- 
1.7.9.5


  parent reply	other threads:[~2013-01-18 15:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-18 15:32 [PATCH 0/5] ARM: OMAP5: Misc fixes Santosh Shilimkar
2013-01-18 15:32 ` [PATCH 1/5] ARM: OMAP5: Update SOC id detection code for ES2 Santosh Shilimkar
2013-01-18 15:32 ` Santosh Shilimkar [this message]
2013-01-30 17:42   ` [PATCH 2/5] ARM: OMAP2+: timer: Update the OMAP5 clocksource name as per clock data Jon Hunter
2013-01-18 15:32 ` [PATCH 3/5] ARM: OMAP: prm: Allow prm init to success on OMAP5 SOCs Santosh Shilimkar
2013-01-18 15:32 ` [PATCH 4/5] ARM: dts: omap5-evm: Update available memory to 2032 MB Santosh Shilimkar
2013-01-18 15:32 ` [PATCH 5/5] ARM: dts: OMAP5: Specify nonsecure PPI IRQ for arch timer Santosh Shilimkar
2013-01-18 16:02   ` Marc Zyngier
2013-01-18 17:00     ` Santosh Shilimkar
2013-01-18 17:08       ` Marc Zyngier
2013-01-18 18:51         ` Santosh Shilimkar
2013-01-19 14:46           ` Marc Zyngier
2013-01-19 17:26             ` Santosh Shilimkar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358523141-12295-3-git-send-email-santosh.shilimkar@ti.com \
    --to=santosh.shilimkar@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).