From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de
Cc: mingo@kernel.org, linux-kernel@vger.kernel.org,
Joel Stanley <joel@jms.id.au>
Subject: [PATCH 1/9] clocksource/drivers/moxart: Refactor enable/disable
Date: Mon, 12 Sep 2016 11:15:39 +0200 [thread overview]
Message-ID: <1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <b04803ca-5506-bf69-04df-f28efbc9a94a@linaro.org>
From: Joel Stanley <joel@jms.id.au>
This patch abstracts the enable and disable register writes into their
own functions in preparation for future changes to use SoC specific
values for the writes.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/moxart_timer.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
index 8414544..a3aaa56 100644
--- a/drivers/clocksource/moxart_timer.c
+++ b/drivers/clocksource/moxart_timer.c
@@ -58,15 +58,25 @@
static void __iomem *base;
static unsigned int clock_count_per_tick;
-static int moxart_shutdown(struct clock_event_device *evt)
+static inline void moxart_disable(struct clock_event_device *evt)
{
writel(TIMER1_DISABLE, base + TIMER_CR);
+}
+
+static inline void moxart_enable(struct clock_event_device *evt)
+{
+ writel(TIMER1_ENABLE, base + TIMER_CR);
+}
+
+static int moxart_shutdown(struct clock_event_device *evt)
+{
+ moxart_disable(evt);
return 0;
}
static int moxart_set_oneshot(struct clock_event_device *evt)
{
- writel(TIMER1_DISABLE, base + TIMER_CR);
+ moxart_disable(evt);
writel(~0, base + TIMER1_BASE + REG_LOAD);
return 0;
}
@@ -74,21 +84,21 @@ static int moxart_set_oneshot(struct clock_event_device *evt)
static int moxart_set_periodic(struct clock_event_device *evt)
{
writel(clock_count_per_tick, base + TIMER1_BASE + REG_LOAD);
- writel(TIMER1_ENABLE, base + TIMER_CR);
+ moxart_enable(evt);
return 0;
}
static int moxart_clkevt_next_event(unsigned long cycles,
- struct clock_event_device *unused)
+ struct clock_event_device *evt)
{
u32 u;
- writel(TIMER1_DISABLE, base + TIMER_CR);
+ moxart_disable(evt);
u = readl(base + TIMER1_BASE + REG_COUNT) - cycles;
writel(u, base + TIMER1_BASE + REG_MATCH1);
- writel(TIMER1_ENABLE, base + TIMER_CR);
+ moxart_enable(evt);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-09-12 9:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 9:10 [PULL] clockevents for 4.9 Daniel Lezcano
2016-09-12 9:15 ` Daniel Lezcano [this message]
2016-09-12 9:15 ` [PATCH 2/9] clocksource/drivers/moxart: Use struct to hold state Daniel Lezcano
2016-09-12 9:15 ` [PATCH 3/9] clocksource/drivers/moxart: Add Aspeed support Daniel Lezcano
2016-09-12 9:15 ` [PATCH 4/9] clocksource/drivers/moxart: Replace setup_irq by request_irq Daniel Lezcano
2016-09-12 9:15 ` [PATCH 5/9] clocksource/drivers/moxart: Replace panic by pr_err Daniel Lezcano
2016-09-12 9:15 ` [PATCH 6/9] clocksource/drivers/timer-atmel-pit: Drop at91sam926x_pit_common_init Daniel Lezcano
2016-09-12 9:15 ` [PATCH 7/9] clocksource/drivers/timer-atmel-pit: Remove uselesss WARN_ON_ONCE Daniel Lezcano
2016-09-12 9:15 ` [PATCH 8/9] clocksource/drivers/timer-atmel-pit: Simplify IRQ handler Daniel Lezcano
2016-09-12 9:15 ` [PATCH 9/9] clocksource/drivers/oxnas: Add OX820 compatible Daniel Lezcano
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=1473671747-9400-1-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=joel@jms.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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