Revert "rockchip: Fix early use of bootph props"
While this change is correct for v2023.04 it is not correct for next
(where this is right now) nor post-v2023.04.
This reverts commit 8653e5d3b745925fced5fa6897c92f4a46ec2757.
Signed-off-by: Tom Rini <trini@konsulko.com>
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 27735c4..a27a3ad 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 {
- u-boot,dm-pre-reloc;
+ bootph-all;
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 5893325..4e79173 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>;
- u-boot,dm-pre-reloc;
+ bootph-all;
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 04bbb01..9ef1e84 100644
--- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
@@ -23,6 +23,6 @@
&uart2 {
clock-frequency = <24000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
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 6129664..3235bd3 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>;
- u-boot,dm-pre-reloc;
+ bootph-all;
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 f880f4a..1e225d7 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";
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
pmu1_grf: syscon@fd58a000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "rockchip,rk3588-pmu1-grf", "syscon";
reg = <0x0 0xfd58a000 0x0 0x2000>;
};
@@ -46,26 +46,26 @@
};
&xin24m {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
&cru {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&sys_grf {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&uart2 {
clock-frequency = <24000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&ioc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};