[PATCH 09/31] rockchip: rk3399: Add a default spl-boot-order prop
Kever Yang
kever.yang at rock-chips.com
Tue Apr 23 13:02:27 CEST 2024
On 2024/4/1 04:28, Jonas Karlman wrote:
> A lot of RK3399 boards use a u-boot,spl-boot-order of "same-as-spl",
> &sdhci and &sdmmc.
>
> Move this to rk3399-u-boot.dtsi and make this default for boards
> currently missing a u-boot,spl-boot-order prop.
>
> The &spi_flash reference has been dropped from spl-boot-order now that
> boot source id is cached and "same-as-spl" can be resolved into the SPI
> flash node.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi | 1 -
> arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 -
> arch/arm/dts/rk3399-ficus-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-leez-p710-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4 ----
> arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 ------
> arch/arm/dts/rk3399-rock960-u-boot.dtsi | 5 -----
> arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +----
> arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
> arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi | 6 ------
> 15 files changed, 5 insertions(+), 69 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
> index a3f27566e438..6c07de98fa01 100644
> --- a/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-eaidk-610-u-boot.dtsi
> @@ -9,7 +9,6 @@
> / {
> chosen {
> stdout-path = "serial2:1500000n8";
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> };
> };
>
> diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> index dfce63e4d428..796ac9642399 100644
> --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> @@ -9,7 +9,6 @@
> / {
> chosen {
> stdout-path = "serial2:1500000n8";
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> };
> };
>
> diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> index 38e0897db91d..67b63a835238 100644
> --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> @@ -5,9 +5,3 @@
>
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-ddr3-1600.dtsi"
> -
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> index c58ad95d120a..1f5fda1d0f1d 100644
> --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-ddr3-1600.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &vdd_log {
> regulator-init-microvolt = <950000>;
> };
> diff --git a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
> index a7039d74a016..4a3b23e48313 100644
> --- a/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-khadas-edge-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &vdd_log {
> regulator-init-microvolt = <950000>;
> };
> diff --git a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
> index c638ce259731..03b596850635 100644
> --- a/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-leez-p710-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &vdd_log {
> regulator-init-microvolt = <950000>;
> };
> diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> index a9d10592d573..a126bbaf086f 100644
> --- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> @@ -5,12 +5,6 @@
>
> #include "rk3399-u-boot.dtsi"
>
> -/{
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &sdmmc {
> pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
> };
> diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> index 88a77cad8d43..83b0c44e9ec5 100644
> --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &spiflash, &sdmmc;
> - };
> -};
> -
> &edp {
> rockchip,panel = <&edp_panel>;
> };
> diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> index cabf0a9dae89..e29757590611 100644
> --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &rng {
> status = "okay";
> };
> diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> index c8f4418a7389..e390cf3abab5 100644
> --- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> @@ -7,10 +7,6 @@
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> / {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdhci, &sdmmc;
> - };
> -
> vcc_hub_en: vcc_hub_en-regulator {
> compatible = "regulator-fixed";
> enable-active-high;
> diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
> index 60122f3bcd6c..b3bfc77f7569 100644
> --- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
> @@ -6,12 +6,6 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
>
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
> -
> &sdhci {
> cap-mmc-highspeed;
> mmc-ddr-1_8v;
> diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> index c190089e2643..55716ba4df73 100644
> --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> @@ -7,10 +7,6 @@
> #include "rk3399-sdram-lpddr3-2GB-1600.dtsi"
>
> / {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -
> vdd_log: vdd-log {
> compatible = "pwm-regulator";
> pwms = <&pwm2 0 25000 1>;
> @@ -22,5 +18,4 @@
> regulator-init-microvolt = <950000>;
> vin-supply = <&vcc5v0_sys>;
> };
> -
> };
> diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> index 089732524a76..b15e5392c3cf 100644
> --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> @@ -5,11 +5,8 @@
>
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-lpddr4-100.dtsi"
> +
> / {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci;
> - };
> -
> smbios {
> compatible = "u-boot,sysinfo-smbios";
> smbios {
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index 87b173e59579..fe045ca81749 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -14,6 +14,10 @@
> spi1 = &spi1;
> };
>
> + chosen {
> + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> + };
> +
> cic: syscon at ff620000 {
> bootph-all;
> compatible = "rockchip,rk3399-cic", "syscon";
> diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi b/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi
> index 7c66e1145a50..946a0230dbb4 100644
> --- a/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399pro-rock-pi-n10-u-boot.dtsi
> @@ -5,9 +5,3 @@
>
> #include "rk3399pro-u-boot.dtsi"
> #include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
> -
> -/ {
> - chosen {
> - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> - };
> -};
More information about the U-Boot
mailing list