[PATCH v2] ARM: sunxi/dt: make the CHIP inherit from allwinner, sun5i-a13

[PATCH v2] ARM: sunxi/dt: make the CHIP inherit from allwinner, sun5i-a13

[Boris Brezillon]

The sun4i-timer driver registers its sched_clock only if the machine is
compatible with "allwinner,sun5i-a13", "allwinner,sun5i-a10s" or
"allwinner,sun4i-a10".
Add the missing "allwinner,sun5i-a13" string to the machine compatible.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Fixes: 5a33893dd079 ("ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13")
Cc: <stable@vger.kernel.org>
---
Changes since v1:
- added the Fixes and Cc stable tags
---
 arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
index a8d8b4582397..f694482bdeb6 100644
--- a/arch/arm/boot/dts/sun5i-r8-chip.dts
+++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
@@ -52,7 +52,7 @@
 
 / {
 	model = "NextThing C.H.I.P.";
-	compatible = "nextthing,chip", "allwinner,sun5i-r8";
+	compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
 
 	aliases {
 		i2c0 = &i2c0;
-- 
2.7.4

[PATCH v2] ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13

[Boris Brezillon]

On Wed, 15 Jun 2016 13:20:19 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> The sun4i-timer driver registers its sched_clock only if the machine is
> compatible with "allwinner,sun5i-a13", "allwinner,sun5i-a10s" or
> "allwinner,sun4i-a10".
> Add the missing "allwinner,sun5i-a13" string to the machine compatible.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Fixes: 5a33893dd079 ("ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13")

Should be

Fixes: 465a225fb2af ("ARM: sun5i: Add C.H.I.P DTS")

Maxime, do you want me to resend it?

> Cc: <stable@vger.kernel.org>
> ---
> Changes since v1:
> - added the Fixes and Cc stable tags
> ---
>  arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sun5i-r8-chip.dts b/arch/arm/boot/dts/sun5i-r8-chip.dts
> index a8d8b4582397..f694482bdeb6 100644
> --- a/arch/arm/boot/dts/sun5i-r8-chip.dts
> +++ b/arch/arm/boot/dts/sun5i-r8-chip.dts
> @@ -52,7 +52,7 @@
>  
>  / {
>  	model = "NextThing C.H.I.P.";
> -	compatible = "nextthing,chip", "allwinner,sun5i-r8";
> +	compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
>  
>  	aliases {
>  		i2c0 = &i2c0;



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[PATCH v2] ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13

[Maxime Ripard]

On Wed, Jun 15, 2016 at 01:21:49PM +0200, Boris Brezillon wrote:
> On Wed, 15 Jun 2016 13:20:19 +0200
> Boris Brezillon <boris.brezillon@free-electrons.com> wrote:
> 
> > The sun4i-timer driver registers its sched_clock only if the machine is
> > compatible with "allwinner,sun5i-a13", "allwinner,sun5i-a10s" or
> > "allwinner,sun4i-a10".
> > Add the missing "allwinner,sun5i-a13" string to the machine compatible.
> > 
> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > Fixes: 5a33893dd079 ("ARM: sunxi/dt: make the CHIP inherit from allwinner,sun5i-a13")
> 
> Should be
> 
> Fixes: 465a225fb2af ("ARM: sun5i: Add C.H.I.P DTS")
> 
> Maxime, do you want me to resend it?

No, it's fine. I fixed it and applied.

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: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160616/03a1fe9c/attachment.sig>