Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1642385

Re: [PATCH] clocksource: moxart: Add AST2500 compatible string

Show all headers | View raw

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
>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] clocksource: moxart: Add AST2500 compatible string Andrew Jeffery <andrew@aj.id.au> - 2017-05-16 10:00 +0200
  Re: [PATCH] clocksource: moxart: Add AST2500 compatible string Joel Stanley <joel@jms.id.au> - 2017-05-16 12:10 +0200
  Re: [PATCH] clocksource: moxart: Add AST2500 compatible string Rob Herring <robh@kernel.org> - 2017-05-23 02:10 +0200

csiph-web