| Message ID | 20170516075840.23130-1-andrew@aj.id.au |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
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 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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 >
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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);
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(-)