[PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Monish Chunara]

This series updates the device tree configuration for the LeMans EVK
board to support dynamic selection between SD card and eMMC storage.

The LeMans EVK hardware supports either an SD card or eMMC, but the
interfaces are mutually exclusive as they share the same controller and
resources. Previously, SD card support was hardcoded in the main device
tree, preventing easy switching to eMMC.

This series refactors the SDHC configuration by:

1. Moving the existing SD card configuration into a dedicated overlay.
2. Adding a new overlay to support eMMC.
3. Updating the common SDHC node in the SoC dtsi to include necessary
resources (clocks, register ranges) required by the eMMC configuration.

This allows the bootloader to apply the appropriate overlay based on the
desired storage medium.

Monish Chunara (2):
  arm64: dts: qcom: lemans-evk: Move SD card support to overlay
  arm64: dts: qcom: lemans-evk: Add SDHCI support for eMMC via overlay

 arch/arm64/boot/dts/qcom/Makefile             |  6 ++
 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso | 64 +++++++++++++++++++
 .../boot/dts/qcom/lemans-evk-sd-card.dtso     | 25 ++++++++
 arch/arm64/boot/dts/qcom/lemans-evk.dts       | 16 -----
 arch/arm64/boot/dts/qcom/lemans.dtsi          | 10 ++-
 5 files changed, 102 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso
 create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso

-- 
2.34.1

[PATCH V1 1/2] arm64: dts: qcom: lemans-evk: Move SD card support to overlay

[Monish Chunara]

The lemans EVK board supports either eMMC or SD-card, but only one can
be active at a time.

Move the SDHC node for SD card into a dedicated device tree overlay.
This decoupling allows the storage medium to be selected dynamically by
applying the appropriate overlay for either SD card or eMMC support.

Signed-off-by: Monish Chunara <monish.chunara@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/Makefile             |  3 +++
 .../boot/dts/qcom/lemans-evk-sd-card.dtso     | 25 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/lemans-evk.dts       | 16 ------------
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 317af937d038..e5ea8de55df7 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -35,6 +35,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-qrd.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= lemans-evk.dtb
 
+lemans-evk-sd-card-dtbs := lemans-evk.dtb lemans-evk-sd-card.dtbo
+dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-sd-card.dtb
+
 lemans-evk-camera-csi1-imx577-dtbs	:= lemans-evk.dtb lemans-evk-camera-csi1-imx577.dtbo
 lemans-evk-camera-dtbs	:= lemans-evk.dtb lemans-evk-camera.dtbo
 
