diff mbox series

arm64: dts: ensure backward compatibility of the AP807 Xenon

Message ID 20210322003915.3199775-1-mw@semihalf.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: ensure backward compatibility of the AP807 Xenon | expand

Commit Message

Marcin Wojtas March 22, 2021, 12:39 a.m. UTC
A recent switch to a dedicated AP807 compatible string for the Xenon
SD/MMC controller result in the driver not being probed when
using updated device tree with the older kernel revisions.
It may also be problematic for other OSs/firmware that use
Linux device tree sources as a reference. Resolve the problem
with backward compatibility by restoring a previous compatible
string as secondary one.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andrew Lunn March 22, 2021, 12:14 p.m. UTC | #1
On Mon, Mar 22, 2021 at 01:39:15AM +0100, Marcin Wojtas wrote:
> A recent switch to a dedicated AP807 compatible string for the Xenon
> SD/MMC controller result in the driver not being probed when
> using updated device tree with the older kernel revisions.
> It may also be problematic for other OSs/firmware that use
> Linux device tree sources as a reference. Resolve the problem
> with backward compatibility by restoring a previous compatible
> string as secondary one.
> 
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew
Marcin Wojtas May 12, 2021, 3:50 p.m. UTC | #2
Hi Gregory,

pon., 22 mar 2021 o 13:14 Andrew Lunn <andrew@lunn.ch> napisał(a):
>
> On Mon, Mar 22, 2021 at 01:39:15AM +0100, Marcin Wojtas wrote:
> > A recent switch to a dedicated AP807 compatible string for the Xenon
> > SD/MMC controller result in the driver not being probed when
> > using updated device tree with the older kernel revisions.
> > It may also be problematic for other OSs/firmware that use
> > Linux device tree sources as a reference. Resolve the problem
> > with backward compatibility by restoring a previous compatible
> > string as secondary one.
> >
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
>

Do you have any feedback about this patch? I just noticed it's not
merged in v5.13-rc1, it would be great to have it in the next release
though.

Best regards,
Marcin
Marcin Wojtas June 16, 2021, 7:12 p.m. UTC | #3
Hi!

śr., 12 maj 2021 o 17:50 Marcin Wojtas <mw@semihalf.com> napisał(a):
>
> Hi Gregory,
>
> pon., 22 mar 2021 o 13:14 Andrew Lunn <andrew@lunn.ch> napisał(a):
> >
> > On Mon, Mar 22, 2021 at 01:39:15AM +0100, Marcin Wojtas wrote:
> > > A recent switch to a dedicated AP807 compatible string for the Xenon
> > > SD/MMC controller result in the driver not being probed when
> > > using updated device tree with the older kernel revisions.
> > > It may also be problematic for other OSs/firmware that use
> > > Linux device tree sources as a reference. Resolve the problem
> > > with backward compatibility by restoring a previous compatible
> > > string as secondary one.
> > >
> > > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >
> > Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> >
>
> Do you have any feedback about this patch? I just noticed it's not
> merged in v5.13-rc1, it would be great to have it in the next release
> though.
>

Kind reminder. We are approaching v5.13 and it would be really great
to have this fix in time.

Thanks,
Marcin
Gregory CLEMENT June 17, 2021, 1:14 p.m. UTC | #4
Hi Marcin,

> A recent switch to a dedicated AP807 compatible string for the Xenon
> SD/MMC controller result in the driver not being probed when
> using updated device tree with the older kernel revisions.
> It may also be problematic for other OSs/firmware that use
> Linux device tree sources as a reference. Resolve the problem
> with backward compatibility by restoring a previous compatible
> string as secondary one.
>
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Applied on mvebu/dt64

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> index d9bbbfa4b4eb..4a23f65d475f 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> @@ -29,6 +29,7 @@ cpu_clk: clock-cpu {
>  };
>  
>  &ap_sdhci0 {
> -	compatible = "marvell,armada-ap807-sdhci";
> +	compatible = "marvell,armada-ap807-sdhci",
> +		     "marvell,armada-ap806-sdhci"; /* Backward compatibility */
>  };
>  
> -- 
> 2.29.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Marcin Wojtas June 17, 2021, 1:49 p.m. UTC | #5
czw., 17 cze 2021 o 15:14 Gregory CLEMENT
<gregory.clement@bootlin.com> napisał(a):
>
> Hi Marcin,
>
> > A recent switch to a dedicated AP807 compatible string for the Xenon
> > SD/MMC controller result in the driver not being probed when
> > using updated device tree with the older kernel revisions.
> > It may also be problematic for other OSs/firmware that use
> > Linux device tree sources as a reference. Resolve the problem
> > with backward compatibility by restoring a previous compatible
> > string as secondary one.
> >
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>
> Applied on mvebu/dt64
>

Thank you!
Marcin

>
> > ---
> >  arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> > index d9bbbfa4b4eb..4a23f65d475f 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> > +++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
> > @@ -29,6 +29,7 @@ cpu_clk: clock-cpu {
> >  };
> >
> >  &ap_sdhci0 {
> > -     compatible = "marvell,armada-ap807-sdhci";
> > +     compatible = "marvell,armada-ap807-sdhci",
> > +                  "marvell,armada-ap806-sdhci"; /* Backward compatibility */
> >  };
> >
> > --
> > 2.29.0
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
> --
> Gregory Clement, Bootlin
> Embedded Linux and Kernel engineering
> http://bootlin.com
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
index d9bbbfa4b4eb..4a23f65d475f 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap807.dtsi
@@ -29,6 +29,7 @@  cpu_clk: clock-cpu {
 };
 
 &ap_sdhci0 {
-	compatible = "marvell,armada-ap807-sdhci";
+	compatible = "marvell,armada-ap807-sdhci",
+		     "marvell,armada-ap806-sdhci"; /* Backward compatibility */
 };