Skip to content

Commit

Permalink
arm64: dts: amlogic: Assign a fixed index to mmc devices
Browse files Browse the repository at this point in the history
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 0011c6d ("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
  • Loading branch information
Alexander Stein authored and khilman committed Mar 31, 2021
1 parent 0e9fed9 commit ab547c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
Expand Up @@ -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>;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/amlogic/meson-gx.dtsi
Expand Up @@ -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>;
Expand Down

0 comments on commit ab547c4

Please sign in to comment.