From bce92d16b230b8e93c2831fb7768839fd7bbab04 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Tue, 9 Aug 2022 16:54:21 +0800 Subject: [PATCH] arm64: dts: rockchip: Add mmc aliases for linux This series in order to have the default MMC alias. The mmc default alias: mmc0 = &sdhci; mmc1 = &sdmmc; mmc2 = &sdio0; The Linux OS have the post-build.sh to handle the rootfs, and export RK_EXTRA_PARTITIONS for setting the PARTITIONS. Signed-off-by: Caesar Wang Change-Id: I27b5645200a645bee6c3dc2f4e95cdb23ba19ab8 --- arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi | 6 ++++++ arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi | 7 +++++++ arch/arm64/boot/dts/rockchip/rk3588-linux.dtsi | 4 ++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi index c5a8bdf3ecd5..623431e2e355 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -7,6 +7,12 @@ / { compatible = "rockchip,linux", "rockchip,rk3326"; + aliases { + mmc0 = &emmc; + mmc1 = &sdmmc; + mmc2 = &sdio; + }; + chosen { bootargs = "earlycon=uart8250,mmio32,0xff160000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootwait"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index e5ad7a454524..41ed525e9e38 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -10,6 +10,12 @@ / { compatible = "rockchip,linux", "rockchip,rk3399"; + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc; + mmc2 = &sdio0; + }; + chosen { bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait coherent_pool=1m"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi index a31b7f260770..243ebfcc3b8f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi @@ -5,6 +5,13 @@ */ / { + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc0; + mmc2 = &sdmmc1; + mmc3 = &sdmmc2; + }; + chosen: chosen { bootargs = "earlycon=uart8250,mmio32,0xfe660000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-linux.dtsi index 98eea59238d1..47cef65710ca 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-linux.dtsi @@ -7,8 +7,8 @@ / { aliases { mmc0 = &sdhci; - mmc1 = &sdio; - mmc2 = &sdmmc; + mmc1 = &sdmmc; + mmc2 = &sdio; }; chosen: chosen {