Skip to contentSkip to conversation

arm: dts: stm32mp157c-odyssey-som: sync SDMMC2 with Linux and TF‑A

PATCH In review Grzegorz Szymaszek 2 participants 15 messages Jun 2, 2021 – Jun 18, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover arm: dts: stm32mp157c-odyssey-som: sync SDMMC2 with Linux and TF‑A

This patchset updates the properties of the SDMMC2 device tree node so that they match their Linux kernel and Trusted Firmware A counterparts. Two differences will remain:
— in the Linux kernel device tree, the VQMMC supply is incorrectly set
to v3v3 (buck4) instead of vdd (buck3);
— in the TF‑A device tree, only the “default” pinctrl is configured.

Additionally, this patchset enables SDMMC2 in SPL.

Changes for v2:
— rebased on current master (no code changes);
— added Patrice Chotard’s Reviewed-by (thanks!);
— added missing commit message bodies.

Grzegorz Szymaszek (5):
arm: dts: stm32mp157c-odyssey-som: fix the basic SDMMC2 properties
arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes
arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply
arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode
arm: dts: stm32mp157c-odyssey-som: enable SDMMC2 in SPL

 .../dts/stm32mp157c-odyssey-som-u-boot.dtsi   | 21 +++++++++++++++++++
 arch/arm/dts/stm32mp157c-odyssey-som.dtsi     | 15 +++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
Signature · 1 line
2.30.2
#1 lore raw

PATCH v2 1/5 arm: dts: stm32mp157c-odyssey-som: fix the basic SDMMC2 properties

The SDMMC2 interface hosts an eMMC. Replace the interface properties that would only apply to SD cards—“broken-cd” and “disable-wp”—with relevant ones: “non-removable”, “no-sd” and “no-sdio”.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +3 -2
index e367a311c4..ed399c00d1 100644
@@ -267,8 +267,9 @@
 	pinctrl-0 = <&sdmmc2_b4_pins_a>;
 	pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
 	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
-	broken-cd;
-	disable-wp;
+	non-removable;
+	no-sd;
+	no-sdio;
 	st,neg-edge;
 	bus-width = <4>;
 	vmmc-supply = <&v3v3>;
Signature · 1 line
2.30.2
#3 lore raw

PATCH v2 2/5 arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes

In reply to Grzegorz Szymaszek

Add the “sdmmc2_d47_pins_d” pins to the SDMMC2 pinctrls. Increase the bus width from four to eight.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +4 -4
index ed399c00d1..7323325e60 100644
@@ -264,14 +264,14 @@
 
 &sdmmc2 {
 	pinctrl-names = "default", "opendrain", "sleep";
-	pinctrl-0 = <&sdmmc2_b4_pins_a>;
-	pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
-	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
+	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>;
+	pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_d>;
+	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>;
 	non-removable;
 	no-sd;
 	no-sdio;
 	st,neg-edge;
-	bus-width = <4>;
+	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	status = "okay";
 };
Signature · 1 line
2.30.2
#6 lore raw

PATCH v2 3/5 arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply

In reply to Grzegorz Szymaszek

Set the SDMMC2 VQMMC supply to vdd (buck3). Note that in the corresponding Linux kernel device tree, the supply is set to v3v3 (buck4), which is wrong.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
index 7323325e60..583812f137 100644
@@ -273,6 +273,7 @@
 	st,neg-edge;
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
+	vqmmc-supply = <&vdd>;
 	status = "okay";
 };
 
Signature · 1 line
2.30.2
#9 lore raw

PATCH v2 4/5 arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode

In reply to Grzegorz Szymaszek

Enable the SDMMC2 eMMC high-speed DDR mode as it is done in the corresponding Linux kernel device tree.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
index 583812f137..1510a5b364 100644
@@ -274,6 +274,7 @@
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	vqmmc-supply = <&vdd>;
+	mmc-ddr-3_3v;
 	status = "okay";
 };
 
Signature · 1 line
2.30.2
#13 lore raw

PATCH v2 5/5 arm: dts: stm32mp157c-odyssey-som: enable SDMMC2 in SPL

In reply to Grzegorz Szymaszek

Enable the SDMMC2 device tree node, as well as the pins it uses, in U-Boot SPL.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 .../dts/stm32mp157c-odyssey-som-u-boot.dtsi   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +21 -0
index 6be728846e..4ff848350d 100644
@@ -123,3 +123,24 @@
 		u-boot,dm-pre-reloc;
 	};
 };
