Hi Jonas,

On 3/29/24 20:01, Jonas Karlman wrote:

[...]

diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index e4171bd24d2a..a502a82fae6a 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -121,31 +121,35 @@
  };
&cru {
-       bootph-pre-ram;
+       bootph-all;
  };
&emmc_bus8 {
-       bootph-all;
+       bootph-pre-ram;
  };
&emmc_clk {
-       bootph-all;
+       bootph-pre-ram;
  };
&emmc_cmd {
-       bootph-all;
+       bootph-pre-ram;
  };
&emmc_data_strobe {
-       bootph-all;
+       bootph-pre-ram;
  };
&emmc_rstnout {
-       bootph-all;
+       bootph-pre-ram;
  };
&ioc {
-       bootph-pre-ram;
+       bootph-all;
+};
+
+&pcfg_pull_down {
+       bootph-all;
  };
&pcfg_pull_none {
@@ -157,6 +161,10 @@
  };
&pcfg_pull_up_drv_level_2 {
+       bootph-pre-ram;
+};
+
+&php_grf {
        bootph-all;
  };
@@ -189,19 +197,23 @@
  };
&sdmmc_bus4 {
-       bootph-all;
+       bootph-pre-ram;
  };
&sdmmc_clk {
-       bootph-all;
+       bootph-pre-ram;
  };
&sdmmc_cmd {
-       bootph-all;
+       bootph-pre-ram;
  };
&sdmmc_det {
-       bootph-all;
+       bootph-pre-ram;
+};
+

Please add bootph-some-ram to all nodes related to eMMC/SD card otherwise I assume some boards won't work anymore (e.g. the ones that need to find MMC devices through DT in arch_env_get_location, e.g. Theobroma's Jaguar (and soon Tiger)).

c.f. https://source.denx.de/u-boot/u-boot/-/commit/70f9212d61fe79c605b805c6eb0764b29f8ae3b6

It was not easy to have this merged, so I'd prefer to avoid having to go through it again to fix my board(s) :)

It'd be nice to split this into multiple commits so we can have some individual justification of why such a change is made, so that we know if we need to revert/update it in the future.

Cheers,
Quentin

Reply via email to