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>

diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi
index 38fd3d3febc82f4447ab32422fb4b089382c3446..b1f60b15c9c1f1039f475b06219cbdeacbd49766 100644 (file)
--- 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 17d2cb95c13fb57f5e925a87ecf8c5163062a8e8..fb6952f1d815707e5b74f5296ed91d8c58b4bae2 100644 (file)
--- 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;
        };