rockchip: rk3588-rock-5b: Include eMMC node in SPL dtb

Add sdhci node to SPL and u-boot,spl-boot-order. Also add more supported
mmc modes and pinctrl.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 4c6f0311d6a1f3b347a4d633c606c81709566b7a..85075bf435f9de42d2cc69fd38f4c95fad7ae6df 100644 (file)
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -7,11 +7,11 @@
 
 / {
        aliases {
-               mmc0 = &sdmmc;
+               mmc1 = &sdmmc;
        };
 
        chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc;
+               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
        };
 };
 
@@ -19,3 +19,11 @@
        bus-width = <4>;
        status = "okay";
 };
+
+&sdhci {
+       cap-mmc-highspeed;
+       mmc-ddr-1_8v;
+       mmc-hs200-1_8v;
+       pinctrl-names = "default";
+       pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_data_strobe &emmc_rstnout>;
+};

diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index 76a8ffe8c33ce2081373c2bf834c668717493d8c..5201ba246d87e441f3290fb01da0947c084f553c 100644 (file)
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -65,6 +65,10 @@
        u-boot,spl-fifo-mode;
 };
 
+&sdhci {
+       bootph-pre-ram;
+};
+
 &uart2 {
        clock-frequency = <24000000>;
        bootph-pre-ram;