From: "Pali Rohár" <pali@kernel.org>
To: Stefan Roese <sr@denx.de>
Cc: "Marek Behún" <kabel@kernel.org>,
"Chris Packham" <judge.packham@gmail.com>,
u-boot@lists.denx.de
Subject: [PATCH 1/4] arm: mvebu: Fix compatible string for nand controller
Date: Wed, 27 Jul 2022 14:47:35 +0200 [thread overview]
Message-ID: <20220727124738.32414-1-pali@kernel.org> (raw)
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@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@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,
},
{
--
2.20.1
next reply other threads:[~2022-07-27 12:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 12:47 Pali Rohár [this message]
2022-07-27 12:47 ` [PATCH 2/4] arm: mvebu: Synchronize armada-38x.dtsi with Linux v5.20 Pali Rohár
2022-07-28 6:39 ` Stefan Roese
2022-07-29 12:02 ` Stefan Roese
2022-07-27 12:47 ` [PATCH 3/4] arm: mvebu: Synchronize armada-385.dtsi " Pali Rohár
2022-07-28 6:39 ` Stefan Roese
2022-07-29 12:02 ` Stefan Roese
2022-07-27 12:47 ` [PATCH 4/4] arm: mvebu: Synchronize armada-385-turris-omnia " Pali Rohár
2022-07-28 6:39 ` Stefan Roese
2022-07-29 12:02 ` Stefan Roese
2022-07-27 12:55 ` [PATCH 1/4] arm: mvebu: Fix compatible string for nand controller Michael Nazzareno Trimarchi
2022-07-27 18:40 ` Pali Rohár
2022-07-27 18:41 ` Michael Nazzareno Trimarchi
2022-07-27 18:43 ` Pali Rohár
2022-07-27 18:47 ` Michael Nazzareno Trimarchi
2022-07-28 6:22 ` Stefan Roese
2022-07-28 6:38 ` Stefan Roese
2022-07-28 7:45 ` Michael Nazzareno Trimarchi
2022-07-29 9:38 ` Michael Nazzareno Trimarchi
2022-07-29 9:39 ` Stefan Roese
2022-07-29 12:02 ` Stefan Roese
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220727124738.32414-1-pali@kernel.org \
--to=pali@kernel.org \
--cc=judge.packham@gmail.com \
--cc=kabel@kernel.org \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox