| Message ID | E1cS36q-0002wW-C3@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 13, 2017 at 12:45 PM, Russell King <rmk+kernel@arm.linux.org.uk> wrote: > + reg_usdhc2_vmmc: reg-usdhc2-vmmc { > + compatible = "regulator-fixed"; > + gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hummingboard2_vmmc>; > + regulator-boot-on; > + regulator-max-microvolt = <3300000>; > + regulator-min-microvolt = <3300000>; > + regulator-name = "usdhc2_vmmc"; > + startup-delay-us = <1000>; > + }; > + > sound-sgtl5000 { > audio-codec = <&sgtl5000>; > audio-routing = > @@ -393,7 +400,6 @@ > > pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { > fsl,pins = < > - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 > MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 > MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 > >; > @@ -432,6 +438,12 @@ > >; > }; > > + pinctrl_hummingboard2_vmmc: hummingboard2-vmmc { > + fsl,pins = < > + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 Shouldn't this be gpio4 30 instead? > + >; > + }; > + > pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { > fsl,pins = < > MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 > @@ -519,7 +531,7 @@ > &pinctrl_hummingboard2_usdhc2_aux > &pinctrl_hummingboard2_usdhc2_200mhz > >; > - mmc-pwrseq = <&usdhc2_pwrseq>; > + vmmc-supply = <®_usdhc2_vmmc>; > cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; as gpio1 4 seems to be used as card detect.
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi index 88aaed26dd77..f19d30b34ac4 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi @@ -56,11 +56,6 @@ linux,rc-map-name = "rc-rc6-mce"; }; - usdhc2_pwrseq: usdhc2-pwrseq { - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; - }; - reg_3p3v: regulator-3p3v { compatible = "regulator-fixed"; regulator-name = "3P3V"; @@ -123,6 +118,18 @@ regulator-boot-on; }; + reg_usdhc2_vmmc: reg-usdhc2-vmmc { + compatible = "regulator-fixed"; + gpio = <&gpio4 30 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hummingboard2_vmmc>; + regulator-boot-on; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "usdhc2_vmmc"; + startup-delay-us = <1000>; + }; + sound-sgtl5000 { audio-codec = <&sgtl5000>; audio-routing = @@ -393,7 +400,6 @@ pinctrl_hummingboard2_usdhc2_aux: hummingboard2-usdhc2-aux { fsl,pins = < - MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071 MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0 >; @@ -432,6 +438,12 @@ >; }; + pinctrl_hummingboard2_vmmc: hummingboard2-vmmc { + fsl,pins = < + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1f071 + >; + }; + pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 { fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 @@ -519,7 +531,7 @@ &pinctrl_hummingboard2_usdhc2_aux &pinctrl_hummingboard2_usdhc2_200mhz >; - mmc-pwrseq = <&usdhc2_pwrseq>; + vmmc-supply = <®_usdhc2_vmmc>; cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; };
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)