From: "Neil Armstrong" <narmstrong@baylibre.com>
To: u-boot@lists.denx.de
Cc: u-boot-amlogic@groups.io, Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCH v2 2/9] ARM: meson: keep HW order for MMC devices
Date: Wed, 8 Sep 2021 16:17:21 +0200 [thread overview]
Message-ID: <20210908141728.585797-2-narmstrong@baylibre.com> (raw)
In-Reply-To: <20210908141728.585797-1-narmstrong@baylibre.com>
Since Linux commmit [1], the order is fixed with aliases, in order to keep the
MMC device order, set it back to HW order in U-Boot dtsi files.
[1] ab547c4fb39f ("arm64: dts: amlogic: Assign a fixed index to mmc devices")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm/dts/meson-g12-common-u-boot.dtsi | 7 +++++++
arch/arm/dts/meson-gx-u-boot.dtsi | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi
index 38fd3d3feb..b1f60b15c9 100644
--- a/arch/arm/dts/meson-g12-common-u-boot.dtsi
+++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi
@@ -5,6 +5,13 @@
*/
/ {
+ /* Keep HW order from U-boot */
+ aliases {
+ /delete-property/ mmc0;
+ /delete-property/ mmc1;
+ /delete-property/ mmc2;
+ };
+
soc {
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/meson-gx-u-boot.dtsi b/arch/arm/dts/meson-gx-u-boot.dtsi
index 17d2cb95c1..fb6952f1d8 100644
--- a/arch/arm/dts/meson-gx-u-boot.dtsi
+++ b/arch/arm/dts/meson-gx-u-boot.dtsi
@@ -5,6 +5,13 @@
*/
/ {
+ /* Keep HW order from U-boot */
+ aliases {
+ /delete-property/ mmc0;
+ /delete-property/ mmc1;
+ /delete-property/ mmc2;
+ };
+
soc {
u-boot,dm-pre-reloc;
};
--
2.25.1
next prev parent reply other threads:[~2021-09-08 14:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-08 14:17 [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14 Neil Armstrong
2021-09-08 14:17 ` Neil Armstrong [this message]
2021-09-08 14:17 ` [PATCH v2 3/9] ARM: meson-axg: remove local USB nodes Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 4/9] configs: meson64: add SCSI boot target Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 5/9] distro_bootcmd: run pci enum for scsi_boot just like it is done for nvme_boot Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 6/9] ARM: amlogic: add support for Odroid-HC4 device Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 7/9] doc: boards: amlogic: update for Odroid HC4 Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 8/9] ARM: meson: add Beelink GS-King X board Neil Armstrong
2021-09-08 14:17 ` [PATCH v2 9/9] ARM: amlogic: add Banana Pi M5 Neil Armstrong
2021-09-08 15:46 ` [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14 Tom Rini
2021-09-09 9:42 ` Neil Armstrong
2021-09-09 11:29 ` Tom Rini
[not found] ` <978e5c89-fafb-def9-a9ca-f6891f46eef2@lexina.in>
2021-09-15 8:15 ` Neil Armstrong
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=20210908141728.585797-2-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=u-boot-amlogic@groups.io \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).