[PATCH 01/12] rockchip: Fix early use of bootph props

[Kever Yang]

Hi Jonas,

On 2023/3/14 08:38, Jonas Karlman wrote:
> Running U-Boot on a ROCK 3 Model A result in the following:
>
>    No serial driver found
>    resetting ...
>    no sysreset
>    ### ERROR ### Please RESET the board ###
>
> Replace bootph- props with u-boot,dm- props to fix this.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>

Sorry, my mistake, I though the patch series [0] has been apply to 
master, but it's in next for now.

We may need another fix after next merge to master next month.

I will apply this frist for this release.


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

Thanks,
- Kever

[0] 
https://patchwork.ozlabs.org/project/uboot/cover/20230213155641.1208774-1-sjg@chromium.org/


> ---
>   arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi        |  2 +-
>   arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi     |  2 +-
>   arch/arm/dts/rk3568-rock-3a-u-boot.dtsi          |  2 +-
>   arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi |  2 +-
>   arch/arm/dts/rk3588s-u-boot.dtsi                 | 14 +++++++-------
>   5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
> index a27a3adc082b..27735c49ddc0 100644
> --- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi
> @@ -11,7 +11,7 @@
>   };
>   
>   &uart0 {
> -	bootph-all;
> +	u-boot,dm-pre-reloc;
>   	clock-frequency = <24000000>;
>   	status = "okay";
>   };
> diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
> index 4e791738335f..589332503e72 100644
> --- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
> +++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
> @@ -13,6 +13,6 @@
>   
>   &uart2 {
>   	clock-frequency = <24000000>;
> -	bootph-all;
> +	u-boot,dm-pre-reloc;
>   	status = "okay";
>   };
> diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> index ed47efa44bf9..b5ca23a82a20 100644
> --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
> @@ -19,6 +19,6 @@
>   
>   &uart2 {
>   	clock-frequency = <24000000>;
> -	bootph-all;
> +	u-boot,dm-pre-reloc;
>   	status = "okay";
>   };
> diff --git a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
> index 3235bd36e4c8..612966492b02 100644
> --- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
> @@ -18,7 +18,7 @@
>   
>   &sdmmc {
>   	bus-width = <4>;
> -	bootph-all;
> +	u-boot,dm-pre-reloc;
>   	u-boot,spl-fifo-mode;
>   	status = "okay";
>   };
> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
> index 1e225d71efc2..f880f4a16741 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -8,12 +8,12 @@
>   / {
>   	dmc {
>   		compatible = "rockchip,rk3588-dmc";
> -		bootph-all;
> +		u-boot,dm-pre-reloc;
>   		status = "okay";
>   	};
>   
>   	pmu1_grf: syscon at fd58a000 {
> -		bootph-all;
> +		u-boot,dm-pre-reloc;
>   		compatible = "rockchip,rk3588-pmu1-grf", "syscon";
>   		reg = <0x0 0xfd58a000 0x0 0x2000>;
>   	};
> @@ -46,26 +46,26 @@
>   };
>   
>   &xin24m {
> -	bootph-all;
> +	u-boot,dm-pre-reloc;
>   	status = "okay";
>   };
>   
>   &cru {
> -	bootph-pre-ram;
> +	u-boot,dm-spl;
>   	status = "okay";
>   };
>   
>   &sys_grf {
> -	bootph-pre-ram;
> +	u-boot,dm-spl;
>   	status = "okay";
>   };
>   
>   &uart2 {
>   	clock-frequency = <24000000>;
> -	bootph-pre-ram;
> +	u-boot,dm-spl;
>   	status = "okay";
>   };
>   
>   &ioc {
> -	bootph-pre-ram;
> +	u-boot,dm-spl;
>   };