| Message ID | 20240606090206.2021237-9-mwalle@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: kontron-samx6i: various fixes | expand |
On Thu, Jun 06, 2024 at 11:02:01AM +0200, Michael Walle wrote: > The module can enable/disable the SD card power supply and has > it's dedicated pin SDIO_PWR_EN for that reason. This is esp. > useful to be able to reset the SD card if it was in an UHS mode. > > Signed-off-by: Michael Walle <mwalle@kernel.org> > --- > .../dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 20 ++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi > index 4d3cd338a707..d36743e47552 100644 > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi > @@ -61,6 +61,18 @@ reg_3p3v_s5: regulator-3p3v-s5 { > vin-supply = <®_smarc_suppy>; > }; > > + reg_sdio: regulator-sdio { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_reg_sdio>; > + regulator-name = "V_3V3_SD"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio1 29 GPIO_ACTIVE_HIGH>; > + off-on-delay-us = <20000>; > + enable-active-high; enable-active-high right after line of GPIO_ACTIVE_HIGH. Shawn > + }; > + > reg_smarc_lcdbklt: regulator-smarc-lcdbklt { > compatible = "regulator-fixed"; > pinctrl-names = "default"; > @@ -640,6 +652,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 > >; > }; > > + pinctrl_reg_sdio: reg-sdiogrp { > + fsl,pins = < > + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* SDIO_PWR_EN */ > + >; > + }; > + > pinctrl_uart1: uart1grp { > fsl,pins = < > MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 > @@ -692,7 +710,6 @@ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 > > MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x1b0b0 /* CD */ > MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x1b0b0 /* WP */ > - MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* PWR_EN */ > >; > }; > > @@ -795,6 +812,7 @@ &usdhc3 { > pinctrl-0 = <&pinctrl_usdhc3>; > cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; > wp-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; > + vmmc-supply = <®_sdio>; > no-1-8-v; > }; > > -- > 2.39.2 >
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi index 4d3cd338a707..d36743e47552 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi @@ -61,6 +61,18 @@ reg_3p3v_s5: regulator-3p3v-s5 { vin-supply = <®_smarc_suppy>; }; + reg_sdio: regulator-sdio { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_sdio>; + regulator-name = "V_3V3_SD"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio1 29 GPIO_ACTIVE_HIGH>; + off-on-delay-us = <20000>; + enable-active-high; + }; + reg_smarc_lcdbklt: regulator-smarc-lcdbklt { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -640,6 +652,12 @@ MX6QDL_PAD_SD1_CMD__PWM4_OUT 0x1b0b1 >; }; + pinctrl_reg_sdio: reg-sdiogrp { + fsl,pins = < + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* SDIO_PWR_EN */ + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 @@ -692,7 +710,6 @@ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x1b0b0 /* CD */ MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x1b0b0 /* WP */ - MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 /* PWR_EN */ >; }; @@ -795,6 +812,7 @@ &usdhc3 { pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; + vmmc-supply = <®_sdio>; no-1-8-v; };
The module can enable/disable the SD card power supply and has it's dedicated pin SDIO_PWR_EN for that reason. This is esp. useful to be able to reset the SD card if it was in an UHS mode. Signed-off-by: Michael Walle <mwalle@kernel.org> --- .../dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)