Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4c2274f authored by Russell King's avatar Russell King Committed by Shawn Guo
Browse files

ARM: dts: imx6*-hummingboard2: convert to more conventional vmmc-supply 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent f7c4dc2c

arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi

+19 −7
Original line number Diff line number Diff line
@@ -52,11 +52,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";
@@ -73,6 +68,18 @@ 
		regulator-always-on;

	};



	v_sd: regulator-v-sd {

		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 = "v_sd";

		startup-delay-us = <1000>;

	};



	reg_usbh1_vbus: regulator-usb-h1-vbus {

		compatible = "regulator-fixed";

		enable-active-high;
@@ -391,7 +398,6 @@ 
			fsl,pins = <

				MX6QDL_PAD_GPIO_4__GPIO1_IO04    0x1f071

				MX6QDL_PAD_KEY_ROW1__SD2_VSELECT 0x1b071

				MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0

			>;

		};
@@ -428,6 +434,12 @@ 
			>;

		};



		pinctrl_hummingboard2_vmmc: hummingboard2-vmmc {

			fsl,pins = <

				MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30 0x1b0b0

			>;

		};



		pinctrl_hummingboard2_usdhc3: hummingboard2-usdhc3 {

			fsl,pins = <

				MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
@@ -515,7 +527,7 @@ 
		&pinctrl_hummingboard2_usdhc2_aux

		&pinctrl_hummingboard2_usdhc2_200mhz

	>;

	mmc-pwrseq = <&usdhc2_pwrseq>;

	vmmc-supply = <&v_sd>;

	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

	status = "okay";

};