From 5bfc198162a1870db4dfa0c3ec2882e82bd4abd1 Mon Sep 17 00:00:00 2001 From: Johan Jonker Date: Mon, 18 Jan 2021 16:52:40 +0100 Subject: [PATCH] UPSTREAM: arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards 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 sort order is based on reg address. [1] https://patchwork.kernel.org/patch/11747669/ Change-Id: I3a61c02162e975b1ba4f8635b36965f99f0b60d7 Signed-off-by: Johan Jonker Link: https://lore.kernel.org/r/20210118155242.7172-3-jbx6244@gmail.com Signed-off-by: Heiko Stuebner Signed-off-by: Wenping Zhang Signed-off-by: Tao Huang (cherry picked from commit 84b2c2c872da14971cbe9d946cd4687e1e3c1422) --- arch/arm64/boot/dts/rockchip/px30.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/px30.dtsi b/arch/arm64/boot/dts/rockchip/px30.dtsi index a9ff92589294..69ceda7ab903 100644 --- a/arch/arm64/boot/dts/rockchip/px30.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30.dtsi @@ -30,6 +30,9 @@ i2c1 = &i2c1; i2c2 = &i2c2; i2c3 = &i2c3; + mmc0 = &sdmmc; + mmc1 = &sdio; + mmc2 = &emmc; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2;