From: "Pali Rohár" <pali@kernel.org>
To: Stefan Roese <sr@denx.de>,
Konstantin Porotchkin <kostap@marvell.com>,
Marek Behun <marek.behun@nic.cz>,
Vladimir Vid <vladimir.vid@sartura.hr>,
Luka Perkov <luka.perkov@sartura.hr>,
Luis Torres <luis.torres@methode.com>,
Scott Roberts <scott.roberts@telus.com>,
Paul Arola <paul.arola@telus.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH u-boot-marvell 6/9] arm: a37xx: Update sdhci pointers to official DT bindings
Date: Mon, 14 Feb 2022 11:34:27 +0100 [thread overview]
Message-ID: <20220214103430.24242-7-pali@kernel.org> (raw)
In-Reply-To: <20220214103430.24242-1-pali@kernel.org>
In Linux kernel version of armada-37xx.dtsi file sdhci1 pointer refers to
sdhci@d0000 node and sdhci0 pointer to sdhci@d8000 node.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
arch/arm/dts/armada-3720-db.dts | 4 ++--
arch/arm/dts/armada-3720-espressobin.dts | 4 ++--
arch/arm/dts/armada-3720-turris-mox.dts | 2 +-
arch/arm/dts/armada-3720-uDPU-u-boot.dtsi | 2 +-
arch/arm/dts/armada-3720-uDPU.dts | 2 +-
arch/arm/dts/armada-37xx.dtsi | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 42e7ddd25c55..6272d83fc011 100644
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -98,14 +98,14 @@
status = "okay";
};
-&sdhci0 {
+&sdhci1 {
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&sdio_pins>;
status = "okay";
};
-&sdhci1 {
+&sdhci0 {
non-removable;
bus-width = <8>;
mmc-ddr-1_8v;
diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
index 360d521bbada..f59f82d91632 100644
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -104,7 +104,7 @@
phys = <&comphy2 0>;
};
-&sdhci0 {
+&sdhci1 {
pinctrl-names = "default";
pinctrl-0 = <&sdio_pins>;
bus-width = <4>;
@@ -114,7 +114,7 @@
};
/* U11 */
-&sdhci1 {
+&sdhci0 {
non-removable;
bus-width = <8>;
mmc-ddr-1_8v;
diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts
index d01757062fa5..a5ccb558ccd6 100644
--- a/arch/arm/dts/armada-3720-turris-mox.dts
+++ b/arch/arm/dts/armada-3720-turris-mox.dts
@@ -120,7 +120,7 @@
};
};
-&sdhci1 {
+&sdhci0 {
wp-inverted;
bus-width = <4>;
cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
index fdad90ad123f..cf8ae4412b97 100644
--- a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
+++ b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
@@ -28,6 +28,6 @@
};
};
-&sdhci1 {
+&sdhci0 {
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 58557c680a4d..319fbe7348ad 100644
--- a/arch/arm/dts/armada-3720-uDPU.dts
+++ b/arch/arm/dts/armada-3720-uDPU.dts
@@ -151,7 +151,7 @@
};
};
-&sdhci1 {
+&sdhci0 {
non-removable;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index 4c686c380cee..8ac481cb58f3 100644
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -251,7 +251,7 @@
};
};
- sdhci0: sdhci@d0000 {
+ sdhci1: sdhci@d0000 {
compatible = "marvell,armada-3700-sdhci",
"marvell,sdhci-xenon";
reg = <0xd0000 0x300
@@ -259,7 +259,7 @@
status = "disabled";
};
- sdhci1: sdhci@d8000 {
+ sdhci0: sdhci@d8000 {
compatible = "marvell,armada-3700-sdhci",
"marvell,sdhci-xenon";
reg = <0xd8000 0x300
--
2.20.1
next prev parent reply other threads:[~2022-02-14 10:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 10:34 [PATCH u-boot-marvell 0/9] arm: a37xx: Fix code and update DTS files to upstream version Pali Rohár
2022-02-14 10:34 ` [PATCH u-boot-marvell 1/9] rtc: ds1307: Add bindings for microchip, mcp7940x Pali Rohár
2022-02-15 9:23 ` [PATCH u-boot-marvell 1/9] rtc: ds1307: Add bindings for microchip,mcp7940x Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 2/9] phy: marvell: a3700: Update compatible string to official DT bindings Pali Rohár
2022-02-15 9:23 ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 3/9] usb: ehci: ehci-marvell: " Pali Rohár
2022-02-15 9:24 ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 4/9] watchdog: armada_37xx: Convert " Pali Rohár
2022-02-15 9:25 ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 5/9] arm: mvebu: turris_mox: Remove hardcoded ethernet node names Pali Rohár
2022-02-15 9:27 ` Stefan Roese
2022-02-14 10:34 ` Pali Rohár [this message]
2022-02-15 9:28 ` [PATCH u-boot-marvell 6/9] arm: a37xx: Update sdhci pointers to official DT bindings Stefan Roese
2022-02-15 9:32 ` Pali Rohár
2022-02-14 10:34 ` [PATCH u-boot-marvell 7/9] arm: a37xx: espressobin: Move U-Boot specific partitions node to -u-boot.dtsi Pali Rohár
2022-02-15 9:28 ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 8/9] arm: a37xx: espressobin: Explicitly enable eMMC node in -u-boot.dtsi Pali Rohár
2022-02-15 9:29 ` Stefan Roese
2022-02-14 10:34 ` [PATCH u-boot-marvell 9/9] arm: a37xx: Update DTS files to version from upstream Linux kernel Pali Rohár
2022-02-15 9:31 ` Stefan Roese
2022-02-17 15:37 ` [PATCH u-boot-marvell 0/9] arm: a37xx: Fix code and update DTS files to upstream version 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=20220214103430.24242-7-pali@kernel.org \
--to=pali@kernel.org \
--cc=kostap@marvell.com \
--cc=luis.torres@methode.com \
--cc=luka.perkov@sartura.hr \
--cc=marek.behun@nic.cz \
--cc=paul.arola@telus.com \
--cc=scott.roberts@telus.com \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
--cc=vladimir.vid@sartura.hr \
/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