[PATCH 02/12] rockchip: rk3568: Fix boot device detection

[Kever Yang]

On 2023/3/14 08:38, Jonas Karlman wrote:
> The boot source node path for emmc is using the old sdhci name.
> Replace with correct mmc name and also add same-as-spl to boot order.
>
> Fixes: 0d61f8e5f1c0 ("rockchip: rk3568: add boot device detection")
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk356x-u-boot.dtsi        | 2 +-
>   arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
> index 23316410496d..04a7b0a0f668 100644
> --- a/arch/arm/dts/rk356x-u-boot.dtsi
> +++ b/arch/arm/dts/rk356x-u-boot.dtsi
> @@ -12,7 +12,7 @@
>   	};
>   
>   	chosen {
> -		u-boot,spl-boot-order = &sdhci, &sdmmc0;
> +		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0;
>   	};
>   
>   	dmc: dmc {
> diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c
> index 4a08820a0937..69ef19cc85af 100644
> --- a/arch/arm/mach-rockchip/rk3568/rk3568.c
> +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c
> @@ -82,7 +82,7 @@ static struct mm_region rk3568_mem_map[] = {
>   };
>   
>   const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
> -	[BROM_BOOTSOURCE_EMMC] = "/sdhci at fe310000",
> +	[BROM_BOOTSOURCE_EMMC] = "/mmc at fe310000",
>   	[BROM_BOOTSOURCE_SPINOR] = "/spi at fe300000/flash at 0",
>   	[BROM_BOOTSOURCE_SD] = "/mmc at fe2b0000",
>   };