[PATCH v2 14/17] rockchip: rk3588-rock-5b: Include eMMC node in SPL dtb

[Kever Yang]

On 2023/4/19 00:46, Jonas Karlman wrote:
> 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 at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever

> ---
> v2:
> - Change u-boot,dm-spl to bootph-pre-ram
>
>   arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 12 ++++++++++--
>   arch/arm/dts/rk3588s-u-boot.dtsi        |  4 ++++
>   2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index 4c6f0311d6a1..85075bf435f9 100644
> --- 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 3cb22f35420e..48fa94ab4039 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -59,6 +59,10 @@
>   	u-boot,spl-fifo-mode;
>   };
>   
> +&sdhci {
> +	bootph-pre-ram;
> +};
> +
>   &uart2 {
>   	clock-frequency = <24000000>;
>   	bootph-pre-ram;