diff mbox series

[05/13] rockchip: rk3288-tinker: Include mmc nodes in pre-reloc for env load

Message ID 20241105160054.1373319-6-jonas@kwiboo.se
State New
Delegated to: Kever Yang
Headers show
Series rockchip: rk3288-tinker: Migrate to OF_UPSTREAM | expand

Commit Message

Jonas Karlman Nov. 5, 2024, 4 p.m. UTC
Include mmc related nodes in U-Boot proper pre-reloc phase to ensure
environment can be loaded from mmc devices.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 5 +++++
 arch/arm/dts/rk3288-tinker-u-boot.dtsi   | 7 +++++++
 2 files changed, 12 insertions(+)

Comments

Kever Yang Nov. 6, 2024, 10:19 a.m. UTC | #1
On 2024/11/6 00:00, Jonas Karlman wrote:
> Include mmc related nodes in U-Boot proper pre-reloc phase to ensure
> environment can be loaded from mmc devices.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3288-tinker-s-u-boot.dtsi | 5 +++++
>   arch/arm/dts/rk3288-tinker-u-boot.dtsi   | 7 +++++++
>   2 files changed, 12 insertions(+)
>
> diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
> index a782f2f9804a..614d47ce1801 100644
> --- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
> @@ -15,20 +15,25 @@
>   
>   &emmc {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &emmc_bus8 {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &emmc_clk {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &emmc_cmd {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &emmc_pwr {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
> diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> index 4f230739f1c3..7568b1495341 100644
> --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
> @@ -33,6 +33,7 @@
>   
>   &pcfg_pull_none_drv_8ma {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &pcfg_pull_up {
> @@ -41,26 +42,32 @@
>   
>   &pcfg_pull_up_drv_8ma {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &sdmmc {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &sdmmc_bus4 {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &sdmmc_cd {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &sdmmc_clk {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &sdmmc_cmd {
>   	bootph-pre-ram;
> +	bootph-some-ram;
>   };
>   
>   &uart2 {
diff mbox series

Patch

diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
index a782f2f9804a..614d47ce1801 100644
--- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
@@ -15,20 +15,25 @@ 
 
 &emmc {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &emmc_bus8 {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &emmc_clk {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &emmc_cmd {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &emmc_pwr {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
index 4f230739f1c3..7568b1495341 100644
--- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
@@ -33,6 +33,7 @@ 
 
 &pcfg_pull_none_drv_8ma {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &pcfg_pull_up {
@@ -41,26 +42,32 @@ 
 
 &pcfg_pull_up_drv_8ma {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &sdmmc {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &sdmmc_bus4 {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &sdmmc_cd {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &sdmmc_clk {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &sdmmc_cmd {
 	bootph-pre-ram;
+	bootph-some-ram;
 };
 
 &uart2 {