rockchip: rk3588: Add default u-boot,spl-boot-order prop

Add a default u-boot,spl-boot-order prop to rk3588s-u-boot.dtsi and
remove the prop from board u-boot.dtsi files using the default value.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Eugen Hristev <eugen.hristev@collabora.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
index 87831c9d432ae640caf16d2301ee51540360c9a0..60494bb8485f7b7f16a3f94c823ca38915661625 100644 (file)
--- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
@@ -6,12 +6,6 @@
 
 #include "rk3588-u-boot.dtsi"
 
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
 &fspim1_pins {
        bootph-all;
 };

diff --git a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
index b0f5c667197c0f7bf73ba23ac02089522d2049c4..5d5fa6ffb214d4cbd795ca7ef8f0650be42b1a15 100644 (file)
--- a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
@@ -2,12 +2,6 @@
 
 #include "rk3588-u-boot.dtsi"
 
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
 &fspim1_pins {
        bootph-all;
 };

diff --git a/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi b/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
index 191ec988c459c45354d86175e5914f356b7c6943..7b937943a53c7bf2c592a97b4e233be3a0d72a64 100644 (file)
--- a/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
@@ -4,9 +4,3 @@
  */
 
 #include "rk3588-u-boot.dtsi"
-
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 5fa20cecc044a39bbc2fcb24cb3bdb5afcd14db4..e99e60185ebebc61dc3f7e6b69e039cd78ad9930 100644 (file)
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -7,10 +7,6 @@
 #include <dt-bindings/usb/pd.h>
 
 / {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-
        vcc12v_dcin: vcc12v-dcin-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";

diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
index 06c6f327c14b92ac97465f1751f9065d4c0345ee..e791b572b6bf80c6b236afb790f4ddcf21071b34 100644 (file)
--- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
@@ -6,12 +6,6 @@
 
 #include "rk3588-u-boot.dtsi"
 
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;

diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
index 584476f77b13cf0e52336bd4b054829ea975d4f8..9a6a353088df0e9e2357ea9d334aac72eb472f99 100644 (file)
--- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
@@ -5,12 +5,6 @@
 
 #include "rk3588s-u-boot.dtsi"
 
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
 &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;

diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index d251a210b3136d90d94a4515c38093d9eef26c46..945b2d62a75e5d489dacaf26e7c18b2afc733a94 100644 (file)
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -10,6 +10,10 @@
                spi5 = &sfc;
        };
 
+       chosen {
+               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
+       };
+
        dmc {
                compatible = "rockchip,rk3588-dmc";
                bootph-all;