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>, "Krzysztof Hałasa" <khalasa@piap.pl>, linux-kernel@vger.kernel.org (open list), "Russell King" <linux@arm.linux.org.uk> Subject: [PATCH 02/18] ARM/cns3xxx/timer: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:40:56 +0530 [thread overview] Message-ID: <9bdc2e0c9a45b2b5f4de9927562305475ecb9b55.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 cns3xxx 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: We don't read TIMER1_2_CONTROL_OFFSET register on shutdown anymore. Acked-by: Krzysztof Hałasa <khalasa@piap.pl> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-cns3xxx/core.c | 55 +++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 4e9837ded96d..11f9644f8f41 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -113,30 +113,33 @@ void cns3xxx_power_off(void) */ static void __iomem *cns3xxx_tmr1; -static void cns3xxx_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int cns3xxx_shutdown(struct clock_event_device *clk) +{ + writel(0, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; +} + +static int cns3xxx_set_oneshot(struct clock_event_device *clk) +{ + unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + + /* period set, and timer enabled in 'next_event' hook */ + ctrl |= (1 << 2) | (1 << 9); + writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; +} + +static int cns3xxx_set_periodic(struct clock_event_device *clk) { unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); int pclk = cns3xxx_cpu_clock() / 8; int reload; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - reload = pclk * 20 / (3 * HZ) * 0x25000; - writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); - ctrl |= (1 << 0) | (1 << 2) | (1 << 9); - break; - case CLOCK_EVT_MODE_ONESHOT: - /* period set, and timer enabled in 'next_event' hook */ - ctrl |= (1 << 2) | (1 << 9); - break; - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - default: - ctrl = 0; - } - + reload = pclk * 20 / (3 * HZ) * 0x25000; + writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); + ctrl |= (1 << 0) | (1 << 2) | (1 << 9); writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; } static int cns3xxx_timer_set_next_event(unsigned long evt, @@ -151,12 +154,16 @@ static int cns3xxx_timer_set_next_event(unsigned long evt, } static struct clock_event_device cns3xxx_tmr1_clockevent = { - .name = "cns3xxx timer1", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = cns3xxx_timer_set_mode, - .set_next_event = cns3xxx_timer_set_next_event, - .rating = 350, - .cpumask = cpu_all_mask, + .name = "cns3xxx timer1", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = cns3xxx_shutdown, + .set_state_periodic = cns3xxx_set_periodic, + .set_state_oneshot = cns3xxx_set_oneshot, + .tick_resume = cns3xxx_shutdown, + .set_next_event = cns3xxx_timer_set_next_event, + .rating = 350, + .cpumask = cpu_all_mask, }; static void __init cns3xxx_clockevents_init(unsigned int timer_irq) -- 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 02/18] ARM/cns3xxx/timer: Migrate to new 'set-state' interface Date: Fri, 17 Jul 2015 10:40:56 +0530 [thread overview] Message-ID: <9bdc2e0c9a45b2b5f4de9927562305475ecb9b55.1437101996.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1437101996.git.viresh.kumar@linaro.org> Migrate cns3xxx 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: We don't read TIMER1_2_CONTROL_OFFSET register on shutdown anymore. Acked-by: Krzysztof Ha?asa <khalasa@piap.pl> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- arch/arm/mach-cns3xxx/core.c | 55 +++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 4e9837ded96d..11f9644f8f41 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -113,30 +113,33 @@ void cns3xxx_power_off(void) */ static void __iomem *cns3xxx_tmr1; -static void cns3xxx_timer_set_mode(enum clock_event_mode mode, - struct clock_event_device *clk) +static int cns3xxx_shutdown(struct clock_event_device *clk) +{ + writel(0, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; +} + +static int cns3xxx_set_oneshot(struct clock_event_device *clk) +{ + unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + + /* period set, and timer enabled in 'next_event' hook */ + ctrl |= (1 << 2) | (1 << 9); + writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; +} + +static int cns3xxx_set_periodic(struct clock_event_device *clk) { unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); int pclk = cns3xxx_cpu_clock() / 8; int reload; - switch (mode) { - case CLOCK_EVT_MODE_PERIODIC: - reload = pclk * 20 / (3 * HZ) * 0x25000; - writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); - ctrl |= (1 << 0) | (1 << 2) | (1 << 9); - break; - case CLOCK_EVT_MODE_ONESHOT: - /* period set, and timer enabled in 'next_event' hook */ - ctrl |= (1 << 2) | (1 << 9); - break; - case CLOCK_EVT_MODE_UNUSED: - case CLOCK_EVT_MODE_SHUTDOWN: - default: - ctrl = 0; - } - + reload = pclk * 20 / (3 * HZ) * 0x25000; + writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); + ctrl |= (1 << 0) | (1 << 2) | (1 << 9); writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); + return 0; } static int cns3xxx_timer_set_next_event(unsigned long evt, @@ -151,12 +154,16 @@ static int cns3xxx_timer_set_next_event(unsigned long evt, } static struct clock_event_device cns3xxx_tmr1_clockevent = { - .name = "cns3xxx timer1", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .set_mode = cns3xxx_timer_set_mode, - .set_next_event = cns3xxx_timer_set_next_event, - .rating = 350, - .cpumask = cpu_all_mask, + .name = "cns3xxx timer1", + .features = CLOCK_EVT_FEAT_PERIODIC | + CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = cns3xxx_shutdown, + .set_state_periodic = cns3xxx_set_periodic, + .set_state_oneshot = cns3xxx_set_oneshot, + .tick_resume = cns3xxx_shutdown, + .set_next_event = cns3xxx_timer_set_next_event, + .rating = 350, + .cpumask = cpu_all_mask, }; static void __init cns3xxx_clockevents_init(unsigned int timer_irq) -- 2.4.0
next prev parent reply other threads:[~2015-07-17 5:11 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 ` Viresh Kumar [this message] 2015-07-17 5:10 ` [PATCH 02/18] ARM/cns3xxx/timer: " 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 ` [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 02/18] ARM/cns3xxx/timer: Migrate to new 'set-state' interface Viresh Kumar 2015-07-14 6:03 ` Krzysztof Hałasa
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=9bdc2e0c9a45b2b5f4de9927562305475ecb9b55.1437101996.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=arm@kernel.org \ --cc=arnd.bergmann@linaro.org \ --cc=khalasa@piap.pl \ --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 \ /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.