On 29.07.22 11:38, Michael Nazzareno Trimarchi wrote:
Hi Stefan
On Thu, Jul 28, 2022 at 9:45 AM Michael Nazzareno Trimarchi
<[email protected]> wrote:
Hi
On Thu, Jul 28, 2022 at 8:39 AM Stefan Roese <[email protected]> wrote:
On 27.07.22 14:47, Pali Rohár 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 <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
Acked-by: Michael Trimarchi <[email protected]>
Are you going to queue them?
Yes. Is this okay with you?
Thanks,
Stefan
Michael
Michael
Thanks,
Stefan
---
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@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@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@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,
},
{
Viele Grüße,
Stefan Roese
--
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]
--
Michael Nazzareno Trimarchi
Co-Founder & Chief Executive Officer
M. +39 347 913 2170
[email protected]
__________________________________
Amarula Solutions BV
Joop Geesinkweg 125, 1114 AB, Amsterdam, NL
T. +31 (0)85 111 9172
[email protected]
www.amarulasolutions.com
Viele Grüße,
Stefan Roese
--
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]
