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

Groups > linux.kernel > #1657326 > unrolled thread

[PATCH] arm: aspeed: Add clock-names property to timer node

Started byAndrew Jeffery <andrew@aj.id.au>
First post2017-06-05 09:50 +0200
Last post2017-06-07 16:40 +0200
Articles 7 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] arm: aspeed: Add clock-names property to timer node Andrew Jeffery <andrew@aj.id.au> - 2017-06-05 09:50 +0200
    Re: [PATCH] arm: aspeed: Add clock-names property to timer node Joel Stanley <joel@jms.id.au> - 2017-06-05 11:10 +0200
      Re: [PATCH] arm: aspeed: Add clock-names property to timer node Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-06-05 23:20 +0200
        Re: [PATCH] arm: aspeed: Add clock-names property to timer node Joel Stanley <joel@jms.id.au> - 2017-06-06 04:20 +0200
      Re: [PATCH] arm: aspeed: Add clock-names property to timer node Arnd Bergmann <arnd@arndb.de> - 2017-06-06 11:50 +0200
        Re: [PATCH] arm: aspeed: Add clock-names property to timer node Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-06-07 15:00 +0200
          Re: [PATCH] arm: aspeed: Add clock-names property to timer node Arnd Bergmann <arnd@arndb.de> - 2017-06-07 16:40 +0200

#1657326 — [PATCH] arm: aspeed: Add clock-names property to timer node

FromAndrew Jeffery <andrew@aj.id.au>
Date2017-06-05 09:50 +0200
Subject[PATCH] arm: aspeed: Add clock-names property to timer node
Message-ID<tOUVX-8qA-3@gated-at.bofh.it>
The merging of a number of clocksource drivers into fttmr010 means we
require clock-names to be specified in the Aspeed timer node, else the
clocksource fails to probe and boot hangs.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
 arch/arm/boot/dts/aspeed-g4.dtsi | 1 +
 arch/arm/boot/dts/aspeed-g5.dtsi | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 8c6bc29eb7f6..3e74929d3289 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -893,6 +893,7 @@
 				//interrupts = <16 17 18 35 36 37 38 39>;
 				interrupts = <16>;
 				clocks = <&clk_apb>;
+				clock-names = "PCLK";
 			};
 
 			wdt1: wdt@1e785000 {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index a0bea4a6ec77..1e6c701da853 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -1000,6 +1000,7 @@
 				//interrupts = <16 17 18 35 36 37 38 39>;
 				interrupts = <16>;
 				clocks = <&clk_apb>;
+				clock-names = "PCLK";
 			};
 
 
-- 
2.11.0

[toc] | [next] | [standalone]

#1657412

FromJoel Stanley <joel@jms.id.au>
Date2017-06-05 11:10 +0200
Message-ID<tOWbo-Zl-15@gated-at.bofh.it>
In reply to#1657326
On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> The merging of a number of clocksource drivers into fttmr010 means we
> require clock-names to be specified in the Aspeed timer node, else the
> clocksource fails to probe and boot hangs.

Arnd,

Linus' reworked timer driver will go into 4.13.

Can we get this patch merged into 4.12 as a fix so we don't end up
with a broken boot at any stage?

Cheers,

Joel

>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
>  arch/arm/boot/dts/aspeed-g4.dtsi | 1 +
>  arch/arm/boot/dts/aspeed-g5.dtsi | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index 8c6bc29eb7f6..3e74929d3289 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -893,6 +893,7 @@
>                                 //interrupts = <16 17 18 35 36 37 38 39>;
>                                 interrupts = <16>;
>                                 clocks = <&clk_apb>;
> +                               clock-names = "PCLK";
>                         };
>
>                         wdt1: wdt@1e785000 {
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index a0bea4a6ec77..1e6c701da853 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -1000,6 +1000,7 @@
>                                 //interrupts = <16 17 18 35 36 37 38 39>;
>                                 interrupts = <16>;
>                                 clocks = <&clk_apb>;
> +                               clock-names = "PCLK";
>                         };
>
>
> --
> 2.11.0
>

[toc] | [prev] | [next] | [standalone]

#1658148

FromDaniel Lezcano <daniel.lezcano@linaro.org>
Date2017-06-05 23:20 +0200
Message-ID<tP7zP-870-3@gated-at.bofh.it>
In reply to#1657412
On Mon, Jun 05, 2017 at 06:29:53PM +0930, Joel Stanley wrote:
> On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> > The merging of a number of clocksource drivers into fttmr010 means we
> > require clock-names to be specified in the Aspeed timer node, else the
> > clocksource fails to probe and boot hangs.
> 
> Arnd,
> 
> Linus' reworked timer driver will go into 4.13.
> 
> Can we get this patch merged into 4.12 as a fix so we don't end up
> with a broken boot at any stage?

