From: viresh.kumar@linaro.org (Viresh Kumar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/18] ARM/ixp4xx/timer: Migrate to new 'set-state' interface
Date: Mon, 6 Jul 2015 16:24:14 +0530 [thread overview]
Message-ID: <33e74a50c268fb18e80116443f603d1c205f1c0c.1436178990.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1436178990.git.viresh.kumar@linaro.org>
Migrate ixp4xx driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.
This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.
NOTE: ixp4xx_set_{oneshot|periodic} don't perform read operation on
'IXP4XX_OSRT1' register anymore.
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
arch/arm/mach-ixp4xx/common.c | 68 +++++++++++++++++++++++++------------------
1 file changed, 40 insertions(+), 28 deletions(-)
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 8537d4c41e34..70773b948e7e 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -521,43 +521,55 @@ static int ixp4xx_set_next_event(unsigned long evt,
return 0;
}
-static void ixp4xx_set_mode(enum clock_event_mode mode,
- struct clock_event_device *evt)
+static int ixp4xx_shutdown(struct clock_event_device *evt)
{
unsigned long opts = *IXP4XX_OSRT1 & IXP4XX_OST_RELOAD_MASK;
unsigned long osrt = *IXP4XX_OSRT1 & ~IXP4XX_OST_RELOAD_MASK;
- switch (mode) {
- case CLOCK_EVT_MODE_PERIODIC:
- osrt = IXP4XX_LATCH & ~IXP4XX_OST_RELOAD_MASK;
- opts = IXP4XX_OST_ENABLE;
- break;
- case CLOCK_EVT_MODE_ONESHOT:
- /* period set by 'set next_event' */
- osrt = 0;
- opts = IXP4XX_OST_ENABLE | IXP4XX_OST_ONE_SHOT;
- break;
- case CLOCK_EVT_MODE_SHUTDOWN:
- opts &= ~IXP4XX_OST_ENABLE;
- break;
- case CLOCK_EVT_MODE_RESUME:
- opts |= IXP4XX_OST_ENABLE;
- break;
- case CLOCK_EVT_MODE_UNUSED:
- default:
- osrt = opts = 0;
- break;
- }
+ opts &= ~IXP4XX_OST_ENABLE;
+ *IXP4XX_OSRT1 = osrt | opts;
+ return 0;
+}
+static int ixp4xx_set_oneshot(struct clock_event_device *evt)
+{
+ unsigned long opts = IXP4XX_OST_ENABLE | IXP4XX_OST_ONE_SHOT;
+ unsigned long osrt = 0;
+
+ /* period set by 'set next_event' */
*IXP4XX_OSRT1 = osrt | opts;
+ return 0;
+}
+
+static int ixp4xx_set_periodic(struct clock_event_device *evt)
+{
+ unsigned long opts = IXP4XX_OST_ENABLE;
+ unsigned long osrt = IXP4XX_LATCH & ~IXP4XX_OST_RELOAD_MASK;
+
+ *IXP4XX_OSRT1 = osrt | opts;
+ return 0;
+}
+
+static int ixp4xx_resume(struct clock_event_device *evt)
+{
+ unsigned long opts = *IXP4XX_OSRT1 & IXP4XX_OST_RELOAD_MASK;
+ unsigned long osrt = *IXP4XX_OSRT1 & ~IXP4XX_OST_RELOAD_MASK;
+
+ opts |= IXP4XX_OST_ENABLE;
+ *IXP4XX_OSRT1 = osrt | opts;
+ return 0;
}
static struct clock_event_device clockevent_ixp4xx = {
- .name = "ixp4xx timer1",
- .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
- .rating = 200,
- .set_mode = ixp4xx_set_mode,
- .set_next_event = ixp4xx_set_next_event,
+ .name = "ixp4xx timer1",
+ .features = CLOCK_EVT_FEAT_PERIODIC |
+ CLOCK_EVT_FEAT_ONESHOT,
+ .rating = 200,
+ .set_state_shutdown = ixp4xx_shutdown,
+ .set_state_periodic = ixp4xx_set_periodic,
+ .set_state_oneshot = ixp4xx_set_oneshot,
+ .tick_resume = ixp4xx_resume,
+ .set_next_event = ixp4xx_set_next_event,
};
static void __init ixp4xx_clockevent_init(void)
--
2.4.0
next prev parent reply other threads:[~2015-07-06 10:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-06 10:54 [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Viresh Kumar
2015-07-06 10:54 ` [PATCH 01/18] ARM/smp_twd: Migrate to new 'set-state' interface Viresh Kumar
2015-07-06 10:54 ` [PATCH 02/18] ARM/cns3xxx/timer: " Viresh Kumar
2015-07-14 6:03 ` Krzysztof Hałasa
2015-07-06 10:54 ` [PATCH 03/18] ARM/davinci/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 04/18] ARM/dc21285-timer: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 05/18] ARM/gemini/time: " Viresh Kumar
2015-07-06 19:36 ` Hans Ulli Kroll
2015-07-06 10:54 ` [PATCH 06/18] ARM/imx/epit: " Viresh Kumar
2015-07-06 10:54 ` Viresh Kumar [this message]
2015-07-14 6:04 ` [PATCH 07/18] ARM/ixp4xx/timer: " Krzysztof Hałasa
2015-07-06 10:54 ` [PATCH 08/18] ARM/ks8695/time: " Viresh Kumar
2015-07-07 12:22 ` Greg Ungerer
2015-07-06 10:54 ` [PATCH 09/18] ARM/lpc32xx/timer: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 10/18] ARM/mmp/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 11/18] ARM/netx/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 12/18] ARM/omap1/time: " Viresh Kumar
2015-07-06 15:20 ` santosh shilimkar
2015-07-09 9:48 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 13/18] ARM/omap1/timer32: " Viresh Kumar
2015-07-06 15:21 ` santosh shilimkar
2015-07-09 9:49 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 14/18] ARM/omap2/timer: " Viresh Kumar
2015-07-06 15:20 ` santosh shilimkar
2015-07-09 9:50 ` Tony Lindgren
2015-07-06 10:54 ` [PATCH 15/18] ARM/SPEAr/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 16/18] ARM/w90x900/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 17/18] ARM/iop/time: " Viresh Kumar
2015-07-06 10:54 ` [PATCH 18/18] ARM/orion/time: " Viresh Kumar
2015-07-06 17:26 ` [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Thomas Gleixner
2015-07-07 8:11 ` [PULL] clockevents: last minute patch for 4.2-rc2 Daniel Lezcano
2015-07-07 8:14 ` [PATCH] clockevents: Allow set-state callbacks to be optional Daniel Lezcano
2015-07-07 8:49 ` [tip:timers/urgent] " tip-bot for Viresh Kumar
2015-07-13 2:52 ` [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Viresh Kumar
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 5:10 [PULL] ARM: clockevents: Migrate to 'set-state' callbacks Viresh Kumar
2015-07-17 5:11 ` [PATCH 07/18] ARM/ixp4xx/timer: Migrate to new 'set-state' interface Viresh Kumar
2015-07-17 5:11 ` Viresh Kumar
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=33e74a50c268fb18e80116443f603d1c205f1c0c.1436178990.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--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 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.