* [PATCH] clocksource: moxart: Add AST2500 compatible string
@ 2017-05-16 7:58 Andrew Jeffery
2017-05-16 10:03 ` Joel Stanley
` (3 more replies)
0 siblings, 4 replies; 17+ messages in thread
From: Andrew Jeffery @ 2017-05-16 7:58 UTC (permalink / raw)
To: linux-kernel
Cc: Andrew Jeffery, robh+dt, mark.rutland, daniel.lezcano, tglx, joel,
devicetree, ryan_chen
Also clean up space-before-tab issues in the documentation.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 5 +++--
drivers/clocksource/moxart_timer.c | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
index e207c11630af..b6b8b4836d3b 100644
--- a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
+++ b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
@@ -3,8 +3,9 @@ MOXA ART timer
Required properties:
- compatible : Must be one of:
- - "moxa,moxart-timer"
- - "aspeed,ast2400-timer"
+ - "moxa,moxart-timer"
+ - "aspeed,ast2400-timer"
+ - "aspeed,ast2500-timer"
- reg : Should contain registers location and length
- interrupts : Should contain the timer interrupt number
- clocks : Should contain phandle for the clock that drives the counter
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
index 7f3430654fbd..b6fa319396c1 100644
--- a/drivers/clocksource/moxart_timer.c
+++ b/drivers/clocksource/moxart_timer.c
@@ -253,4 +253,5 @@ static int __init moxart_timer_init(struct device_node *node)
return ret;
}
CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init);
-CLOCKSOURCE_OF_DECLARE(aspeed, "aspeed,ast2400-timer", moxart_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", moxart_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", moxart_timer_init);
--
2.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-16 7:58 [PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery
@ 2017-05-16 10:03 ` Joel Stanley
2017-05-23 0:07 ` Rob Herring
` (2 subsequent siblings)
3 siblings, 0 replies; 17+ messages in thread
From: Joel Stanley @ 2017-05-16 10:03 UTC (permalink / raw)
To: Andrew Jeffery
Cc: Linux Kernel Mailing List, Rob Herring, Mark Rutland,
Daniel Lezcano, Thomas Gleixner, devicetree, Ryan Chen
On Tue, May 16, 2017 at 3:58 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> Also clean up space-before-tab issues in the documentation.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Joel Stanley <joel@jms.id.au>
> ---
> Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 5 +++--
> drivers/clocksource/moxart_timer.c | 3 ++-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
> index e207c11630af..b6b8b4836d3b 100644
> --- a/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
> +++ b/Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
> @@ -3,8 +3,9 @@ MOXA ART timer
> Required properties:
>
> - compatible : Must be one of:
> - - "moxa,moxart-timer"
> - - "aspeed,ast2400-timer"
> + - "moxa,moxart-timer"
> + - "aspeed,ast2400-timer"
> + - "aspeed,ast2500-timer"
> - reg : Should contain registers location and length
> - interrupts : Should contain the timer interrupt number
> - clocks : Should contain phandle for the clock that drives the counter
> diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c
> index 7f3430654fbd..b6fa319396c1 100644
> --- a/drivers/clocksource/moxart_timer.c
> +++ b/drivers/clocksource/moxart_timer.c
> @@ -253,4 +253,5 @@ static int __init moxart_timer_init(struct device_node *node)
> return ret;
> }
> CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init);
> -CLOCKSOURCE_OF_DECLARE(aspeed, "aspeed,ast2400-timer", moxart_timer_init);
> +CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", moxart_timer_init);
> +CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", moxart_timer_init);
> --
> 2.9.3
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-16 7:58 [PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery
2017-05-16 10:03 ` Joel Stanley
@ 2017-05-23 0:07 ` Rob Herring
2017-05-25 20:28 ` Daniel Lezcano
2017-05-28 13:59 ` Linus Walleij
3 siblings, 0 replies; 17+ messages in thread
From: Rob Herring @ 2017-05-23 0:07 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-kernel, mark.rutland, daniel.lezcano, tglx, joel,
devicetree, ryan_chen
On Tue, May 16, 2017 at 03:58:40PM +0800, Andrew Jeffery wrote:
> Also clean up space-before-tab issues in the documentation.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt | 5 +++--
> drivers/clocksource/moxart_timer.c | 3 ++-
> 2 files changed, 5 insertions(+), 3 deletions(-)
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-16 7:58 [PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery
2017-05-16 10:03 ` Joel Stanley
2017-05-23 0:07 ` Rob Herring
@ 2017-05-25 20:28 ` Daniel Lezcano
2017-05-26 1:12 ` Andrew Jeffery
2017-05-28 14:00 ` [PATCH] clocksource: moxart: Add AST2500 compatible string Linus Walleij
2017-05-28 13:59 ` Linus Walleij
3 siblings, 2 replies; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-25 20:28 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-kernel, robh+dt, mark.rutland, tglx, joel, devicetree,
ryan_chen
On Tue, May 16, 2017 at 03:58:40PM +0800, Andrew Jeffery wrote:
> Also clean up space-before-tab issues in the documentation.
Andrew,
I reworked the patch to apply to the changes Linus did recently to convert to
the fttrm010 driver.
Please have a look at:
https://git.linaro.org/people/daniel.lezcano/linux.git/commit/?h=clockevents/4.13&id=3ca904162ffdd72f4fad3ab731fc94a12c50f682
Shouldn't the compatible string be:
"aspeed,ast2400-timer", "faraday,fttmr010"
"aspeed,ast2500-timer", "faraday,fttmr010"
-- Daniel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-25 20:28 ` Daniel Lezcano
@ 2017-05-26 1:12 ` Andrew Jeffery
2017-05-26 8:48 ` [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization Daniel Lezcano
2017-05-28 14:00 ` [PATCH] clocksource: moxart: Add AST2500 compatible string Linus Walleij
1 sibling, 1 reply; 17+ messages in thread
From: Andrew Jeffery @ 2017-05-26 1:12 UTC (permalink / raw)
To: Daniel Lezcano
Cc: linux-kernel, robh+dt, mark.rutland, tglx, joel, devicetree,
ryan_chen, Benjamin Herrenschmidt
[-- Attachment #1: Type: text/plain, Size: 1915 bytes --]
On Thu, 2017-05-25 at 22:28 +0200, Daniel Lezcano wrote:
> On Tue, May 16, 2017 at 03:58:40PM +0800, Andrew Jeffery wrote:
> > Also clean up space-before-tab issues in the documentation.
>
> Andrew,
>
> I reworked the patch to apply to the changes Linus did recently to convert to
> the fttrm010 driver.
>
> Please have a look at:
>
> https://git.linaro.org/people/daniel.lezcano/linux.git/commit/?h=clockevents/4.13&id=3ca904162ffdd72f4fad3ab731fc94a12c50f682
>
I think we're going to run into trouble here:
https://git.linaro.org/people/daniel.lezcano/linux.git/tree/drivers/clocksource/timer-fttmr010.c?h=clockevents/4.13&id=3ca904162ffdd72f4fad3ab731fc94a12c50f682#n260
As it stands if a aspeed,ast2500-timer compatible is provided we'll
take the else branch and hit the issues Joel found with Linus' original
series counting up on the Aspeed hardware.
My change was somewhat cosmetic - Ben (now Cc'ed) didn't seemed too
concerned about using the the aspeed,ast2400-timer compatible string
for ast2500 dts. My motivation for the patch was that by describing the
aspeed,ast2500-timer compatible it signals that someone had taken a
look and judged it so. However, my point is maybe one solution is
simply to drop the patch and continue to use aspeed,ast2400-timer
compatible where we need.
Another is to rework your change to switch to
of_device_compatible_match() in drivers/clocksource/timer-fttmr010.c
and also check against aspeed,ast2500-timer.
What direction should we go?
> Shouldn't the compatible string be:
>
> "aspeed,ast2400-timer", "faraday,fttmr010"
> "aspeed,ast2500-timer", "faraday,fttmr010"
>
Does it makes sense in the face of the Aspeed quirks? If so it seems
reasonable, but falling back to the faraday,fttmr010 compatible could
lead to failures (if the compatible driver counted up).
Cheers,
Andrew
>
> -- Daniel
>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
2017-05-26 1:12 ` Andrew Jeffery
@ 2017-05-26 8:48 ` Daniel Lezcano
2017-05-28 13:56 ` Linus Walleij
2017-05-29 6:05 ` Andrew Jeffery
0 siblings, 2 replies; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-26 8:48 UTC (permalink / raw)
To: andrew
Cc: joel, ryan_chen, mark.rutland, linus.walleij, jonas.jensen,
Thomas Gleixner, open list:CLOCKSOURCE, CLOCKEVENT DRIVERS
The recent changes made the fttmr010 to be more generic and support different
timers with a very few differences like moxart or aspeed.
The aspeed timer uses a countdown and there is a test against the aspeed2400
compatible string to set a flag.
With the previous patch, we added the aspeed2500 compatible string but without
taking care of setting the countdown flag.
Fix this by specifiying a init function and pass the aspeed flag to a common
init function.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/timer-fttmr010.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index 68982ad..d96190e 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -210,10 +210,9 @@ static irqreturn_t fttmr010_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static int __init fttmr010_timer_init(struct device_node *np)
+static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
{
struct fttmr010 *fttmr010;
- bool is_ast2400;
int irq;
struct clk *clk;
int ret;
@@ -260,8 +259,7 @@ static int __init fttmr010_timer_init(struct device_node *np)
* The Aspeed AST2400 moves bits around in the control register,
* otherwise it works the same.
*/
- is_ast2400 = of_device_is_compatible(np, "aspeed,ast2400-timer");
- if (is_ast2400) {
+ if (is_aspeed) {
fttmr010->t1_enable_val = TIMER_1_CR_ASPEED_ENABLE |
TIMER_1_CR_ASPEED_INT;
/* Downward not available */
@@ -280,7 +278,7 @@ static int __init fttmr010_timer_init(struct device_node *np)
* Enable timer 1 count up, timer 2 count up, except on Aspeed,
* where everything just counts down.
*/
- if (is_ast2400)
+ if (is_aspeed)
val = TIMER_2_CR_ASPEED_ENABLE;
else {
val = TIMER_2_CR_ENABLE;
@@ -355,8 +353,19 @@ static int __init fttmr010_timer_init(struct device_node *np)
return ret;
}
+
+static __init int aspeed_timer_init(struct device_node *np)
+{
+ return fttmr010_common_init(np, true);
+}
+
+static __init int fttmr010_timer_init(struct device_node *np)
+{
+ return fttmr010_common_init(np, false);
+}
+
CLOCKSOURCE_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init);
CLOCKSOURCE_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init);
CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init);
-CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", fttmr010_timer_init);
-CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", fttmr010_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init);
+CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init);
--
2.7.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
2017-05-26 8:48 ` [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization Daniel Lezcano
@ 2017-05-28 13:56 ` Linus Walleij
2017-05-29 6:05 ` Andrew Jeffery
1 sibling, 0 replies; 17+ messages in thread
From: Linus Walleij @ 2017-05-28 13:56 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Andrew Jeffery, Joel Stanley, Ryan Chen, Mark Rutland,
Jonas Jensen, Thomas Gleixner,
open list:CLOCKSOURCE, CLOCKEVENT DRIVERS
On Fri, May 26, 2017 at 10:48 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> The recent changes made the fttmr010 to be more generic and support different
> timers with a very few differences like moxart or aspeed.
>
> The aspeed timer uses a countdown and there is a test against the aspeed2400
> compatible string to set a flag.
>
> With the previous patch, we added the aspeed2500 compatible string but without
> taking care of setting the countdown flag.
>
> Fix this by specifiying a init function and pass the aspeed flag to a common
> init function.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Sorry for the mistake :(
I don't have the Aspeed systems myself but I bet this works.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-16 7:58 [PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery
` (2 preceding siblings ...)
2017-05-25 20:28 ` Daniel Lezcano
@ 2017-05-28 13:59 ` Linus Walleij
2017-05-28 18:27 ` Daniel Lezcano
3 siblings, 1 reply; 17+ messages in thread
From: Linus Walleij @ 2017-05-28 13:59 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-kernel@vger.kernel.org, Rob Herring, Mark Rutland,
Daniel Lezcano, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On Tue, May 16, 2017 at 9:58 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
> Also clean up space-before-tab issues in the documentation.
>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Does this collide with Daniel's 2500 patch?
Sorry for the mess, tell me if I need to fix something up :(
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-25 20:28 ` Daniel Lezcano
2017-05-26 1:12 ` Andrew Jeffery
@ 2017-05-28 14:00 ` Linus Walleij
1 sibling, 0 replies; 17+ messages in thread
From: Linus Walleij @ 2017-05-28 14:00 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Andrew Jeffery, linux-kernel@vger.kernel.org, Rob Herring,
Mark Rutland, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On Thu, May 25, 2017 at 10:28 PM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> Shouldn't the compatible string be:
>
> "aspeed,ast2400-timer", "faraday,fttmr010"
> "aspeed,ast2500-timer", "faraday,fttmr010"
Actually not this time. The Gemini and Moxart timers are compatible with
the pure Faraday fttmr010 IP-block but Aspeed has played around with the
silicon IP so it is not compatible anymore.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-28 13:59 ` Linus Walleij
@ 2017-05-28 18:27 ` Daniel Lezcano
2017-05-30 7:44 ` Linus Walleij
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-28 18:27 UTC (permalink / raw)
To: Linus Walleij, Andrew Jeffery
Cc: linux-kernel@vger.kernel.org, Rob Herring, Mark Rutland,
Thomas Gleixner, Joel Stanley, devicetree@vger.kernel.org,
Ryan Chen
On 28/05/2017 15:59, Linus Walleij wrote:
> On Tue, May 16, 2017 at 9:58 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
>
>> Also clean up space-before-tab issues in the documentation.
>>
>> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>
> Does this collide with Daniel's 2500 patch?
>
> Sorry for the mess, tell me if I need to fix something up :(
It is ok, an usual collision change to be fixed when merging ;)
By the way, can you have a look at fttmr010_read_sched_clock to remove
the local_fttmr->count_down test?
Thanks.
-- 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] 17+ messages in thread
* Re: [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
2017-05-26 8:48 ` [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization Daniel Lezcano
2017-05-28 13:56 ` Linus Walleij
@ 2017-05-29 6:05 ` Andrew Jeffery
2017-05-29 7:45 ` Daniel Lezcano
1 sibling, 1 reply; 17+ messages in thread
From: Andrew Jeffery @ 2017-05-29 6:05 UTC (permalink / raw)
To: Daniel Lezcano
Cc: joel, ryan_chen, mark.rutland, linus.walleij, jonas.jensen,
Thomas Gleixner, open list:CLOCKSOURCE, CLOCKEVENT DRIVERS
[-- Attachment #1: Type: text/plain, Size: 3239 bytes --]
On Fri, 2017-05-26 at 10:48 +0200, Daniel Lezcano wrote:
> The recent changes made the fttmr010 to be more generic and support different
> timers with a very few differences like moxart or aspeed.
>
> The aspeed timer uses a countdown and there is a test against the aspeed2400
> compatible string to set a flag.
>
> With the previous patch, we added the aspeed2500 compatible string but without
> taking care of setting the countdown flag.
>
> Fix this by specifiying a init function and pass the aspeed flag to a common
> init function.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/clocksource/timer-fttmr010.c | 23 ++++++++++++++++-------
> 1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
> index 68982ad..d96190e 100644
> --- a/drivers/clocksource/timer-fttmr010.c
> +++ b/drivers/clocksource/timer-fttmr010.c
> @@ -210,10 +210,9 @@ static irqreturn_t fttmr010_timer_interrupt(int irq, void *dev_id)
> > return IRQ_HANDLED;
> }
>
> -static int __init fttmr010_timer_init(struct device_node *np)
> +static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
> {
> > struct fttmr010 *fttmr010;
> > - bool is_ast2400;
> > int irq;
> > struct clk *clk;
> > int ret;
> @@ -260,8 +259,7 @@ static int __init fttmr010_timer_init(struct device_node *np)
> > * The Aspeed AST2400 moves bits around in the control register,
> > * otherwise it works the same.
> > */
> > - is_ast2400 = of_device_is_compatible(np, "aspeed,ast2400-timer");
> > - if (is_ast2400) {
> > + if (is_aspeed) {
> > fttmr010->t1_enable_val = TIMER_1_CR_ASPEED_ENABLE |
> > TIMER_1_CR_ASPEED_INT;
> > /* Downward not available */
> @@ -280,7 +278,7 @@ static int __init fttmr010_timer_init(struct device_node *np)
> > * Enable timer 1 count up, timer 2 count up, except on Aspeed,
> > * where everything just counts down.
> > */
> > - if (is_ast2400)
> > + if (is_aspeed)
> > val = TIMER_2_CR_ASPEED_ENABLE;
> > else {
> > val = TIMER_2_CR_ENABLE;
> @@ -355,8 +353,19 @@ static int __init fttmr010_timer_init(struct device_node *np)
>
> > return ret;
> }
> +
> +static __init int aspeed_timer_init(struct device_node *np)
> +{
> > + return fttmr010_common_init(np, true);
> +}
> +
> +static __init int fttmr010_timer_init(struct device_node *np)
> +{
> > + return fttmr010_common_init(np, false);
> +}
> +
> CLOCKSOURCE_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init);
> CLOCKSOURCE_OF_DECLARE(gemini, "cortina,gemini-timer", fttmr010_timer_init);
> CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", fttmr010_timer_init);
> -CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", fttmr010_timer_init);
> -CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", fttmr010_timer_init);
> +CLOCKSOURCE_OF_DECLARE(ast2400, "aspeed,ast2400-timer", aspeed_timer_init);
> +CLOCKSOURCE_OF_DECLARE(ast2500, "aspeed,ast2500-timer", aspeed_timer_init);
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
2017-05-29 6:05 ` Andrew Jeffery
@ 2017-05-29 7:45 ` Daniel Lezcano
2017-05-30 4:35 ` Joel Stanley
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-29 7:45 UTC (permalink / raw)
To: Andrew Jeffery
Cc: joel, ryan_chen, mark.rutland, linus.walleij, jonas.jensen,
Thomas Gleixner, open list:CLOCKSOURCE, CLOCKEVENT DRIVERS
On 29/05/2017 08:05, Andrew Jeffery wrote:
> On Fri, 2017-05-26 at 10:48 +0200, Daniel Lezcano wrote:
>> The recent changes made the fttmr010 to be more generic and support different
>> timers with a very few differences like moxart or aspeed.
>>
>> The aspeed timer uses a countdown and there is a test against the aspeed2400
>> compatible string to set a flag.
>>
>> With the previous patch, we added the aspeed2500 compatible string but without
>> taking care of setting the countdown flag.
>>
>> Fix this by specifiying a init function and pass the aspeed flag to a common
>> init function.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>
> Tested-by: Andrew Jeffery <andrew@aj.id.au>
> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
>
Thanks for testing.
-- 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] 17+ messages in thread
* Re: [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization
2017-05-29 7:45 ` Daniel Lezcano
@ 2017-05-30 4:35 ` Joel Stanley
0 siblings, 0 replies; 17+ messages in thread
From: Joel Stanley @ 2017-05-30 4:35 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Andrew Jeffery, Ryan Chen, Mark Rutland, Linus Walleij,
Jonas Jensen, Thomas Gleixner,
open list:CLOCKSOURCE, CLOCKEVENT DRIVERS
On Mon, May 29, 2017 at 5:15 PM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 29/05/2017 08:05, Andrew Jeffery wrote:
>> On Fri, 2017-05-26 at 10:48 +0200, Daniel Lezcano wrote:
>>> The recent changes made the fttmr010 to be more generic and support different
>>> timers with a very few differences like moxart or aspeed.
>>>
>>> The aspeed timer uses a countdown and there is a test against the aspeed2400
>>> compatible string to set a flag.
>>>
>>> With the previous patch, we added the aspeed2500 compatible string but without
>>> taking care of setting the countdown flag.
>>>
>>> Fix this by specifiying a init function and pass the aspeed flag to a common
>>> init function.
>>>
>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>
>> Tested-by: Andrew Jeffery <andrew@aj.id.au>
>> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Thanks everyone.
Acked-by: Joel Stanley <joel@jms.id.au>
Andrew, I think you had to fix up the clock device tree entries in the
Aspeed device tree. Can you please send me a patch for that?
Cheers,
Joel
>>
>
> Thanks for testing.
>
> -- 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] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-28 18:27 ` Daniel Lezcano
@ 2017-05-30 7:44 ` Linus Walleij
2017-05-30 8:54 ` Daniel Lezcano
0 siblings, 1 reply; 17+ messages in thread
From: Linus Walleij @ 2017-05-30 7:44 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Andrew Jeffery, linux-kernel@vger.kernel.org, Rob Herring,
Mark Rutland, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On Sun, May 28, 2017 at 8:27 PM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 28/05/2017 15:59, Linus Walleij wrote:
>> On Tue, May 16, 2017 at 9:58 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
>>
>>> Also clean up space-before-tab issues in the documentation.
>>>
>>> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
>>
>> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> Does this collide with Daniel's 2500 patch?
>>
>> Sorry for the mess, tell me if I need to fix something up :(
>
> It is ok, an usual collision change to be fixed when merging ;)
>
> By the way, can you have a look at fttmr010_read_sched_clock to remove
> the local_fttmr->count_down test?
I guess what we can do is make two different sched_clock()
callbacks: one for upward and one for downward counting.
Would you like an optimization like that?
(It makes sense.)
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-30 7:44 ` Linus Walleij
@ 2017-05-30 8:54 ` Daniel Lezcano
2017-05-30 9:53 ` Linus Walleij
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-30 8:54 UTC (permalink / raw)
To: Linus Walleij
Cc: Andrew Jeffery, linux-kernel@vger.kernel.org, Rob Herring,
Mark Rutland, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On 30/05/2017 09:44, Linus Walleij wrote:
> On Sun, May 28, 2017 at 8:27 PM, Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>> On 28/05/2017 15:59, Linus Walleij wrote:
>>> On Tue, May 16, 2017 at 9:58 AM, Andrew Jeffery <andrew@aj.id.au> wrote:
>>>
>>>> Also clean up space-before-tab issues in the documentation.
>>>>
>>>> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
>>>
>>> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
>>>
>>> Does this collide with Daniel's 2500 patch?
>>>
>>> Sorry for the mess, tell me if I need to fix something up :(
>>
>> It is ok, an usual collision change to be fixed when merging ;)
>>
>> By the way, can you have a look at fttmr010_read_sched_clock to remove
>> the local_fttmr->count_down test?
>
> I guess what we can do is make two different sched_clock()
> callbacks: one for upward and one for downward counting.
>
> Would you like an optimization like that?
>
> (It makes sense.)
Yes, thanks Linus!
-- 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] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-30 8:54 ` Daniel Lezcano
@ 2017-05-30 9:53 ` Linus Walleij
2017-05-30 10:03 ` Daniel Lezcano
0 siblings, 1 reply; 17+ messages in thread
From: Linus Walleij @ 2017-05-30 9:53 UTC (permalink / raw)
To: Daniel Lezcano
Cc: Andrew Jeffery, linux-kernel@vger.kernel.org, Rob Herring,
Mark Rutland, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On Tue, May 30, 2017 at 10:54 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 30/05/2017 09:44, Linus Walleij wrote:
>> I guess what we can do is make two different sched_clock()
>> callbacks: one for upward and one for downward counting.
>>
>> Would you like an optimization like that?
>>
>> (It makes sense.)
>
> Yes, thanks Linus!
Can you point me to a git tree with all your patches so I can work
on top of what you have?
I think I will also look into adding delay timers.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] clocksource: moxart: Add AST2500 compatible string
2017-05-30 9:53 ` Linus Walleij
@ 2017-05-30 10:03 ` Daniel Lezcano
0 siblings, 0 replies; 17+ messages in thread
From: Daniel Lezcano @ 2017-05-30 10:03 UTC (permalink / raw)
To: Linus Walleij
Cc: Andrew Jeffery, linux-kernel@vger.kernel.org, Rob Herring,
Mark Rutland, Thomas Gleixner, Joel Stanley,
devicetree@vger.kernel.org, Ryan Chen
On Tue, May 30, 2017 at 11:53:35AM +0200, Linus Walleij wrote:
> On Tue, May 30, 2017 at 10:54 AM, Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
> > On 30/05/2017 09:44, Linus Walleij wrote:
>
> >> I guess what we can do is make two different sched_clock()
> >> callbacks: one for upward and one for downward counting.
> >>
> >> Would you like an optimization like that?
> >>
> >> (It makes sense.)
> >
> > Yes, thanks Linus!
>
> Can you point me to a git tree with all your patches so I can work
> on top of what you have?
>
> I think I will also look into adding delay timers.
https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.13
(subject to rebase)
--
<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] 17+ messages in thread
end of thread, other threads:[~2017-05-30 10:03 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-16 7:58 [PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery
2017-05-16 10:03 ` Joel Stanley
2017-05-23 0:07 ` Rob Herring
2017-05-25 20:28 ` Daniel Lezcano
2017-05-26 1:12 ` Andrew Jeffery
2017-05-26 8:48 ` [PATCH] clocksource/drivers/fttmr010: Fix aspeed-2500 initialization Daniel Lezcano
2017-05-28 13:56 ` Linus Walleij
2017-05-29 6:05 ` Andrew Jeffery
2017-05-29 7:45 ` Daniel Lezcano
2017-05-30 4:35 ` Joel Stanley
2017-05-28 14:00 ` [PATCH] clocksource: moxart: Add AST2500 compatible string Linus Walleij
2017-05-28 13:59 ` Linus Walleij
2017-05-28 18:27 ` Daniel Lezcano
2017-05-30 7:44 ` Linus Walleij
2017-05-30 8:54 ` Daniel Lezcano
2017-05-30 9:53 ` Linus Walleij
2017-05-30 10:03 ` Daniel Lezcano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox