From: Santosh Shilimkar <santosh.shilimkar@ti.com>
To: linux-omap@vger.kernel.org
Cc: tony@atomide.com, linux-arm-kernel@lists.infradead.org,
Santosh Shilimkar <santosh.shilimkar@ti.com>
Subject: [PATCH 2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data
Date: Wed, 20 Feb 2013 20:57:08 +0530 [thread overview]
Message-ID: <1361374034-21831-3-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-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 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;
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data
Date: Wed, 20 Feb 2013 20:57:08 +0530 [thread overview]
Message-ID: <1361374034-21831-3-git-send-email-santosh.shilimkar@ti.com> (raw)
In-Reply-To: <1361374034-21831-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 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;
--
1.7.9.5
next prev parent reply other threads:[~2013-02-20 15:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 15:27 [PATCH 0/8] ARM: OMAP5: Few updates discovered with es2.0 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 1/8] ARM: OMAP5: Update SOC id detection code for ES2 Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 15:29 ` Felipe Balbi
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:03 ` Santosh Shilimkar
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:27 ` Felipe Balbi
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:31 ` Santosh Shilimkar
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 16:32 ` Felipe Balbi
2013-02-20 15:27 ` Santosh Shilimkar [this message]
2013-02-20 15:27 ` [PATCH 2/8] ARM: OMAP5: timer: Update the clocksource name as per clock data Santosh Shilimkar
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:52 ` Sergei Shtylyov
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-21 12:57 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 3/8] ARM: OMAP5: prm: Allow prm init to success on OMAP5 SOCs Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:30 ` Felipe Balbi
2013-02-20 15:30 ` Felipe Balbi
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-21 12:50 ` Sergei Shtylyov
2013-02-20 15:27 ` [PATCH 4/8] ARM: OMAP5: Reuse prm read_inst/write_inst Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 5/8] ARM: OMAP5: Update SAR RAM base address Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 6/8] ARM: OMAP5: Update SAR memory layout for WakeupGen Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 7/8] ARM: OMAP5: Make errata i688 workaround available Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-02-20 15:27 ` [PATCH 8/8] ARM: OMAP5: clock: No Freqsel on OMAP5 devices Santosh Shilimkar
2013-02-20 15:27 ` Santosh Shilimkar
2013-03-15 8:39 ` Santosh Shilimkar
2013-03-15 8:39 ` 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=1361374034-21831-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.