aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNeil Armstrong <narmstrong@baylibre.com>2021-09-17 09:37:02 +0200
committerNeil Armstrong <narmstrong@baylibre.com>2021-10-07 10:14:50 +0200
commit535dcb55a5d38f69e619abef97a5643d70e3f88f (patch)
treec64ef4154507fa8181af3d83973e806b3fd95a8f /arch
parentc7c085858616152fcab804bd8c14350ce181d241 (diff)
downloadu-boot-535dcb55a5d38f69e619abef97a5643d70e3f88f.zip
u-boot-535dcb55a5d38f69e619abef97a5643d70e3f88f.tar.gz
u-boot-535dcb55a5d38f69e619abef97a5643d70e3f88f.tar.bz2
ARM: meson: keep HW order for MMC devices
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/meson-g12-common-u-boot.dtsi7
-rw-r--r--arch/arm/dts/meson-gx-u-boot.dtsi7
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi
index 38fd3d3..b1f60b1 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 17d2cb9..fb6952f 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;
};