diff mbox series

[v2,1/3] ARM: dts: renesas: genmai: enable SDHI0

Message ID 20240928092953.2982-6-wsa+renesas@sang-engineering.com (mailing list archive)
State Mainlined
Commit 3a1a08549dfab2c9fba23699240fa825bb91d6dd
Delegated to: Geert Uytterhoeven
Headers show
Series ARM: dts: renesas: genmai: enable SDHI and MMCIF | expand

Commit Message

Wolfram Sang Sept. 28, 2024, 9:29 a.m. UTC
For this to work, User LEDs must be disabled because they share their
pins with SD data lines.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

Comments

Geert Uytterhoeven Oct. 4, 2024, 1:52 p.m. UTC | #1
Hi Wolfram,

On Sat, Sep 28, 2024 at 11:30 AM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> For this to work, User LEDs must be disabled because they share their
> pins with SD data lines.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks for your patch!

> --- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
> +++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
> @@ -244,6 +257,14 @@ &scif2 {
>         status = "okay";
>  };
>
> +&sdhi0 {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&sdhi0_pins>;
> +
> +       bus-width = <4>;
> +       status = "okay";

Any specific reason you left out the regulator for SDHI (CVCC1),
but did add the regulator for MMC (CVCC2) in PATCH 2/3?

> +};
> +
>  &spi4 {
>         status = "okay";

The rest LGTM.

Gr{oetje,eeting}s,

                        Geert
Wolfram Sang Oct. 4, 2024, 4:21 p.m. UTC | #2
> Any specific reason you left out the regulator for SDHI (CVCC1),
> but did add the regulator for MMC (CVCC2) in PATCH 2/3?

Yes, the MMCIF driver didn't work otherwise because it needs to
negotiate with the card. It does not seem needed for SD cards without
SDR modes. I assume that, didn't investigate further.
Geert Uytterhoeven Oct. 7, 2024, 12:06 p.m. UTC | #3
On Fri, Oct 4, 2024 at 6:21 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> > Any specific reason you left out the regulator for SDHI (CVCC1),
> > but did add the regulator for MMC (CVCC2) in PATCH 2/3?
>
> Yes, the MMCIF driver didn't work otherwise because it needs to
> negotiate with the card. It does not seem needed for SD cards without
> SDR modes. I assume that, didn't investigate further.

OK.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.13.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index 2d72daa4fac2..e93f444b2442 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -76,7 +76,8 @@  key-1 {
 	};
 
 	leds {
-		status = "okay";
+		/* Needs SDHI0 to be disabled */
+		status = "disabled";
 		compatible = "gpio-leds";
 
 		led1 {
@@ -227,6 +228,18 @@  scif2_pins: serial2 {
 		/* P3_0 as TxD2; P3_2 as RxD2 */
 		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
 	};
+
+	sdhi0_pins: sdhi0 {
+		/* SDHI0: P4_8 up to P4_15 */
+		pinmux = <RZA1_PINMUX(4, 8, 3)>,	/* SD_CD_0 */
+			 <RZA1_PINMUX(4, 9, 3)>,	/* SD_WP_0 */
+			 <RZA1_PINMUX(4, 10, 3)>,	/* SD_D1_0 */
+			 <RZA1_PINMUX(4, 11, 3)>,	/* SD_D0_0 */
+			 <RZA1_PINMUX(4, 12, 3)>,	/* SD_CLK_0 */
+			 <RZA1_PINMUX(4, 13, 3)>,	/* SD_CMD_0 */
+			 <RZA1_PINMUX(4, 14, 3)>,	/* SD_D3_0 */
+			 <RZA1_PINMUX(4, 15, 3)>;	/* SD_D2_0 */
+	};
 };
 
 &rtc_x1_clk {
@@ -244,6 +257,14 @@  &scif2 {
 	status = "okay";
 };
 
+&sdhi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdhi0_pins>;
+
+	bus-width = <4>;
+	status = "okay";
+};
+
 &spi4 {
 	status = "okay";