All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
@ 2015-11-12 18:40 ` Daniel Lezcano
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2015-11-12 18:40 UTC (permalink / raw)
  To: daniel.lezcano
  Cc: tglx, linux-kernel, Maxime Ripard, moderated list:ARM/Allwinner A1X...

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
@ 2015-11-12 18:40 ` Daniel Lezcano
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2015-11-12 18:40 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
  2015-11-12 18:40 ` Daniel Lezcano
@ 2015-11-12 23:31   ` Maxime Ripard
  -1 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2015-11-12 23:31 UTC (permalink / raw)
  To: Daniel Lezcano; +Cc: tglx, linux-kernel, moderated list:ARM/Allwinner A1X...

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
@ 2015-11-12 23:31   ` Maxime Ripard
  0 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2015-11-12 23:31 UTC (permalink / raw)
  To: linux-arm-kernel

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151112/b84f0cd4/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
  2015-11-12 23:31   ` Maxime Ripard
@ 2015-11-13 14:27     ` Daniel Lezcano
  -1 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2015-11-13 14:27 UTC (permalink / raw)
  To: Maxime Ripard; +Cc: tglx, linux-kernel, moderated list:ARM/Allwinner A1X...

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


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init
@ 2015-11-13 14:27     ` Daniel Lezcano
  0 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2015-11-13 14:27 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-13 14:27 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-12 18:40 [PATCH V2] clocksource/drivers/timer_sun5i: Replace code by clocksource_mmio_init Daniel Lezcano
2015-11-12 18:40 ` Daniel Lezcano
2015-11-12 23:31 ` Maxime Ripard
2015-11-12 23:31   ` Maxime Ripard
2015-11-13 14:27   ` Daniel Lezcano
2015-11-13 14:27     ` Daniel Lezcano

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.