I can take care of adding this patch in my branch before Linus' changes.

  -- Daniel

[toc] | [prev] | [next] | [standalone]

#1658315

FromJoel Stanley <joel@jms.id.au>
Date2017-06-06 04:20 +0200
Message-ID<tPcg9-2FE-1@gated-at.bofh.it>
In reply to#1658148
On Tue, Jun 6, 2017 at 6:41 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On Mon, Jun 05, 2017 at 06:29:53PM +0930, Joel Stanley wrote:
>> On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
>> > The merging of a number of clocksource drivers into fttmr010 means we
>> > require clock-names to be specified in the Aspeed timer node, else the
>> > clocksource fails to probe and boot hangs.
>>
>> Arnd,
>>
>> Linus' reworked timer driver will go into 4.13.
>>
>> Can we get this patch merged into 4.12 as a fix so we don't end up
>> with a broken boot at any stage?
>
> I can take care of adding this patch in my branch before Linus' changes.

That should be okay. Thanks Daniel!

Cheers,

Joel

[toc] | [prev] | [next] | [standalone]

#1658559

FromArnd Bergmann <arnd@arndb.de>
Date2017-06-06 11:50 +0200
Message-ID<tPjhF-6Wc-27@gated-at.bofh.it>
In reply to#1657412
On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote:
> On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
>> The merging of a number of clocksource drivers into fttmr010 means we
>> require clock-names to be specified in the Aspeed timer node, else the
>> clocksource fails to probe and boot hangs.
>
> Arnd,
>
> Linus' reworked timer driver will go into 4.13.
>
> Can we get this patch merged into 4.12 as a fix so we don't end up
> with a broken boot at any stage?

Hmm, can't we make the driver backward-compatible and have it fall
back on the first clock if no clk named "PCLK" is found? Otherwise
you still have an incompatible change in the DT binding and it will
break if someone uses an older dtb with a newer kernel.

        Arnd

[toc] | [prev] | [next] | [standalone]

#1659772

FromDaniel Lezcano <daniel.lezcano@linaro.org>
Date2017-06-07 15:00 +0200
Message-ID<tPIJ4-6JB-7@gated-at.bofh.it>
In reply to#1658559
On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote:
> On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote:
> > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
> >> The merging of a number of clocksource drivers into fttmr010 means we
> >> require clock-names to be specified in the Aspeed timer node, else the
> >> clocksource fails to probe and boot hangs.
> >
> > Arnd,
> >
> > Linus' reworked timer driver will go into 4.13.
> >
> > Can we get this patch merged into 4.12 as a fix so we don't end up
> > with a broken boot at any stage?
> 
> Hmm, can't we make the driver backward-compatible and have it fall
> back on the first clock if no clk named "PCLK" is found? Otherwise
> you still have an incompatible change in the DT binding and it will
> break if someone uses an older dtb with a newer kernel.

I would like to avoid to hack the kernel code for backward DT compatible
things.



-- 

 <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

[toc] | [prev] | [next] | [standalone]

#1659852

FromArnd Bergmann <arnd@arndb.de>
Date2017-06-07 16:40 +0200
Message-ID<tPKhP-7Rr-9@gated-at.bofh.it>
In reply to#1659772
On Wed, Jun 7, 2017 at 2:52 PM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On Tue, Jun 06, 2017 at 11:41:11AM +0200, Arnd Bergmann wrote:
>> On Mon, Jun 5, 2017 at 10:59 AM, Joel Stanley <joel@jms.id.au> wrote:
>> > On Mon, Jun 5, 2017 at 5:18 PM, Andrew Jeffery <andrew@aj.id.au> wrote:
>> >> The merging of a number of clocksource drivers into fttmr010 means we
>> >> require clock-names to be specified in the Aspeed timer node, else the
>> >> clocksource fails to probe and boot hangs.
>> >
>> > Arnd,
>> >
>> > Linus' reworked timer driver will go into 4.13.
>> >
>> > Can we get this patch merged into 4.12 as a fix so we don't end up
>> > with a broken boot at any stage?
>>
>> Hmm, can't we make the driver backward-compatible and have it fall
>> back on the first clock if no clk named "PCLK" is found? Otherwise
>> you still have an incompatible change in the DT binding and it will
>> break if someone uses an older dtb with a newer kernel.
>
> I would like to avoid to hack the kernel code for backward DT compatible
> things.

How about a fixup in the platform code to add the property then?

      Arnd

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web