+
+&sdmmc2 {
+	u-boot,dm-spl;
+};
+
+&sdmmc2_b4_pins_a {
+	u-boot,dm-spl;
+	pins1 {
+		u-boot,dm-spl;
+	};
+	pins2 {
+		u-boot,dm-spl;
+	};
+};
+
+&sdmmc2_d47_pins_d {
+	u-boot,dm-spl;
+	pins {
+		u-boot,dm-spl;
+	};
+};
Signature · 1 line
2.30.2
Reviewed-by on v2 4/5
#10 lore raw

Re: [PATCH v2 4/5] arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode

In reply to Grzegorz Szymaszek

Hi Grzegorz

Quoted 20 lines · Grzegorz Szymaszek

Enable the SDMMC2 eMMC high-speed DDR mode as it is done in the corresponding Linux kernel device tree.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index 583812f137..1510a5b364 100644

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 280

Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -274,6 +274,7 @@
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	vqmmc-supply = <&vdd>;
+	mmc-ddr-3_3v;
 	status = "okay";
 };
 

Thanks
Patrice

Reviewed-by on v2 5/5
#14 lore raw

Re: [PATCH v2 5/5] arm: dts: stm32mp157c-odyssey-som: enable SDMMC2 in SPL

In reply to Grzegorz Szymaszek

Hi Grzegorz

Quoted 34 lines · Grzegorz Szymaszek

Enable the SDMMC2 device tree node, as well as the pins it uses, in U-Boot SPL.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 .../dts/stm32mp157c-odyssey-som-u-boot.dtsi   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +11 -0
index 6be728846e..4ff848350d 100644
@@ -123,3 +123,24 @@
 		u-boot,dm-pre-reloc;
 	};
 };
+
+&sdmmc2 {
+	u-boot,dm-spl;
+};
+
+&sdmmc2_b4_pins_a {
+	u-boot,dm-spl;
+	pins1 {
+		u-boot,dm-spl;
+	};
+	pins2 {

arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi line 146

Quoted 10 lines
arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +10 -0
+		u-boot,dm-spl;
+	};
+};
+
+&sdmmc2_d47_pins_d {
+	u-boot,dm-spl;
+	pins {
+		u-boot,dm-spl;
+	};
+};

Thanks
Patrice

#2 lore raw

Re: [PATCH v2 1/5] arm: dts: stm32mp157c-odyssey-som: fix the basic SDMMC2 properties

In reply to Grzegorz Szymaszek
Quoted 23 lines · Grzegorz Szymaszek

The SDMMC2 interface hosts an eMMC. Replace the interface properties that would only apply to SD cards—“broken-cd” and “disable-wp”—with relevant ones: “non-removable”, “no-sd” and “no-sdio”.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index e367a311c4..ed399c00d1 100644
@@ -267,8 +267,9 @@
 	pinctrl-0 = <&sdmmc2_b4_pins_a>;

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 275

Quoted 10 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +3 -2
 	pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
 	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
-	broken-cd;
-	disable-wp;
+	non-removable;
+	no-sd;
+	no-sdio;
 	st,neg-edge;
 	bus-width = <4>;
 	vmmc-supply = <&v3v3>;

Applied on u-boot-stm32/next

Thanks

#4 lore raw

Re: [PATCH v2 2/5] arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes

In reply to Grzegorz Szymaszek
Quoted 29 lines · Grzegorz Szymaszek

Add the “sdmmc2_d47_pins_d” pins to the SDMMC2 pinctrls. Increase the bus width from four to eight.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +2 -3
index ed399c00d1..7323325e60 100644
@@ -264,14 +264,14 @@
 
 &sdmmc2 {
 	pinctrl-names = "default", "opendrain", "sleep";
-	pinctrl-0 = <&sdmmc2_b4_pins_a>;
-	pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
-	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
+	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>;
+	pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_d>;

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 277

Quoted 10 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +2 -1
+	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>;
 	non-removable;
 	no-sd;
 	no-sdio;
 	st,neg-edge;
-	bus-width = <4>;
+	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	status = "okay";
 };

Applied on u-boot-stm32/next

Thanks

#5 lore raw

Re: [PATCH v2 2/5] arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes

