[PATCH 4/4] rockchip: rk3308: fix same-as-spl boot order

[Kever Yang]

On 2023/7/15 18:19, Pegorer Massimo wrote:
> Boot devices defined in rk3308.c and in rk3308.dtsi do not match, causing
> 'same-as-spl' feature not to work. Update DTS definitions, aligning to
> Linux kernel DTS and to other Rockchip DTS files, i.e. from dwmmc to mmc.
>
> Add rk3308-rock-pi-s.dtb in dtb-y targets for CONFIG_ROCKCHIP_RK3308.
>
> Signed-off-by: Massimo Pegorer <massimo.pegorer at vimar.com>

It would be better to sync the dtsi from mainline kernel, this patch is 
fine for it's the

same with the mainline kernel after change.


Reviewed-by: Kever Yang <kever.yang at rock-chips.com>


Thanks,
- Kever
> ---
>   arch/arm/dts/Makefile    | 3 ++-
>   arch/arm/dts/rk3308.dtsi | 6 +++---
>   2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 17f506a8fa..14c957d237 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -119,7 +119,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \
>   
>   dtb-$(CONFIG_ROCKCHIP_RK3308) += \
>   	rk3308-evb.dtb \
> -	rk3308-roc-cc.dtb
> +	rk3308-roc-cc.dtb \
> +	rk3308-rock-pi-s.dtb
>   
>   dtb-$(CONFIG_ROCKCHIP_RK3328) += \
>   	rk3328-evb.dtb \
> diff --git a/arch/arm/dts/rk3308.dtsi b/arch/arm/dts/rk3308.dtsi
> index a5c0b72ae0..9a152a8a90 100644
> --- a/arch/arm/dts/rk3308.dtsi
> +++ b/arch/arm/dts/rk3308.dtsi
> @@ -584,7 +584,7 @@
>   		status = "disabled";
>   	};
>   
> -	sdmmc: dwmmc at ff480000 {
> +	sdmmc: mmc at ff480000 {
>   		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
>   		reg = <0x0 0xff480000 0x0 0x4000>;
>   		max-frequency = <150000000>;
> @@ -599,7 +599,7 @@
>   		status = "disabled";
>   	};
>   
> -	emmc: dwmmc at ff490000 {
> +	emmc: mmc at ff490000 {
>   		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
>   		reg = <0x0 0xff490000 0x0 0x4000>;
>   		max-frequency = <150000000>;
> @@ -612,7 +612,7 @@
>   		status = "disabled";
>   	};
>   
> -	sdio: dwmmc at ff4a0000 {
> +	sdio: mmc at ff4a0000 {
>   		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";
>   		reg = <0x0 0xff4a0000 0x0 0x4000>;
>   		max-frequency = <150000000>;