Skip to contentSkip to conversation

ARM: dts: imx6q-h100: use usdhc2 VSELECT

PATCH New Michael Tretter 4 participants 4 messages Dec 15, 2017 – Dec 26, 2017

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Michael Tretter

author
#0 lore raw

PATCH 1/1 ARM: dts: imx6q-h100: use usdhc2 VSELECT

The uSDHC controller directly provides a VSELECT signal that can be muxed to the external voltage select. Mux the VSELECT directly to avoid using a GPIO.

Signed-off-by Michael Tretter <[email protected]>
---
 arch/arm/boot/dts/imx6q-h100.dts | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)
arch/arm/boot/dts/imx6q-h100.dts +3 -22
index a3269f57df2b..450ec967c257 100644
@@ -108,21 +108,6 @@
 		regulator-always-on;
 	};
 
-	reg_nvcc_sd2: regulator-nvcc-sd2 {
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_h100_reg_nvcc_sd2>;
-		compatible = "regulator-gpio";
-		regulator-name = "NVCC_SD2";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-type = "voltage";
-		regulator-boot-on;
-		regulator-always-on;
-		gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
-		states = <1800000 0x1
-			  3300000 0x0>;
-	};
-
 	reg_usbh1_vbus: regulator-usb-h1-vbus {
 		compatible = "regulator-fixed";
 		enable-active-high;

@@ -260,12 +245,6 @@
 			>;
 		};
 
-		pinctrl_h100_reg_nvcc_sd2: h100-reg-nvcc-sd2 {
-			fsl,pins = <
-				MX6QDL_PAD_KEY_ROW1__GPIO4_IO09		0x1b0b0
-			>;
-		};
-
 		pinctrl_h100_sgtl5000: h100-sgtl5000 {
 			fsl,pins = <
 				MX6QDL_PAD_DISP0_DAT19__AUD5_RXD	0x130b0

@@ -316,6 +295,7 @@
 				MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x17059
 				MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x17059
 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x13059
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT	0x1b0b0
 			>;
 		};
 

@@ -328,6 +308,7 @@
 				MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x170b9
 				MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x170b9
 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x170b9
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT	0x1b0b0
 			>;
 		};
 

@@ -340,6 +321,7 @@
 				MX6QDL_PAD_SD2_DAT1__SD2_DATA1		0x170f9
 				MX6QDL_PAD_SD2_DAT2__SD2_DATA2		0x170f9
 				MX6QDL_PAD_SD2_DAT3__SD2_DATA3		0x170f9
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT	0x1b0b0
 			>;
 		};
 	};

@@ -389,7 +371,6 @@
 	pinctrl-1 = <&pinctrl_h100_usdhc2_100mhz>;
 	pinctrl-2 = <&pinctrl_h100_usdhc2_200mhz>;
 	vmmc-supply = <&reg_3p3v>;
-	vqmmc-supply = <&reg_nvcc_sd2>;
 	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 ARM: dts: imx6q-h100: use usdhc2 VSELECT

Am Freitag, den 15.12.2017, 10:26 +0100 schrieb Michael Tretter:

Quoted 6 lines

The uSDHC controller directly provides a VSELECT signal that can be muxed to the external voltage select. Mux the VSELECT directly to avoid
using a GPIO.

Signed-off-by Michael Tretter <[email protected]>
Reviewed-by Lucas Stach <[email protected]>
Quoted 90 lines

---
?arch/arm/boot/dts/imx6q-h100.dts | 25 +++---------------------- ?1 file changed, 3 insertions(+), 22 deletions(-)

arch/arm/boot/dts/imx6q-h100.dts +0 -0
index a3269f57df2b..450ec967c257 100644
@@ -108,21 +108,6 @@
 ?		regulator-always-on;
 ?	};

?

arch/arm/boot/dts/imx6q-h100.dts +0 -15
-	reg_nvcc_sd2: regulator-nvcc-sd2 {
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_h100_reg_nvcc_sd2>;
-		compatible = "regulator-gpio";
-		regulator-name = "NVCC_SD2";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-type = "voltage";
-		regulator-boot-on;
-		regulator-always-on;
-		gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>;
-		states = <1800000 0x1
-			??3300000 0x0>;
-	};
-

? reg_usbh1_vbus: regulator-usb-h1-vbus {
? compatible = "regulator-fixed";
? enable-active-high;

arch/arm/boot/dts/imx6q-h100.dts +0 -0
@@ -260,12 +245,6 @@
 ?			>;
 ?		};

?

arch/arm/boot/dts/imx6q-h100.dts +0 -3
-		pinctrl_h100_reg_nvcc_sd2: h100-reg-nvcc-sd2 {
-			fsl,pins = <
-				MX6QDL_PAD_KEY_ROW1__GPIO4_IO09	

	0x1b0b0
arch/arm/boot/dts/imx6q-h100.dts +0 -3
-			>;
-		};
-

? pinctrl_h100_sgtl5000: h100-sgtl5000 {
? fsl,pins = <
? MX6QDL_PAD_DISP0_DAT19__AUD5_RXD
0x130b0

arch/arm/boot/dts/imx6q-h100.dts +0 -0
@@ -316,6 +295,7 @@

? MX6QDL_PAD_SD2_DAT1__SD2_DATA1

	0x17059
?				MX6QDL_PAD_SD2_DAT2__SD2_DATA2	
	0x17059
?				MX6QDL_PAD_SD2_DAT3__SD2_DATA3	
	0x13059
arch/arm/boot/dts/imx6q-h100.dts +1 -0
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT

0x1b0b0
? >;
? };
?

arch/arm/boot/dts/imx6q-h100.dts +0 -0
@@ -328,6 +308,7 @@

? MX6QDL_PAD_SD2_DAT1__SD2_DATA1

	0x170b9
?				MX6QDL_PAD_SD2_DAT2__SD2_DATA2	
	0x170b9
?				MX6QDL_PAD_SD2_DAT3__SD2_DATA3	
	0x170b9
arch/arm/boot/dts/imx6q-h100.dts +1 -0
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT

0x1b0b0
? >;
? };
?

arch/arm/boot/dts/imx6q-h100.dts +0 -0
@@ -340,6 +321,7 @@

? MX6QDL_PAD_SD2_DAT1__SD2_DATA1

	0x170f9
?				MX6QDL_PAD_SD2_DAT2__SD2_DATA2	
	0x170f9
?				MX6QDL_PAD_SD2_DAT3__SD2_DATA3	
	0x170f9
arch/arm/boot/dts/imx6q-h100.dts +1 -0
+				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT

0x1b0b0
? >;
? };
? };

arch/arm/boot/dts/imx6q-h100.dts +0 -1
@@ -389,7 +371,6 @@
 ?	pinctrl-1 = <&pinctrl_h100_usdhc2_100mhz>;
 ?	pinctrl-2 = <&pinctrl_h100_usdhc2_200mhz>;
 ?	vmmc-supply = <&reg_3p3v>;
-	vqmmc-supply = <&reg_nvcc_sd2>;
 ?	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 ?	status = "okay";
 ?};