[PATCH 1/4] arm: mvebu: Fix compatible string for nand controller

[Pali Rohár]

On Wednesday 27 July 2022 14:55:51 Michael Nazzareno Trimarchi wrote:
> Hi Pali
> 
> On Wed, Jul 27, 2022 at 2:49 PM Pali Rohár <pali at kernel.org> wrote:
> >
> > Linux kernel uses compatible string "marvell,armada370-nand-controller" for
> > nand controllers on Armada 370/XP/38x. U-Boot currently uses mix of
> > "marvell,armada370-nand" and "marvell,mvebu-pxa3xx-nand".
> >
> > So unify it and use just Linux kernel compatible string.
> >
> > Signed-off-by: Pali Rohár <pali at kernel.org>
> > ---
> >  arch/arm/dts/armada-370-xp.dtsi                  | 2 +-
> >  arch/arm/dts/armada-375.dtsi                     | 2 +-
> >  arch/arm/dts/armada-38x.dtsi                     | 2 +-
> >  arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 2 +-
> >  drivers/mtd/nand/raw/pxa3xx_nand.c               | 2 +-
> >  5 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi
> > index 50fc0be9f73b..4cd168c95784 100644
> > --- a/arch/arm/dts/armada-370-xp.dtsi
> > +++ b/arch/arm/dts/armada-370-xp.dtsi
> > @@ -246,7 +246,7 @@
> >                         };
> >
> >                         nand at d0000 {
> > -                               compatible = "marvell,armada370-nand";
> > +                               compatible = "marvell,armada370-nand-controller";
> >                                 reg = <0xd0000 0x54>;
> >                                 #address-cells = <1>;
> >                                 #size-cells = <1>;
> > diff --git a/arch/arm/dts/armada-375.dtsi b/arch/arm/dts/armada-375.dtsi
> > index ff0ad7a9c7fd..fcb9245fd496 100644
> > --- a/arch/arm/dts/armada-375.dtsi
> > +++ b/arch/arm/dts/armada-375.dtsi
> > @@ -541,7 +541,7 @@
> >                         };
> >
> >                         nand at d0000 {
> > -                               compatible = "marvell,armada370-nand";
> > +                               compatible = "marvell,armada370-nand-controller";
> >                                 reg = <0xd0000 0x54>;
> >                                 #address-cells = <1>;
> >                                 #size-cells = <1>;
> > diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi
> > index 061bd7852081..6979c0c50584 100644
> > --- a/arch/arm/dts/armada-38x.dtsi
> > +++ b/arch/arm/dts/armada-38x.dtsi
> > @@ -555,7 +555,7 @@
> >                         };
> >
> >                         nand_controller: nand-controller at d0000 {
> > -                               compatible = "marvell,armada370-nand","marvell,mvebu-pxa3xx-nand";
> > +                               compatible = "marvell,armada370-nand-controller";
> >                                 reg = <0xd0000 0x54>;
> >                                 #address-cells = <1>;
> >                                 #size-cells = <0>;
> > diff --git a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
> > index 90cad85506d0..fdbe168a8734 100644
> > --- a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
> > +++ b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
> > @@ -5,7 +5,7 @@
> >  };
> >
> >  &nand_controller {
> > -       compatible="marvell,mvebu-pxa3xx-nand";
> > +       compatible="marvell,armada370-nand-controller";
> >         status = "okay";
> >         label = "pxa3xx_nand-0";
> >         nand-rb = <0>;
> > diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
> > index 20d1aee7b3e1..9c29e8a6c214 100644
> > --- a/drivers/mtd/nand/raw/pxa3xx_nand.c
> > +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
> > @@ -429,7 +429,7 @@ static struct nand_ecclayout ecc_layout_8KB_bch8bit = {
> >
> >  static const struct udevice_id pxa3xx_nand_dt_ids[] = {
> >         {
> > -               .compatible = "marvell,mvebu-pxa3xx-nand",
> > +               .compatible = "marvell,armada370-nand-controller",
> >                 .data = PXA3XX_NAND_VARIANT_ARMADA370,
> >         },
> >         {
> > --
> 
> I prefer that adding compatible go in a different patch

Hello! All this are fixes for Armada DTS files, so I put it into series
which updates Armada 38x DTS files. But to do not introduce a build or
runtime error, it is needed to fix compatible string also in
pxa3xx_nand driver in the same patch. Meaning, it has to be atomic
change.

> Michael
> 
> 
> > 2.20.1
> >