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>, Hans Ulli Kroll <ulli.kroll@googlemail.com>, linux-kernel@vger.kernel.org (open list), Russell King <linux@arm.linux.org.uk> Subject: [PATCH 05/18] ARM/gemini/time: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:40:59 +0530 [thread overview] Message-ID: <e2efda24804234c83e17172a2525641dd6b690bc.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 gemini 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. Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-gemini/time.c | 69 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/arch/arm/mach-gemini/time.c b/arch/arm/mach-gemini/time.c index 0a63c4d25b64..b57d367d21f1 100644 --- a/arch/arm/mach-gemini/time.c +++ b/arch/arm/mach-gemini/time.c @@ -59,49 +59,48 @@ static int gemini_timer_set_next_event(unsigned long cycles, return 0; } -static void gemini_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int gemini_timer_shutdown(struct clock_event_device *evt) +{ + u32 cr; + + /* + * Disable also for oneshot: the set_next() call will arm the timer + * instead. + */ + cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + cr &= ~TIMER_2_CR_ENABLE; + cr &= ~TIMER_2_CR_INT; + writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + return 0; +} + +static int gemini_timer_set_periodic(struct clock_event_device *evt) { u32 period = DIV_ROUND_CLOSEST(tick_rate, HZ); u32 cr; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - /* Start the timer */ - writel(period, - TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); - writel(period, - TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); - cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - cr |= TIMER_2_CR_ENABLE; - cr |= TIMER_2_CR_INT; - writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - break; - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - /* - * Disable also for oneshot: the set_next() call will - * arm the timer instead. - */ - cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - cr &= ~TIMER_2_CR_ENABLE; - cr &= ~TIMER_2_CR_INT; - writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - break; - default: - break; - } + /* Start the timer */ + writel(period, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); + writel(period, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); + cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + cr |= TIMER_2_CR_ENABLE; + cr |= TIMER_2_CR_INT; + writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + return 0; } /* Use TIMER2 as clock event */ static struct clock_event_device gemini_clockevent = { - .name = "TIMER2", - .rating = 300, /* Reasonably fast and accurate clock event */ - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_next_event = gemini_timer_set_next_event, - .set_mode = gemini_timer_set_mode, + .name = "TIMER2", + /* Reasonably fast and accurate clock event */ + .rating = 300, + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_next_event = gemini_timer_set_next_event, + .set_state_shutdown = gemini_timer_shutdown, + .set_state_periodic = gemini_timer_set_periodic, + .set_state_oneshot = gemini_timer_shutdown, + .tick_resume = gemini_timer_shutdown, }; /* -- 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 05/18] ARM/gemini/time: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:40:59 +0530 [thread overview] Message-ID: <e2efda24804234c83e17172a2525641dd6b690bc.1437101996.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1437101996.git.viresh.kumar@linaro.org> Migrate gemini 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. Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-gemini/time.c | 69 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/arch/arm/mach-gemini/time.c b/arch/arm/mach-gemini/time.c index 0a63c4d25b64..b57d367d21f1 100644 --- a/arch/arm/mach-gemini/time.c +++ b/arch/arm/mach-gemini/time.c @@ -59,49 +59,48 @@ static int gemini_timer_set_next_event(unsigned long cycles, return 0; } -static void gemini_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *evt) +static int gemini_timer_shutdown(struct clock_event_device *evt) +{ + u32 cr; + + /* + * Disable also for oneshot: the set_next() call will arm the timer + * instead. + */ + cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + cr &= ~TIMER_2_CR_ENABLE; + cr &= ~TIMER_2_CR_INT; + writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + return 0; +} + +static int gemini_timer_set_periodic(struct clock_event_device *evt) { u32 period = DIV_ROUND_CLOSEST(tick_rate, HZ); u32 cr; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - /* Start the timer */ - writel(period, - TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); - writel(period, - TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); - cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - cr |= TIMER_2_CR_ENABLE; - cr |= TIMER_2_CR_INT; - writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - break; - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - case CLOCK_EVT_MODE_RESUME: - /* - * Disable also for oneshot: the set_next() call will - * arm the timer instead. - */ - cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - cr &= ~TIMER_2_CR_ENABLE; - cr &= ~TIMER_2_CR_INT; - writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - break; - default: - break; - } + /* Start the timer */ + writel(period, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); + writel(period, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); + cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + cr |= TIMER_2_CR_ENABLE; + cr |= TIMER_2_CR_INT; + writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); + return 0; } /* Use TIMER2 as clock event */ static struct clock_event_device gemini_clockevent = { - .name = "TIMER2", - .rating = 300, /* Reasonably fast and accurate clock event */ - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_next_event = gemini_timer_set_next_event, - .set_mode = gemini_timer_set_mode, + .name = "TIMER2", + /* Reasonably fast and accurate clock event */ + .rating = 300, + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_next_event = gemini_timer_set_next_event, + .set_state_shutdown = gemini_timer_shutdown, + .set_state_periodic = gemini_timer_set_periodic, + .set_state_oneshot = gemini_timer_shutdown, + .tick_resume = gemini_timer_shutdown, }; /* -- 2.4.0
next prev parent reply other threads:[~2015-07-17 5:12 UTC|newest] Thread overview: 46+ 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 ` Viresh Kumar [this message] 2015-07-17 5:10 ` [PATCH 05/18] ARM/gemini/time: " 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 ` [PATCH 16/18] ARM/w90x900/time: " Viresh Kumar 2015-07-17 5:11 ` 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 05/18] ARM/gemini/time: Migrate to new 'set-state' interface Viresh Kumar 2015-07-06 19:36 ` Hans Ulli Kroll
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=e2efda24804234c83e17172a2525641dd6b690bc.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=olof@lixom.net \ --cc=ulli.kroll@googlemail.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: 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.