arm64: dts: amlogic: Assign a fixed index to mmc devices

Recently introduced async probe on mmc devices can shuffle block IDs.
Pin them to fixed values to ease booting in environments where UUIDs
are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/

Commit message taken from commit 0011c6d18277 ("arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards.")

The unconventional order (B, C, A) is due to the fact that sd_emmc_a is
(according to the comments) only used for SDIO.

AFAICS all boards either have both sd_emmc_b and sd_emmc_c or only one of
them enabled. So the alias order should match the previous non-async order
for all of them.

Signed-off-by: Alexander Stein <alexander.stein@mailbox.org>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20210203192824.854491-1-alexander.stein@mailbox.org

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index b858c5e..3dd2a5a 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -17,6 +17,12 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       aliases {
+               mmc0 = &sd_emmc_b; /* SD card */
+               mmc1 = &sd_emmc_c; /* eMMC */
+               mmc2 = &sd_emmc_a; /* SDIO */
+       };
+
        chosen {
                #address-cells = <2>;
                #size-cells = <2>;

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 0edd137..3d00404 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -20,6 +20,12 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
+       aliases {
+               mmc0 = &sd_emmc_b; /* SD card */
+               mmc1 = &sd_emmc_c; /* eMMC */
+               mmc2 = &sd_emmc_a; /* SDIO */
+       };
+
        reserved-memory {
                #address-cells = <2>;
                #size-cells = <2>;