[PATCH v2 0/3] Add devicetree aliases for mmc on multiple MSM8974 devices

[PATCH v2 0/3] Add devicetree aliases for mmc on multiple MSM8974 devices

[Luca Weiss]

Add an alias for the internal storage so it always becomes mmcblk0 and
- where applicable - SD card becomes mmcblk1.

This avoids issues with internal storage becoming mmcblk1 unexpectedly
and aligns this board with other boards that use MMC storage.

Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
---
Changes in v2:
- Expand on commit messages (Bjorn)
- Link to v1: https://lore.kernel.org/r/20250419-msm8974-mmc-alias-v1-0-82aa131224b6@lucaweiss.eu

---
Luca Weiss (3):
      ARM: dts: qcom: msm8974-oneplus-bacon: Add alias for mmc0
      ARM: dts: qcom: msm8974-hammerhead: Add alias for mmc0
      ARM: dts: qcom: msm8974-sony-xperia-rhine: Add alias for mmc0 & mmc1

 arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 1 +
 arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi    | 2 ++
 arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts      | 1 +
 3 files changed, 4 insertions(+)
---
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
change-id: 20250419-msm8974-mmc-alias-893d197dc61a

Best regards,
-- 
Luca Weiss <luca@lucaweiss.eu>

[PATCH v2 1/3] ARM: dts: qcom: msm8974-oneplus-bacon: Add alias for mmc0

[Luca Weiss]

Add an alias for the internal storage so it always becomes mmcblk0.

This avoids issues with internal storage becoming mmcblk1 unexpectedly
and aligns this board with other boards that use MMC storage.

Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
---
 arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
index 4c8edadea0ac63db668dbd666fbb8d92e23232b7..88ff6535477bffefe475cc5fe927b3cc5d223084 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-oneplus-bacon.dts
@@ -13,6 +13,7 @@ / {
 	qcom,board-id = <8 0>;
 
 	aliases {
+		mmc0 = &sdhc_1;
 		serial0 = &blsp1_uart2;
 	};
 

-- 
2.49.0

[PATCH v2 2/3] ARM: dts: qcom: msm8974-hammerhead: Add alias for mmc0

[Luca Weiss]

Add an alias for the internal storage so it always becomes mmcblk0.

This avoids issues with internal storage becoming mmcblk1 unexpectedly
and aligns this board with other boards that use MMC storage.

Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
---
 arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
index 261044fdfee866449e9d9d62cef5aea10d88e874..0f4ff87d80234d1e1389ae9b6c3c84112ff34799 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -12,6 +12,7 @@ / {
 	chassis-type = "handset";
 
 	aliases {
+		mmc0 = &sdhc_1;
 		serial0 = &blsp1_uart1;
 		serial1 = &blsp2_uart4;
 	};

-- 
2.49.0

[PATCH v2 3/3] ARM: dts: qcom: msm8974-sony-xperia-rhine: Add alias for mmc0 & mmc1

[Luca Weiss]

Add an alias for the internal storage so it always becomes mmcblk0 and
SD card becomes mmcblk1.

This avoids issues with internal storage becoming mmcblk1 unexpectedly
and aligns this board with other boards that use MMC storage.

Signed-off-by: Luca Weiss <luca@lucaweiss.eu>
---
 arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
index d34659ebac22e65a511994ef201fe04f12089781..145908f319e47fbabfa8f59ea38be5d2d8487fd8 100644
--- a/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -8,6 +8,8 @@
 
 / {
 	aliases {
+		mmc0 = &sdhc_1;
+		mmc1 = &sdhc_2;
 		serial0 = &blsp1_uart2;
 	};
 

-- 
2.49.0

Re: [PATCH v2 0/3] Add devicetree aliases for mmc on multiple MSM8974 devices

[Bjorn Andersson]

On Tue, 10 Jun 2025 19:03:48 +0200, Luca Weiss wrote:
> Add an alias for the internal storage so it always becomes mmcblk0 and
> - where applicable - SD card becomes mmcblk1.
> 
> This avoids issues with internal storage becoming mmcblk1 unexpectedly
> and aligns this board with other boards that use MMC storage.
> 
> 
> [...]

Applied, thanks!

[1/3] ARM: dts: qcom: msm8974-oneplus-bacon: Add alias for mmc0
      commit: d9abbfd3212b5873e827e3760cc698686d7a8c3b
[2/3] ARM: dts: qcom: msm8974-hammerhead: Add alias for mmc0
      commit: 9dd98b0f7a646c08f357189e9d5e733df08f0430
[3/3] ARM: dts: qcom: msm8974-sony-xperia-rhine: Add alias for mmc0 & mmc1
      commit: fb84f0ec527c50c54ab662d45c441f6789ec3550

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>