From acae66eab6e5a815e489565ea98524f6d4b9d3a7 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Wed, 3 Feb 2021 17:03:42 +0000 Subject: [PATCH 20/58] FROMLIST(v2): 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]. 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. [1] https://patchwork.kernel.org/patch/11747669/ Signed-off-by: Alexander Stein --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 3a4f20506a61..bd6e48e3c51a 100644 --- 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; + mmc1 = &sd_emmc_c; + mmc2 = &sd_emmc_a; + }; + 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 cf9eb7c8a6f0..14ff467c6be8 100644 --- 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; + mmc1 = &sd_emmc_c; + mmc2 = &sd_emmc_a; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; -- 2.25.1