From: Viresh Kumar <viresh.kumar@linaro.org> To: arm@kernel.org, olof@lixom.net Cc: linaro-kernel@lists.linaro.org, arnd.bergmann@linaro.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar <viresh.kumar@linaro.org>, Wan ZongShun <mcuos.com@gmail.com>, linux-kernel@vger.kernel.org (open list), Russell King <linux@arm.linux.org.uk> Subject: [PATCH 16/18] ARM/w90x900/time: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:41:10 +0530 [thread overview] Message-ID: <6c724d4388997588f38587213ce1ab7d3925b87c.1437101996.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1437101996.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1437101996.git.viresh.kumar@linaro.org> Migrate w90x900 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. Cc: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-w90x900/time.c | 51 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c index 9230d3725599..cd1966ec9143 100644 --- a/arch/arm/mach-w90x900/time.c +++ b/arch/arm/mach-w90x900/time.c @@ -48,31 +48,32 @@ static unsigned int timer0_load; -static void nuc900_clockevent_setmode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int nuc900_clockevent_shutdown(struct clock_event_device *evt) { - unsigned int val; + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - val = __raw_readl(REG_TCSR0); - val &= ~(0x03 << 27); + __raw_writel(val, REG_TCSR0); + return 0; +} + +static int nuc900_clockevent_set_oneshot(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - __raw_writel(timer0_load, REG_TICR0); - val |= (PERIOD | COUNTEN | INTEN | PRESCALE); - break; + val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - case CLOCK_EVT_MODE_ONESHOT: - val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - break; + __raw_writel(val, REG_TCSR0); + return 0; +} - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - break; - } +static int nuc900_clockevent_set_periodic(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); + __raw_writel(timer0_load, REG_TICR0); + val |= (PERIOD | COUNTEN | INTEN | PRESCALE); __raw_writel(val, REG_TCSR0); + return 0; } static int nuc900_clockevent_setnextevent(unsigned long evt, @@ -90,11 +91,15 @@ static int nuc900_clockevent_setnextevent(unsigned long evt, } static struct clock_event_device nuc900_clockevent_device = { - .name = "nuc900-timer0", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = nuc900_clockevent_setmode, - .set_next_event = nuc900_clockevent_setnextevent, - .rating = 300, + .name = "nuc900-timer0", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = nuc900_clockevent_shutdown, + .set_state_periodic = nuc900_clockevent_set_periodic, + .set_state_oneshot = nuc900_clockevent_set_oneshot, + .tick_resume = nuc900_clockevent_shutdown, + .set_next_event = nuc900_clockevent_setnextevent, + .rating = 300, }; /*IRQ handler for the timer*/ -- 2.4.0
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@linaro.org (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 16/18] ARM/w90x900/time: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:41:10 +0530 [thread overview] Message-ID: <6c724d4388997588f38587213ce1ab7d3925b87c.1437101996.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1437101996.git.viresh.kumar@linaro.org> Migrate w90x900 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. Cc: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-w90x900/time.c | 51 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c index 9230d3725599..cd1966ec9143 100644 --- a/arch/arm/mach-w90x900/time.c +++ b/arch/arm/mach-w90x900/time.c @@ -48,31 +48,32 @@ static unsigned int timer0_load; -static void nuc900_clockevent_setmode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int nuc900_clockevent_shutdown(struct clock_event_device *evt) { - unsigned int val; + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - val = __raw_readl(REG_TCSR0); - val &= ~(0x03 << 27); + __raw_writel(val, REG_TCSR0); + return 0; +} + +static int nuc900_clockevent_set_oneshot(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - __raw_writel(timer0_load, REG_TICR0); - val |= (PERIOD | COUNTEN | INTEN | PRESCALE); - break; + val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - case CLOCK_EVT_MODE_ONESHOT: - val |= (ONESHOT | COUNTEN | INTEN | PRESCALE); - break; + __raw_writel(val, REG_TCSR0); + return 0; +} - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - break; - } +static int nuc900_clockevent_set_periodic(struct clock_event_device *evt) +{ + unsigned int val = __raw_readl(REG_TCSR0) & ~(0x03 << 27); + __raw_writel(timer0_load, REG_TICR0); + val |= (PERIOD | COUNTEN | INTEN | PRESCALE); __raw_writel(val, REG_TCSR0); + return 0; } static int nuc900_clockevent_setnextevent(unsigned long evt, @@ -90,11 +91,15 @@ static int nuc900_clockevent_setnextevent(unsigned long evt, } static struct clock_event_device nuc900_clockevent_device = { - .name = "nuc900-timer0", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = nuc900_clockevent_setmode, - .set_next_event = nuc900_clockevent_setnextevent, - .rating = 300, + .name = "nuc900-timer0", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = nuc900_clockevent_shutdown, + .set_state_periodic = nuc900_clockevent_set_periodic, + .set_state_oneshot = nuc900_clockevent_set_oneshot, + .tick_resume = nuc900_clockevent_shutdown, + .set_next_event = nuc900_clockevent_setnextevent, + .rating = 300, }; /*IRQ handler for the timer*/ -- 2.4.0
next prev parent reply other threads:[~2015-07-17 5:12 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-17 5:10 [PULL] ARM: clockevents: Migrate to 'set-state' callbacks Viresh Kumar 2015-07-17 5:10 ` [PATCH 01/18] ARM/smp_twd: Migrate to new 'set-state' interface Viresh Kumar 2015-07-17 5:10 ` Viresh Kumar 2015-07-17 5:10 ` [PATCH 02/18] ARM/cns3xxx/timer: " Viresh Kumar 2015-07-17 5:10 ` Viresh Kumar 2015-07-17 5:10 ` [PATCH 03/18] ARM/davinci/time: " Viresh Kumar 2015-07-17 5:10 ` Viresh Kumar 2015-07-17 5:10 ` [PATCH 04/18] ARM/dc21285-timer: " Viresh Kumar 2015-07-17 5:10 ` Viresh Kumar 2015-07-17 5:10 ` [PATCH 05/18] ARM/gemini/time: " Viresh Kumar 2015-07-17 5:10 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 06/18] ARM/imx/epit: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 07/18] ARM/ixp4xx/timer: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 08/18] ARM/ks8695/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 09/18] ARM/lpc32xx/timer: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 10/18] ARM/mmp/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 11/18] ARM/netx/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 12/18] ARM/omap1/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 13/18] ARM/omap1/timer32: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 14/18] ARM/omap2/timer: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 15/18] ARM/SPEAr/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar [this message] 2015-07-17 5:11 ` [PATCH 16/18] ARM/w90x900/time: " Viresh Kumar 2015-07-24 4:53 ` Wan ZongShun 2015-07-24 4:53 ` Wan ZongShun 2015-07-17 5:11 ` [PATCH 17/18] ARM/iop/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 5:11 ` [PATCH 18/18] ARM/orion/time: " Viresh Kumar 2015-07-17 5:11 ` Viresh Kumar 2015-07-17 16:59 ` [PULL] ARM: clockevents: Migrate to 'set-state' callbacks Olof Johansson 2015-07-18 4:29 ` Viresh Kumar -- strict thread matches above, loose matches on Subject: below -- 2015-07-06 10:54 [PATCH 00/18] ARM: Migrate clockevent drivers to 'set-state' Viresh Kumar 2015-07-06 10:54 ` [PATCH 16/18] ARM/w90x900/time: Migrate to new 'set-state' interface 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=6c724d4388997588f38587213ce1ab7d3925b87c.1437101996.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=arm@kernel.org \ --cc=arnd.bergmann@linaro.org \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=mcuos.com@gmail.com \ --cc=olof@lixom.net \ /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: linkBe 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.