Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1268193 > unrolled thread
| Started by | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| First post | 2015-11-12 19:50 +0100 |
| Last post | 2015-11-13 15:30 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-12 19:50 +0100
Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-11-13 00:40 +0100
Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init Daniel Lezcano <daniel.lezcano@linaro.org> - 2015-11-13 15:30 +0100
| From | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| Date | 2015-11-12 19:50 +0100 |
| Subject | [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init |
| Message-ID | <qu56y-46h-5@gated-at.bofh.it> |
The current code to initialize, register and read the clocksource is
already factored out in mmio.c via the clocksource_mmio_init function.
The only difference is the readl vs readl_relaxed.
Factor out the code with the clocksource_mmio_init function.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-sun5i.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index bca9573..55d7258 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -152,13 +152,6 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static cycle_t sun5i_clksrc_read(struct clocksource *clksrc)
-{
- struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);
-
- return ~readl(cs->timer.base + TIMER_CNTVAL_LO_REG(1));
-}
-
static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
unsigned long event, void *data)
{
@@ -217,13 +210,8 @@ static int __init sun5i_setup_clocksource(struct device_node *node,
writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
base + TIMER_CTL_REG(1));
- cs->clksrc.name = node->name;
- cs->clksrc.rating = 340;
- cs->clksrc.read = sun5i_clksrc_read;
- cs->clksrc.mask = CLOCKSOURCE_MASK(32);
- cs->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS;
-
- ret = clocksource_register_hz(&cs->clksrc, rate);
+ ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name,
+ rate, 340, UINT_MAX, clocksource_mmio_readl_down);
if (ret) {
pr_err("Couldn't register clock source.\n");
goto err_remove_notifier;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Maxime Ripard <maxime.ripard@free-electrons.com> |
|---|---|
| Date | 2015-11-13 00:40 +0100 |
| Subject | Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init |
| Message-ID | <qu9Dc-75u-15@gated-at.bofh.it> |
| In reply to | #1268193 |
[Multipart message — attachments visible in raw view] — view raw
On Thu, Nov 12, 2015 at 07:40:13PM +0100, Daniel Lezcano wrote: > The current code to initialize, register and read the clocksource is > already factored out in mmio.c via the clocksource_mmio_init function. > > The only difference is the readl vs readl_relaxed. > > Factor out the code with the clocksource_mmio_init function. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
[toc] | [prev] | [next] | [standalone]
| From | Daniel Lezcano <daniel.lezcano@linaro.org> |
|---|---|
| Date | 2015-11-13 15:30 +0100 |
| Subject | Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init |
| Message-ID | <qunwt-7y6-1@gated-at.bofh.it> |
| In reply to | #1268371 |
On 11/13/2015 12:31 AM, Maxime Ripard wrote: > On Thu, Nov 12, 2015 at 07:40:13PM +0100, Daniel Lezcano wrote: >> The current code to initialize, register and read the clocksource is >> already factored out in mmio.c via the clocksource_mmio_init function. >> >> The only difference is the readl vs readl_relaxed. >> >> Factor out the code with the clocksource_mmio_init function. >> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks for the review. I applied the patch with a fix: ret = clocksource_mmio_init(base + TIMER_CNTVAL_LO_REG(1), node->name, rate, 340, UINT_MAX, clocksource_mmio_readl_down); Replaced UINT_MAX by '32'. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web