From: Viresh Kumar <viresh.kumar@linaro.org> To: Thomas Gleixner <tglx@linutronix.de>, Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar <viresh.kumar@linaro.org>, Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Gregory Clement <gregory.clement@free-electrons.com>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Subject: [PATCH 26/41] clocksource: time-armada-370-xp: Migrate to new 'set-state' interface Date: Thu, 18 Jun 2015 16:24:40 +0530 [thread overview] Message-ID: <632796e451d257f8bd5f90f779e866870be02db2.1434622147.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> Migrate time-armada-370-xp 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: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/clocksource/time-armada-370-xp.c | 53 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 0c8c5e337540..2162796fd504 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -121,33 +121,33 @@ armada_370_xp_clkevt_next_event(unsigned long delta, return 0; } -static void -armada_370_xp_clkevt_mode(enum clock_event_mode mode, - struct clock_event_device *dev) +static int armada_370_xp_clkevt_shutdown(struct clock_event_device *evt) { - if (mode == CLOCK_EVT_MODE_PERIODIC) { + /* + * Disable timer. + */ + local_timer_ctrl_clrset(TIMER0_EN, 0); - /* - * Setup timer to fire at 1/HZ intervals. - */ - writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF); - writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF); + /* + * ACK pending timer interrupt. + */ + writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS); + return 0; +} - /* - * Enable timer. - */ - local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask); - } else { - /* - * Disable timer. - */ - local_timer_ctrl_clrset(TIMER0_EN, 0); +static int armada_370_xp_clkevt_set_periodic(struct clock_event_device *evt) +{ + /* + * Setup timer to fire at 1/HZ intervals. + */ + writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF); + writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF); - /* - * ACK pending timer interrupt. - */ - writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS); - } + /* + * Enable timer. + */ + local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask); + return 0; } static int armada_370_xp_clkevt_irq; @@ -185,7 +185,10 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt) evt->shift = 32, evt->rating = 300, evt->set_next_event = armada_370_xp_clkevt_next_event, - evt->set_mode = armada_370_xp_clkevt_mode, + evt->set_state_shutdown = armada_370_xp_clkevt_shutdown; + evt->set_state_periodic = armada_370_xp_clkevt_set_periodic; + evt->set_state_oneshot = armada_370_xp_clkevt_shutdown; + evt->tick_resume = armada_370_xp_clkevt_shutdown; evt->irq = armada_370_xp_clkevt_irq; evt->cpumask = cpumask_of(cpu); @@ -197,7 +200,7 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt) static void armada_370_xp_timer_stop(struct clock_event_device *evt) { - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + evt->set_state_shutdown(evt); disable_percpu_irq(evt->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 26/41] clocksource: time-armada-370-xp: Migrate to new 'set-state' interface Date: Thu, 18 Jun 2015 16:24:40 +0530 [thread overview] Message-ID: <632796e451d257f8bd5f90f779e866870be02db2.1434622147.git.viresh.kumar@linaro.org> (raw) In-Reply-To: <cover.1434622147.git.viresh.kumar@linaro.org> Migrate time-armada-370-xp 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: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/clocksource/time-armada-370-xp.c | 53 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 0c8c5e337540..2162796fd504 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -121,33 +121,33 @@ armada_370_xp_clkevt_next_event(unsigned long delta, return 0; } -static void -armada_370_xp_clkevt_mode(enum clock_event_mode mode, - struct clock_event_device *dev) +static int armada_370_xp_clkevt_shutdown(struct clock_event_device *evt) { - if (mode == CLOCK_EVT_MODE_PERIODIC) { + /* + * Disable timer. + */ + local_timer_ctrl_clrset(TIMER0_EN, 0); - /* - * Setup timer to fire at 1/HZ intervals. - */ - writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF); - writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF); + /* + * ACK pending timer interrupt. + */ + writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS); + return 0; +} - /* - * Enable timer. - */ - local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask); - } else { - /* - * Disable timer. - */ - local_timer_ctrl_clrset(TIMER0_EN, 0); +static int armada_370_xp_clkevt_set_periodic(struct clock_event_device *evt) +{ + /* + * Setup timer to fire at 1/HZ intervals. + */ + writel(ticks_per_jiffy - 1, local_base + TIMER0_RELOAD_OFF); + writel(ticks_per_jiffy - 1, local_base + TIMER0_VAL_OFF); - /* - * ACK pending timer interrupt. - */ - writel(TIMER0_CLR_MASK, local_base + LCL_TIMER_EVENTS_STATUS); - } + /* + * Enable timer. + */ + local_timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask); + return 0; } static int armada_370_xp_clkevt_irq; @@ -185,7 +185,10 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt) evt->shift = 32, evt->rating = 300, evt->set_next_event = armada_370_xp_clkevt_next_event, - evt->set_mode = armada_370_xp_clkevt_mode, + evt->set_state_shutdown = armada_370_xp_clkevt_shutdown; + evt->set_state_periodic = armada_370_xp_clkevt_set_periodic; + evt->set_state_oneshot = armada_370_xp_clkevt_shutdown; + evt->tick_resume = armada_370_xp_clkevt_shutdown; evt->irq = armada_370_xp_clkevt_irq; evt->cpumask = cpumask_of(cpu); @@ -197,7 +200,7 @@ static int armada_370_xp_timer_setup(struct clock_event_device *evt) static void armada_370_xp_timer_stop(struct clock_event_device *evt) { - evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt); + evt->set_state_shutdown(evt); disable_percpu_irq(evt->irq); } -- 2.4.0
next prev parent reply other threads:[~2015-06-18 11:02 UTC|newest] Thread overview: 171+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <cover.1434622147.git.viresh.kumar@linaro.org> 2015-06-18 10:54 ` [PATCH 01/41] clocksource: asm9260: Migrate to new 'set-state' interface Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-30 8:25 ` Daniel Lezcano 2015-06-30 8:25 ` Daniel Lezcano 2015-06-30 9:00 ` Viresh Kumar 2015-06-30 9:00 ` Viresh Kumar 2015-06-30 9:20 ` Daniel Lezcano 2015-06-30 9:20 ` Daniel Lezcano 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:37 ` Vineet Gupta 2015-07-08 5:43 ` Viresh Kumar 2015-07-08 5:43 ` Viresh Kumar 2015-07-08 6:14 ` Vineet Gupta 2015-07-08 6:14 ` Vineet Gupta 2015-06-18 10:54 ` [PATCH 02/41] clocksource: cadence_ttc: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-25 23:15 ` Sören Brinkmann 2015-06-25 23:15 ` Sören Brinkmann 2015-06-30 8:28 ` Daniel Lezcano 2015-06-30 8:28 ` Daniel Lezcano 2015-06-18 10:54 ` [PATCH 03/41] clocksource: clps711x: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 04/41] clocksource: dummy_timer: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 05/41] clocksource: dw_apb: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 06/41] clocksource: exynos_mct: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 16:38 ` Alexey Klimov 2015-06-18 16:38 ` Alexey Klimov 2015-06-19 2:14 ` Viresh Kumar 2015-06-19 2:14 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 07/41] clocksource: fsl_ftm: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 08/41] clocksource: i8253: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 09/41] clocksource: meson6: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-20 6:53 ` Carlo Caione 2015-06-20 6:53 ` Carlo Caione 2015-06-18 10:54 ` [PATCH 10/41] clocksource: metag_generic: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 11/41] clocksource: mips-gic: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 12/41] clocksource: moxart: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 13/41] clocksource: mtk: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 14/41] clocksource: mxs: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-17 5:28 ` Stefan Wahren 2015-07-17 5:28 ` Stefan Wahren 2015-06-18 10:54 ` [PATCH 15/41] clocksource: nomadik-mtu: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 11:11 ` Linus Walleij 2015-07-14 11:11 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 16/41] clocksource: pxa: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-04 15:42 ` Robert Jarzmik 2015-07-04 15:42 ` Robert Jarzmik 2015-07-05 3:37 ` Viresh Kumar 2015-07-05 3:37 ` Viresh Kumar 2015-07-06 6:13 ` Robert Jarzmik 2015-07-06 6:13 ` Robert Jarzmik 2015-06-18 10:54 ` [PATCH 17/41] clocksource: qcom: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-19 19:10 ` Stephen Boyd 2015-06-19 19:10 ` Stephen Boyd 2015-06-18 10:54 ` [PATCH 18/41] clocksource: rockchip: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 19/41] clocksource: samsung_pwm: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 20/41] clocksource: sh_cmt: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` [PATCH 21/41] clocksource: sh_mtu2: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` [PATCH 22/41] clocksource: sh_tmu: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 13:10 ` Laurent Pinchart 2015-06-18 10:54 ` [PATCH 23/41] clocksource: sun4i: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 12:01 ` Maxime Ripard 2015-06-18 12:01 ` Maxime Ripard 2015-06-18 12:23 ` Viresh Kumar 2015-06-18 12:23 ` Viresh Kumar 2015-06-19 10:30 ` Maxime Ripard 2015-06-19 10:30 ` Maxime Ripard 2015-06-18 10:54 ` [PATCH 24/41] clocksource: tcb_clksrc: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 25/41] clocksource: tegra20: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-02 19:41 ` Daniel Lezcano 2015-07-02 19:41 ` Daniel Lezcano 2015-07-03 8:54 ` Viresh Kumar 2015-07-03 8:54 ` Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar [this message] 2015-06-18 10:54 ` [PATCH 26/41] clocksource: time-armada-370-xp: " Viresh Kumar 2015-06-18 10:54 ` [PATCH 27/41] clocksource: efm32: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 28/41] clocksource: orion: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 29/41] clocksource: atlas7: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 30/41] clocksource: atmel: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 14:28 ` Alexandre Belloni 2015-06-18 14:28 ` Alexandre Belloni 2015-06-18 10:54 ` [PATCH 31/41] clocksource: atmel-st: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 14:40 ` Alexandre Belloni 2015-06-18 14:40 ` Alexandre Belloni 2015-06-19 1:49 ` Viresh Kumar 2015-06-19 1:49 ` Viresh Kumar 2015-06-19 11:48 ` Alexandre Belloni 2015-06-19 11:48 ` Alexandre Belloni 2015-06-19 11:52 ` Viresh Kumar 2015-06-19 11:52 ` Viresh Kumar 2015-06-19 12:06 ` Alexandre Belloni 2015-06-19 12:06 ` Alexandre Belloni 2015-06-18 10:54 ` [PATCH 32/41] clocksource: digicolor: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-23 10:17 ` Baruch Siach 2015-06-23 10:17 ` Baruch Siach 2015-06-23 10:21 ` Viresh Kumar 2015-06-23 10:21 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 33/41] clocksource: integrator: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 13:35 ` Linus Walleij 2015-07-14 13:35 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 34/41] clocksource: keystone: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 35/41] clocksource: prima2: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 36/41] clocksource: stm32: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 11:09 ` Maxime Coquelin 2015-06-18 11:09 ` Maxime Coquelin 2015-06-18 11:32 ` Viresh Kumar 2015-06-18 11:32 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 37/41] clocksource: sun5i: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 38/41] clocksource: u300: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-14 13:36 ` Linus Walleij 2015-07-14 13:36 ` Linus Walleij 2015-06-18 10:54 ` [PATCH 39/41] clocksource: vf_pit: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-03 8:10 ` Stefan Agner 2015-07-03 8:10 ` Stefan Agner 2015-07-03 8:57 ` Viresh Kumar 2015-07-03 8:57 ` Viresh Kumar 2015-07-03 11:11 ` Stefan Agner 2015-07-03 11:11 ` Stefan Agner 2015-07-03 11:17 ` Viresh Kumar 2015-07-03 11:17 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 40/41] clocksource: vt8500: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-06-18 10:54 ` [PATCH 41/41] clocksource: zevio: " Viresh Kumar 2015-06-18 10:54 ` Viresh Kumar 2015-07-02 20:11 ` Daniel Lezcano 2015-07-02 20:11 ` Daniel Lezcano 2015-07-03 8:56 ` Viresh Kumar 2015-07-03 8:56 ` Viresh Kumar 2015-07-03 8:59 ` Daniel Lezcano 2015-07-03 8:59 ` 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=632796e451d257f8bd5f90f779e866870be02db2.1434622147.git.viresh.kumar@linaro.org \ --to=viresh.kumar@linaro.org \ --cc=andrew@lunn.ch \ --cc=daniel.lezcano@linaro.org \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=linaro-kernel@lists.linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ --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: 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.