mtd: nand: pxa3xx: use marvell, prefix for custom DT properties
Subsystems (3)
PATCH 1/1 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.
--- arch/arm/dts/armada-cp110.dtsi | 2 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/dts/armada-cp110.dtsi +1 -1
@@ -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>;
drivers/mtd/nand/raw/pxa3xx_nand.c +2 -2
@@ -1862,10 +1862,10 @@ static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *inreturn -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 ;/*
Signature · 1 line
2.34.0
Quoted 18 lines · Pierre Bourdon
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.
Quoted 6 lines
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 <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 26 lines
--- arch/arm/dts/armada-cp110.dtsi | 2 +- drivers/mtd/nand/raw/pxa3xx_nand.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)arch/arm/dts/armada-cp110.dtsi +1
-1@@ -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>;drivers/mtd/nand/raw/pxa3xx_nand.c +0
-0@@ -1862,10 +1862,10 @@ static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *inreturn -EINVAL ; }
drivers/mtd/nand/raw/pxa3xx_nand.c static int pxa3xx_nand_probe_dt(struct udevice *dev, struct pxa3xx_nand_info *in · line 1871
Quoted 10 lines
drivers/mtd/nand/raw/pxa3xx_nand.c +2
-2-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 ;/*
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]