arm: dts: stm32mp157c-odyssey-som: sync SDMMC2 with Linux and TF‑A
Subsystems (2)
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.
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
PATCH 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”.
--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +3 -2
@@ -263,8 +263,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
PATCH 2/5 arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes
In reply to Grzegorz SzymaszekAdd the “sdmmc2_d47_pins_d” pins to the SDMMC2 pinctrls. Increase the bus width from four to eight.
--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +4 -4
@@ -260,14 +260,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
PATCH 3/5 arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply
In reply to Grzegorz SzymaszekSet 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.
--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -269,6 +269,7 @@ st,neg-edge; bus-width = <8>; vmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd>; status = "okay"; };
Signature · 1 line
2.30.2
PATCH 4/5 arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode
In reply to Grzegorz Szymaszek--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1 -0
@@ -270,6 +270,7 @@ bus-width = <8>; vmmc-supply = <&v3v3>; vqmmc-supply = <&vdd>; + mmc-ddr-3_3v; status = "okay"; };
Signature · 1 line
2.30.2
PATCH 5/5 arm: dts: stm32mp157c-odyssey-som: enable SDMMC2 in SPL
In reply to Grzegorz Szymaszek--- .../dts/stm32mp157c-odyssey-som-u-boot.dtsi | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +21 -0
@@ -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
Re: [PATCH 1/5] arm: dts: stm32mp157c-odyssey-som: fix the basic SDMMC2 properties
In reply to Grzegorz SzymaszekHi Grzegorz
Quoted 18 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”.
Signed-off-by Grzegorz Szymaszek <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0
-0@@ -263,8 +263,9 @@ pinctrl-0 = <&sdmmc2_b4_pins_a>;
arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 271
Quoted 10 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +3
-2pinctrl-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>;
Thanks
Patrice
Re: [PATCH 2/5] arm: dts: stm32mp157c-odyssey-som: enable all SDMMC2 data lanes
In reply to Grzegorz SzymaszekHi Grzegorz
Quoted 24 lines · Grzegorz Szymaszek
Add the “sdmmc2_d47_pins_d” pins to the SDMMC2 pinctrls. Increase the bus width from four to eight.
Signed-off-by Grzegorz Szymaszek <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/arm/dts/stm32mp157c-odyssey-som.dtsi +2
-3@@ -260,14 +260,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 273
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"; };
Thanks
Patrice
Re: [PATCH 3/5] arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply
In reply to Grzegorz SzymaszekHi Grzegorz
Quoted 3 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.
Do you intend to send similar patch to kernel mailing list to fix it ?
Quoted 14 lines
Signed-off-by Grzegorz Szymaszek <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 + 1 file changed, 1 insertion(+)arch/arm/dts/stm32mp157c-odyssey-som.dtsi +0
-0
arch/arm/dts/stm32mp157c-odyssey-som.dtsi line 275
Quoted 7 lines
arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1
-0@@ -269,6 +269,7 @@ st,neg-edge; bus-width = <8>; vmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd>; status = "okay"; };
Thanks
Patrice
Re: [PATCH 4/5] arm: dts: stm32mp157c-odyssey-som: enable the SDMMC2 eMMC HS DDR mode
In reply to Grzegorz SzymaszekYour commit message is missing
Quoted 20 lines · Grzegorz Szymaszek
Signed-off-by Grzegorz Szymaszek <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>--- arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 1 + 1 file changed, 1 insertion(+)arch/arm/dts/stm32mp157c-odyssey-som.dtsi +1
-0@@ -270,6 +270,7 @@ bus-width = <8>; vmmc-supply = <&v3v3>; vqmmc-supply = <&vdd>; + mmc-ddr-3_3v; status = "okay"; };
Re: [PATCH 5/5] arm: dts: stm32mp157c-odyssey-som: enable SDMMC2 in SPL
In reply to Grzegorz SzymaszekYour commit message is missing
Quoted 37 lines · Grzegorz Szymaszek
Signed-off-by Grzegorz Szymaszek <[email protected]>Cc Patrice Chotard <[email protected]>Cc Patrick Delaunay <[email protected]>--- .../dts/stm32mp157c-odyssey-som-u-boot.dtsi | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)arch/arm/dts/stm32mp157c-odyssey-som-u-boot.dtsi +21
-0@@ -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; + }; +};
Re: [PATCH 3/5] arm: dts: stm32mp157c-odyssey-som: set the SDMMC2 VQMMC supply
In reply to Patrice CHOTARDHi,
Quoted 6 lines · Patrice Chotard
Quoted 3 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.
Do you intend to send similar patch to kernel mailing list to fix it ?
I’m sorry for not replying, I missed this question. FWIW, yes, I’ve had sent a patch[1] and it has since been applied at least on stm32-next and some stable branches.
[1]: https://lore.kernel.org/linux-arm-kernel/YLj4AMTCi84yO9GO@nx64de-df6d00/
All the best!
Signature · 1 line
Grzegorz