From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC/PATCH-v4.2-rc6 4/5] arm: omap2: timer: simplify omap4_local_timer_init()
Date: Mon, 10 Aug 2015 16:41:50 -0500 [thread overview]
Message-ID: <1439242911-715-5-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1439242911-715-1-git-send-email-balbi@ti.com>
all users of omap4_local_timer_init() are already
DT-only, so we can remove the check for having
DTB or not.
While at that, fix a typo in comment.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/mach-omap2/timer.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index cac46d852da1..88d39f98e7ff 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -649,23 +649,15 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
#ifdef CONFIG_ARCH_OMAP4
#ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
void __init omap4_local_timer_init(void)
{
omap4_sync32k_timer_init();
- /* Local timers are not supprted on OMAP4430 ES1.0 */
- if (omap_rev() != OMAP4430_REV_ES1_0) {
- int err;
- if (of_have_populated_dt()) {
- clocksource_of_init();
- return;
- }
+ /* Local timers are not supported on OMAP4430 ES1.0 */
+ if (omap_rev() == OMAP4430_REV_ES1_0)
+ return;
- err = twd_local_timer_register(&twd_local_timer);
- if (err)
- pr_err("twd_local_timer_register failed %d\n", err);
- }
+ clocksource_of_init();
}
#else
void __init omap4_local_timer_init(void)
--
2.5.0
next prev parent reply other threads:[~2015-08-10 21:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 21:41 [RFC/PATCH-v4.2-rc6 0/5] arm: am437x: use TWD/Global timers Felipe Balbi
2015-08-10 21:41 ` [RFC/PATCH-v4.2-rc6 1/5] Revert "ARM: 7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp" Felipe Balbi
2015-08-12 7:15 ` Tony Lindgren
2015-08-10 21:41 ` [RFC/PATCH-v4.2-rc6 2/5] arm: boot: dts: am4372: add ARM timers and SCU nodes Felipe Balbi
2015-08-12 7:28 ` Tony Lindgren
2015-08-12 14:52 ` Felipe Balbi
2015-08-12 19:54 ` Felipe Balbi
2015-08-10 21:41 ` [RFC/PATCH-v4.2-rc6 3/5] arm: omap2: Kconfig: select TWD and global timer on AM43xx devices Felipe Balbi
2015-08-10 21:41 ` Felipe Balbi [this message]
2015-08-12 7:14 ` [RFC/PATCH-v4.2-rc6 4/5] arm: omap2: timer: simplify omap4_local_timer_init() Tony Lindgren
2015-08-12 14:53 ` Felipe Balbi
2015-08-10 21:41 ` [RFC/PATCH-v4.2-rc6 5/5] arm: omap2: board-generic: use omap4_local_timer_init for AM437x Felipe Balbi
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=1439242911-715-5-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).