diff --git a/arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso b/arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso
new file mode 100644
index 000000000000..007ab6347349
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+&sdhc {
+	vmmc-supply = <&vmmc_sdc>;
+	vqmmc-supply = <&vreg_sdc>;
+
+	pinctrl-0 = <&sdc_default>, <&sd_cd>;
+	pinctrl-1 = <&sdc_sleep>, <&sd_cd>;
+	pinctrl-names = "default", "sleep";
+
+	bus-width = <4>;
+	cd-gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
+	no-mmc;
+	no-sdio;
+
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/lemans-evk.dts b/arch/arm64/boot/dts/qcom/lemans-evk.dts
index 90fce947ca7e..7f10f312b7e4 100644
--- a/arch/arm64/boot/dts/qcom/lemans-evk.dts
+++ b/arch/arm64/boot/dts/qcom/lemans-evk.dts
@@ -751,22 +751,6 @@ &remoteproc_gpdsp1 {
 	status = "okay";
 };
 
-&sdhc {
-	vmmc-supply = <&vmmc_sdc>;
-	vqmmc-supply = <&vreg_sdc>;
-
-	pinctrl-0 = <&sdc_default>, <&sd_cd>;
-	pinctrl-1 = <&sdc_sleep>, <&sd_cd>;
-	pinctrl-names = "default", "sleep";
-
-	bus-width = <4>;
-	cd-gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
-	no-mmc;
-	no-sdio;
-
-	status = "okay";
-};
-
 &serdes0 {
 	phy-supply = <&vreg_l5a>;
 
-- 
2.34.1

Re: [PATCH V1 1/2] arm64: dts: qcom: lemans-evk: Move SD card support to overlay

[Dmitry Baryshkov]

On Fri, Feb 27, 2026 at 03:54:04PM +0530, Monish Chunara wrote:
> The lemans EVK board supports either eMMC or SD-card, but only one can
> be active at a time.
> 
> Move the SDHC node for SD card into a dedicated device tree overlay.
> This decoupling allows the storage medium to be selected dynamically by
> applying the appropriate overlay for either SD card or eMMC support.

What is wrong the SD being a default one?

> 
> Signed-off-by: Monish Chunara <monish.chunara@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/Makefile             |  3 +++
>  .../boot/dts/qcom/lemans-evk-sd-card.dtso     | 25 +++++++++++++++++++
>  arch/arm64/boot/dts/qcom/lemans-evk.dts       | 16 ------------
>  3 files changed, 28 insertions(+), 16 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso
> 

-- 
With best wishes
Dmitry

Re: [PATCH V1 1/2] arm64: dts: qcom: lemans-evk: Move SD card support to overlay

[Monish Chunara]

On Fri, Feb 27, 2026 at 10:08:03PM +0200, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 03:54:04PM +0530, Monish Chunara wrote:
> > The lemans EVK board supports either eMMC or SD-card, but only one can
> > be active at a time.
> > 
> > Move the SDHC node for SD card into a dedicated device tree overlay.
> > This decoupling allows the storage medium to be selected dynamically by
> > applying the appropriate overlay for either SD card or eMMC support.
> 
> What is wrong the SD being a default one?
>

As discussed, the recipe changes for FIT configs would ensure that SD card
overlay is picked by default as per the default DIP switch configuration on the
board. 

However, due to conflicting properties and dtso limitations, SD card properties
couldn't be added as default in the SoC DT, therefore shifing it to the platform
file for better handling.

Regards,
Monish 

[PATCH V1 2/2] arm64: dts: qcom: lemans-evk: Add SDHCI support for eMMC via overlay

[Monish Chunara]

Enable the SDHCI controller for eMMC functionality on the lemans EVK
using a device tree overlay. Configure the corresponding addresse space
and resources for eMMC.

Signed-off-by: Monish Chunara <monish.chunara@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/Makefile             |  3 +
 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso | 64 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/lemans.dtsi          | 10 ++-
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index e5ea8de55df7..5f5fcbef81d4 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -35,6 +35,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-qrd.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= lemans-evk.dtb
 
+lemans-evk-emmc-dtbs := lemans-evk.dtb lemans-evk-emmc.dtbo
+dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-emmc.dtb
+
 lemans-evk-sd-card-dtbs := lemans-evk.dtb lemans-evk-sd-card.dtbo
 dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-sd-card.dtb
 
diff --git a/arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso b/arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso
new file mode 100644
index 000000000000..52739d39a1ff
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/qcom,rpmh.h>
+#include <dt-bindings/clock/qcom,sa8775p-gcc.h>
+
+/ {
+	vmmc_sdc1: regulator-l8c {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg-sdc1";
+
+		regulator-min-microvolt = <2960000>;
+		regulator-max-microvolt = <2960000>;
+	};
+
+	vqmmc_sdc1: regulator-s4a {
+		compatible = "regulator-fixed";
+		regulator-name = "vqmmc-sdc1";
+
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
+};
+
+&sdhc {
+	vmmc-supply = <&vmmc_sdc1>;
+	vqmmc-supply = <&vqmmc_sdc1>;
+
+	pinctrl-0 = <&sdc_default>, <&sdc_rclk>;
+	pinctrl-1 = <&sdc_sleep>, <&sdc_rclk_sleep>;
+
+	pinctrl-names = "default", "sleep";
+
+	supports-cqe;
+	non-removable;
+
+	qcom,dll-config = <0x000F64EC>;
+	max-frequency = <50000000>;
+
+	bus-width = <8>;
+	no-sd;
+	no-sdio;
+
+	status = "okay";
+};
+
+&tlmm {
+        sdc_rclk: sdc1-rclk-state {
+                pins = "sdc1_rclk";
+                bias-pull-down;
+        };
+
+        sdc_rclk_sleep: sdc1-rclk-sleep-state {
+                pins = "sdc1_rclk";
+                drive-strength = <2>;
+                bias-bus-hold;
+        };
+};
diff --git a/arch/arm64/boot/dts/qcom/lemans.dtsi b/arch/arm64/boot/dts/qcom/lemans.dtsi
index 808827b83553..23d48f901e08 100644
--- a/arch/arm64/boot/dts/qcom/lemans.dtsi
+++ b/arch/arm64/boot/dts/qcom/lemans.dtsi
@@ -3953,7 +3953,9 @@ apss_tpdm2_out: endpoint {
 
 		sdhc: mmc@87c4000 {
 			compatible = "qcom,sa8775p-sdhci", "qcom,sdhci-msm-v5";
-			reg = <0x0 0x087c4000 0x0 0x1000>;
+			reg = <0x0 0x87C4000 0x0 0x1000>,
+			      <0x0 0x87C5000 0x0 0x1000>;
+			reg-names = "hc", "cqhci";
 
 			interrupts = <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 521 IRQ_TYPE_LEVEL_HIGH>;
@@ -3961,9 +3963,11 @@ sdhc: mmc@87c4000 {
 					  "pwr_irq";
 
 			clocks = <&gcc GCC_SDCC1_AHB_CLK>,
-				 <&gcc GCC_SDCC1_APPS_CLK>;
+				<&gcc GCC_SDCC1_APPS_CLK>,
+				<&rpmhcc RPMH_CXO_CLK>;
 			clock-names = "iface",
-				      "core";
+				      "core",
+				      "xo";
 
 			interconnects = <&aggre1_noc MASTER_SDC QCOM_ICC_TAG_ALWAYS
 					 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-- 
2.34.1

Re: [PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Dmitry Baryshkov]

On Fri, Feb 27, 2026 at 03:54:03PM +0530, Monish Chunara wrote:
> This series updates the device tree configuration for the LeMans EVK
> board to support dynamic selection between SD card and eMMC storage.
> 
> The LeMans EVK hardware supports either an SD card or eMMC, but the
> interfaces are mutually exclusive as they share the same controller and
> resources. Previously, SD card support was hardcoded in the main device
> tree, preventing easy switching to eMMC.
> 
> This series refactors the SDHC configuration by:
> 
> 1. Moving the existing SD card configuration into a dedicated overlay.
> 2. Adding a new overlay to support eMMC.
> 3. Updating the common SDHC node in the SoC dtsi to include necessary
> resources (clocks, register ranges) required by the eMMC configuration.
> 
> This allows the bootloader to apply the appropriate overlay based on the
> desired storage medium.

Is there a default mode of operation / extension? If there is one,
please define it in the base DT and override it in a single overlay
rather than having two mutually exclusive overlays.

> 
> Monish Chunara (2):
>   arm64: dts: qcom: lemans-evk: Move SD card support to overlay
>   arm64: dts: qcom: lemans-evk: Add SDHCI support for eMMC via overlay
> 
>  arch/arm64/boot/dts/qcom/Makefile             |  6 ++
>  arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso | 64 +++++++++++++++++++
>  .../boot/dts/qcom/lemans-evk-sd-card.dtso     | 25 ++++++++
>  arch/arm64/boot/dts/qcom/lemans-evk.dts       | 16 -----
>  arch/arm64/boot/dts/qcom/lemans.dtsi          | 10 ++-
>  5 files changed, 102 insertions(+), 19 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso
>  create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso
> 
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry

Re: [PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Monish Chunara]

On Fri, Feb 27, 2026 at 10:07:33PM +0200, Dmitry Baryshkov wrote:
> On Fri, Feb 27, 2026 at 03:54:03PM +0530, Monish Chunara wrote:
> > This series updates the device tree configuration for the LeMans EVK
> > board to support dynamic selection between SD card and eMMC storage.
> > 
> > The LeMans EVK hardware supports either an SD card or eMMC, but the
> > interfaces are mutually exclusive as they share the same controller and
> > resources. Previously, SD card support was hardcoded in the main device
> > tree, preventing easy switching to eMMC.
> > 
> > This series refactors the SDHC configuration by:
> > 
> > 1. Moving the existing SD card configuration into a dedicated overlay.
> > 2. Adding a new overlay to support eMMC.
> > 3. Updating the common SDHC node in the SoC dtsi to include necessary
> > resources (clocks, register ranges) required by the eMMC configuration.
> > 
> > This allows the bootloader to apply the appropriate overlay based on the
> > desired storage medium.
> 
> Is there a default mode of operation / extension? If there is one,
> please define it in the base DT and override it in a single overlay
> rather than having two mutually exclusive overlays.
> 

The LeMans EVK has SD card slot onboard and eMMC support via a mezzanine card.

However, if SD card is configured to be a default case in plaform DT, some of
the properties like 'no-mmc' would conflict for eMMC use case which cannot be
deleted in an overlay file, and vice versa. To avoid such issues, definied
separate overlays for both which gets selected based on the actual connection on
the board.

Regards,
Monish

Re: [PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Dmitry Baryshkov]

On Mon, Mar 02, 2026 at 08:13:01PM +0530, Monish Chunara wrote:
> On Fri, Feb 27, 2026 at 10:07:33PM +0200, Dmitry Baryshkov wrote:
> > On Fri, Feb 27, 2026 at 03:54:03PM +0530, Monish Chunara wrote:
> > > This series updates the device tree configuration for the LeMans EVK
> > > board to support dynamic selection between SD card and eMMC storage.
> > > 
> > > The LeMans EVK hardware supports either an SD card or eMMC, but the
> > > interfaces are mutually exclusive as they share the same controller and
> > > resources. Previously, SD card support was hardcoded in the main device
> > > tree, preventing easy switching to eMMC.
> > > 
> > > This series refactors the SDHC configuration by:
> > > 
> > > 1. Moving the existing SD card configuration into a dedicated overlay.
> > > 2. Adding a new overlay to support eMMC.
> > > 3. Updating the common SDHC node in the SoC dtsi to include necessary
> > > resources (clocks, register ranges) required by the eMMC configuration.
> > > 
> > > This allows the bootloader to apply the appropriate overlay based on the
> > > desired storage medium.
> > 
> > Is there a default mode of operation / extension? If there is one,
> > please define it in the base DT and override it in a single overlay
> > rather than having two mutually exclusive overlays.
> > 
> 
> The LeMans EVK has SD card slot onboard and eMMC support via a mezzanine card.
> 
> However, if SD card is configured to be a default case in plaform DT, some of
> the properties like 'no-mmc' would conflict for eMMC use case which cannot be
> deleted in an overlay file, and vice versa. To avoid such issues, definied
> separate overlays for both which gets selected based on the actual connection on
> the board.

What would be the result of not specifying the no-mmc in the base DT?

-- 
With best wishes
Dmitry

Re: [PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Monish Chunara]

On Thu, Mar 05, 2026 at 06:52:17AM +0200, Dmitry Baryshkov wrote:
> On Mon, Mar 02, 2026 at 08:13:01PM +0530, Monish Chunara wrote:
> > On Fri, Feb 27, 2026 at 10:07:33PM +0200, Dmitry Baryshkov wrote:
> > > On Fri, Feb 27, 2026 at 03:54:03PM +0530, Monish Chunara wrote:
> > > > This series updates the device tree configuration for the LeMans EVK
> > > > board to support dynamic selection between SD card and eMMC storage.
> > > > 
> > > > The LeMans EVK hardware supports either an SD card or eMMC, but the
> > > > interfaces are mutually exclusive as they share the same controller and
> > > > resources. Previously, SD card support was hardcoded in the main device
> > > > tree, preventing easy switching to eMMC.
> > > > 
> > > > This series refactors the SDHC configuration by:
> > > > 
> > > > 1. Moving the existing SD card configuration into a dedicated overlay.
> > > > 2. Adding a new overlay to support eMMC.
> > > > 3. Updating the common SDHC node in the SoC dtsi to include necessary
> > > > resources (clocks, register ranges) required by the eMMC configuration.
> > > > 
> > > > This allows the bootloader to apply the appropriate overlay based on the
> > > > desired storage medium.
> > > 
> > > Is there a default mode of operation / extension? If there is one,
> > > please define it in the base DT and override it in a single overlay
> > > rather than having two mutually exclusive overlays.
> > > 
> > 
> > The LeMans EVK has SD card slot onboard and eMMC support via a mezzanine card.
> > 
> > However, if SD card is configured to be a default case in plaform DT, some of
> > the properties like 'no-mmc' would conflict for eMMC use case which cannot be
> > deleted in an overlay file, and vice versa. To avoid such issues, definied
> > separate overlays for both which gets selected based on the actual connection on
> > the board.
> 
> What would be the result of not specifying the no-mmc in the base DT?
>

If 'no-mmc' is not specified for SD card use-case, then during boot-up, it
would unnecessarily attempt for eMMC and sdio paths which are not required and
can be optimized with this property. Hence it needs to be added for SD card
use-case.

If SD card is made default in SoC DT, these properties will conflict as per the
above explanation.

Regards,
Monish

Re: [PATCH V1 0/2] arm64: dts: qcom: lemans-evk: Update SDHC storage support via overlays

[Monish Chunara]

On Fri, Feb 27, 2026 at 03:54:03PM +0530, Monish Chunara wrote:
> This series updates the device tree configuration for the LeMans EVK
> board to support dynamic selection between SD card and eMMC storage.
> 
> The LeMans EVK hardware supports either an SD card or eMMC, but the
> interfaces are mutually exclusive as they share the same controller and
> resources. Previously, SD card support was hardcoded in the main device
> tree, preventing easy switching to eMMC.
> 
> This series refactors the SDHC configuration by:
> 
> 1. Moving the existing SD card configuration into a dedicated overlay.
> 2. Adding a new overlay to support eMMC.
> 3. Updating the common SDHC node in the SoC dtsi to include necessary
> resources (clocks, register ranges) required by the eMMC configuration.
> 
> This allows the bootloader to apply the appropriate overlay based on the
> desired storage medium.
> 
> Monish Chunara (2):
>   arm64: dts: qcom: lemans-evk: Move SD card support to overlay
>   arm64: dts: qcom: lemans-evk: Add SDHCI support for eMMC via overlay
> 
>  arch/arm64/boot/dts/qcom/Makefile             |  6 ++
>  arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso | 64 +++++++++++++++++++
>  .../boot/dts/qcom/lemans-evk-sd-card.dtso     | 25 ++++++++
>  arch/arm64/boot/dts/qcom/lemans-evk.dts       | 16 -----
>  arch/arm64/boot/dts/qcom/lemans.dtsi          | 10 ++-
>  5 files changed, 102 insertions(+), 19 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-emmc.dtso
>  create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-sd-card.dtso
>

Since these changes have been discussed upon separately and reached a
conclusion, requesting for a re-review from maintainers to get these changes
mainlined in linux-next.

Regards,
Monish