mtd: nand: pxa3xx: use marvell, prefix for custom DT properties

The DT properties for the "enable-arbiter" and "keep-config" config
knobs were previously named inconsistently:

- The u-boot driver used "nand-enable-arbiter" and "nand-keep-config"
  names, without Marvell prefixes.

- The Linux driver uses "marvell,nand-keep-config" ("enable-arbiter"
  does not exist anymore in recent kernels, but it also used to be
  "marvell,nand-enable-arbiter").

- The device trees almost all use "marvell," prefixed names, except for
  one single instance of "nand-enable-arbiter" without vendor prefix.

This commit standardizes on the vendor prefixed version, making the
u-boot driver read from DT props "marvell,nand-enable-arbiter" and
"marvell,nand-keep-config". The one device tree using the unprefixed
version is also changed to use the new naming.

This has the side effect of making the previously no-op "marvell,"
config knobs already present in some DTs actually do something. This was
likely the original intention of the DT authors, but note that this
commit was not tested on every single impacted board.

Signed-off-by: Pierre Bourdon <delroth@gmail.com>

diff --git a/arch/arm/dts/armada-cp110.dtsi b/arch/arm/dts/armada-cp110.dtsi
index abf1e4ea0876c2b7e537887c9eb792ca2afcfff7..ddc10d23740c36e594728796333dceb9fe8a8d74 100644 (file)
--- a/arch/arm/dts/armada-cp110.dtsi
+++ b/arch/arm/dts/armada-cp110.dtsi
@@ -231,7 +231,7 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                clocks = <&CP110_LABEL(syscon0) 1 2>;
-                               nand-enable-arbiter;
+                               marvell,nand-enable-arbiter;
                                num-cs = <1>;
                                nand-ecc-strength = <8>;
                                nand-ecc-step-size = <512>;

diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c
index 8ff58a703876e2ba8dc430591be0c0620684e697..3a9c9ca508df5f42731ae9f94bc58b55ecec0a2c 100644 (file)
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@@ -1862,10 +1862,10 @@ static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *in
                return -EINVAL;
        }
 
-       if (dev_read_bool(dev, "nand-enable-arbiter"))
+       if (dev_read_bool(dev, "marvell,nand-enable-arbiter"))
                pdata->enable_arbiter = 1;
 
-       if (dev_read_bool(dev, "nand-keep-config"))
+       if (dev_read_bool(dev, "marvell,nand-keep-config"))
                pdata->keep_config = 1;
 
        /*