[PATCH COVER] rockchip: rk3399: fix SPI-NOR flash not found in U-Boot pre-reloc

[Jonas Karlman]

Hi Quentin,

On 2024-06-17 15:10, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at cherry.de>
> 
> In commit 100f489f58a6 ("rockchip: rk3399: Fix loading FIT from SD-card
> when booting from eMMC"), the spi1 bootph properties were mistakenly
> removed meaning, so re-add them back to fix SPI-NOR flash not being
> found in U-Boot pre-reloc as required for RK3399 Puma.

Good catch, for TPL/SPL the bootph props is propagated, something that
is not done for pre-reloc.

> 
> Fixes: 100f489f58a6 ("rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC")
> Signed-off-by: Quentin Schulz <quentin.schulz at cherry.de>

Reviewed-by: Jonas Karlman <jonas at kwiboo.se>

Regards,
Jonas

> ---
>  arch/arm/dts/rk3399-u-boot.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index b6b43271172..2bec139d833 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -145,6 +145,11 @@
>  	bootph-some-ram;
>  };
>  
> +&spi1 {
> +	bootph-pre-ram;
> +	bootph-some-ram;
> +};
> +
>  &spi1_clk {
>  	bootph-pre-ram;
>  	bootph-some-ram;
> 
> ---
> base-commit: 2248c96ea1cf0b65377040d9f87ce7d8cf534c63
> change-id: 20240617-rk3399-fix-d8c8d3ce844e
> 
> Best regards,