Re: [PATCH 1/2] arm64: dts: rockchip: Fix spl-boot-order for edgeble-ncm6b

2024-05-27 Thread Anand Moon 
Hi Jagan,

On Mon, 27 May 2024 at 12:09, Jagan Teki  wrote:
>
> Edgeble NCM6B SoM has built-in eMMC so make sdhci has first boot
> priority.
>
> Fix it for NCM6A, NCM6B SoM.
>
> Signed-off-by: Jagan Teki 

Reviewed-by: Anand Moon 



> ---
>  arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi |  6 +-
>  arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 11 ++-
>  2 files changed, 7 insertions(+), 10 deletions(-)
>
> 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 dd0058262b..88f3f7eee2 100644
> --- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
> @@ -6,12 +6,8 @@
>  #include "rk3588-u-boot.dtsi"
>
>  / {
> -   aliases {
> -   mmc0 = &sdmmc;
> -   };
> -
> chosen {
> -   u-boot,spl-boot-order = &sdmmc;
> +   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> };
>  };
>
> diff --git a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi 
> b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
> index a45b3f5e86..289578803e 100644
> --- a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
> @@ -6,11 +6,12 @@
>  #include "rk3588j-u-boot.dtsi"
>
>  / {
> -   aliases {
> -   mmc0 = &sdmmc;
> -   };
> -
> chosen {
> -   u-boot,spl-boot-order = &sdmmc;
> +   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
> };
>  };
> +
> +&sdmmc {
> +   bus-width = <4>;
> +   status = "okay";
> +};
> --
> 2.34.1
>

Re: [PATCH 1/2] arm64: dts: rockchip: Fix spl-boot-order for edgeble-ncm6b

2024-05-27 Thread Quentin Schulz 

Hi Jagan,

On 5/27/24 8:39 AM, Jagan Teki wrote:

Edgeble NCM6B SoM has built-in eMMC so make sdhci has first boot
priority.

Fix it for NCM6A, NCM6B SoM.

Signed-off-by: Jagan Teki 
---
  arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi |  6 +-
  arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 11 ++-
  2 files changed, 7 insertions(+), 10 deletions(-)

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 dd0058262b..88f3f7eee2 100644
--- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
@@ -6,12 +6,8 @@
  #include "rk3588-u-boot.dtsi"
  
  / {

-   aliases {
-   mmc0 = &sdmmc;
-   };
-
chosen {
-   u-boot,spl-boot-order = &sdmmc;
+   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
  };
  
diff --git a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi

index a45b3f5e86..289578803e 100644
--- a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
@@ -6,11 +6,12 @@
  #include "rk3588j-u-boot.dtsi"
  
  / {

-   aliases {
-   mmc0 = &sdmmc;
-   };
-
chosen {
-   u-boot,spl-boot-order = &sdmmc;
+   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
  };
+
+&sdmmc {
+   bus-width = <4>;
+   status = "okay";
+};


The sdmmc parts are already part of 
dts/upstream/src/arm64/rockchip/rk3588-edgeble-neu6b-io.dts, are you 
sure this is actually needed?


Cheers,
Quentin

[PATCH 1/2] arm64: dts: rockchip: Fix spl-boot-order for edgeble-ncm6b

2024-05-26 Thread Jagan Teki 
Edgeble NCM6B SoM has built-in eMMC so make sdhci has first boot
priority.

Fix it for NCM6A, NCM6B SoM.

Signed-off-by: Jagan Teki 
---
 arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi |  6 +-
 arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 11 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

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 dd0058262b..88f3f7eee2 100644
--- a/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
@@ -6,12 +6,8 @@
 #include "rk3588-u-boot.dtsi"
 
 / {
-   aliases {
-   mmc0 = &sdmmc;
-   };
-
chosen {
-   u-boot,spl-boot-order = &sdmmc;
+   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
 };
 
diff --git a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi 
b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
index a45b3f5e86..289578803e 100644
--- a/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi
@@ -6,11 +6,12 @@
 #include "rk3588j-u-boot.dtsi"
 
 / {
-   aliases {
-   mmc0 = &sdmmc;
-   };
-
chosen {
-   u-boot,spl-boot-order = &sdmmc;
+   u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
 };
+
+&sdmmc {
+   bus-width = <4>;
+   status = "okay";
+};
-- 
2.34.1