Quoted 44 lines · Patrice CHOTARD
Quoted 29 lines · Grzegorz Szymaszek

Add the “sdmmc2_d47_pins_d” pins to the SDMMC2 pinctrls. Increase the bus width from four to eight.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +2 -3
index ed399c00d1..7323325e60 100644
@@ -264,14 +264,14 @@
 
 &sdmmc2 {
 	pinctrl-names = "default", "opendrain", "sleep";
-	pinctrl-0 = <&sdmmc2_b4_pins_a>;
-	pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
-	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
+	pinctrl-0 = <&sdmmc2_b4_pins_a &sdmmc2_d47_pins_d>;
+	pinctrl-1 = <&sdmmc2_b4_od_pins_a &sdmmc2_d47_pins_d>;

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 277

Quoted 10 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +2 -1
+	pinctrl-2 = <&sdmmc2_b4_sleep_pins_a &sdmmc2_d47_sleep_pins_d>;
 	non-removable;
 	no-sd;
 	no-sdio;
 	st,neg-edge;
-	bus-width = <4>;
+	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	status = "okay";
 };

Applied on u-boot-stm32/next

Quoted 2 lines

Thanks

Applied on u-boot-stm32/next

Thanks

#7 lore raw

Re: [PATCH v2 3/5] arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply

In reply to Grzegorz Szymaszek
Quoted 22 lines · Grzegorz Szymaszek

Set the SDMMC2 VQMMC supply to vdd (buck3). Note that in the corresponding Linux kernel device tree, the supply is set to v3v3 (buck4), which is wrong.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index 7323325e60..583812f137 100644

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 279

Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -273,6 +273,7 @@
 	st,neg-edge;
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
+	vqmmc-supply = <&vdd>;
 	status = "okay";
 };
 

Applied on u-boot-stm32/next

Thanks

#8 lore raw

Re: [PATCH v2 3/5] arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply

Quoted 34 lines · Patrice CHOTARD
Quoted 22 lines · Grzegorz Szymaszek

Set the SDMMC2 VQMMC supply to vdd (buck3). Note that in the corresponding Linux kernel device tree, the supply is set to v3v3 (buck4), which is wrong.

---
Changes for v2:
- rebased on current master (patch not changed)
- added Patrice Chotard’s Reviewed-by

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index 7323325e60..583812f137 100644

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 279

Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -273,6 +273,7 @@
 	st,neg-edge;
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
+	vqmmc-supply = <&vdd>;
 	status = "okay";
 };
 

Applied on u-boot-stm32/next

Quoted 2 lines

Thanks

Applied on u-boot-stm32/next

Thanks

#11 lore raw

Re: [Uboot-stm32] [PATCH v2 4/5] arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode

In reply to Patrice CHOTARD
Quoted 33 lines · Patrice CHOTARD

Hi Grzegorz

Quoted 20 lines · Grzegorz Szymaszek

Enable the SDMMC2 eMMC high-speed DDR mode as it is done in the corresponding Linux kernel device tree.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index 583812f137..1510a5b364 100644

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 280

Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -274,6 +274,7 @@
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	vqmmc-supply = <&vdd>;
+	mmc-ddr-3_3v;
 	status = "okay";
 };
 
Quoted 7 lines

Thanks
Patrice
_______________________________________________
Uboot-stm32 mailing list
[email protected]
https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32

Applied on u-boot-stm32/next

Thanks

#12 lore raw

Re: [PATCH v2 4/5] arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode

In reply to Patrice CHOTARD
Quoted 33 lines · Patrice CHOTARD

Hi Grzegorz

Quoted 20 lines · Grzegorz Szymaszek

Enable the SDMMC2 eMMC high-speed DDR mode as it is done in the corresponding Linux kernel device tree.

Cc Patrice Chotard <[email protected]>
Cc Patrick Delaunay <[email protected]>

---
Changes for v2:
- rebased on current master
- added a short commit message body

 arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0 -0
index 583812f137..1510a5b364 100644

arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 280

Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -274,6 +274,7 @@
 	bus-width = <8>;
 	vmmc-supply = <&v3v3>;
 	vqmmc-supply = <&vdd>;
+	mmc-ddr-3_3v;
 	status = "okay";
 };
 
Quoted 3 lines

Thanks
Patrice

Applied on u-boot-stm32/next

Thanks