aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Karlman <jonas@kwiboo.se>2023-03-14 00:38:21 +0000
committerKever Yang <kever.yang@rock-chips.com>2023-03-19 13:17:28 +0800
commit8653e5d3b745925fced5fa6897c92f4a46ec2757 (patch)
tree4334aff781589202b93a18eb5000a4f5ce521c62
parent318af47668aa2347ca9bbf2114cb9af1d8739aca (diff)
downloadu-boot-8653e5d3b745925fced5fa6897c92f4a46ec2757.zip
u-boot-8653e5d3b745925fced5fa6897c92f4a46ec2757.tar.gz
u-boot-8653e5d3b745925fced5fa6897c92f4a46ec2757.tar.bz2
rockchip: Fix early use of bootph props
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@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
-rw-r--r--arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi2
-rw-r--r--arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi2
-rw-r--r--arch/arm/dts/rk3568-rock-3a-u-boot.dtsi2
-rw-r--r--arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi2
-rw-r--r--arch/arm/dts/rk3588s-u-boot.dtsi14
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 a27a3ad..27735c4 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 4e79173..5893325 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 ed47efa..b5ca23a 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 3235bd3..6129664 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 1e225d7..f880f4a 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@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;
};