Merge "ARM: dts: msm: Add external regulators in mpq8092" (47126e6c) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qti/mpq8092-cdp.dtsi

+45 −3

Original line number	Diff line number	Diff line
		@@ -40,6 +40,26 @@
		};
		};

		&smb211_vreg {
		status = "ok";
		};

		&smb210_vreg {
		status = "ok";
		};

		&hsusb1_otg {
		status = "ok";
		};

		&hsusb2_otg {
		status = "ok";
		};

		&usb3_otg {
		status = "ok";
		};

		&sdhc_1 {
		vdd-supply = <&pma8084_l20>;
		qcom,vdd-voltage-level = <2950000 2950000>;
		@@ -94,12 +114,16 @@

		&pma8084_gpios {
		gpio@c000 { /* GPIO 1 */
		/* SMB210 DBU4 5.0 V regulator enable - no software control */
		status = "disabled";
		};

		gpio@c100 { /* GPIO 2 */
		};

		gpio@c200 { /* GPIO 3 */
		/* SMB211 DBU2 3.3 V regulator enable - no software control */
		status = "disabled";
		};

		gpio@c300 { /* GPIO 4 */
		@@ -114,13 +138,31 @@
		gpio@c600 { /* GPIO 7 */
		};

		gpio@c700 { /* GPIO 8 */
		gpio@c700 { /* GPIO 8 - USB OTG 3.0 */
		qcom,mode = <1>; /* Digital output */
		qcom,vin-sel = <2>; /* PMA8084 S4 = 1.8V */
		qcom,src_sel = <0>; /* Constant Function */
		qcom,out-strength = <1>;/* Low */
		qcom,invert = <0>; /* Output low initially */
		qcom,master-en = <1>; /* Enable GPIO */
		};

		gpio@c800 { /* GPIO 9 */
		gpio@c800 { /* GPIO 9 - USB OTG 2.0 (Port-1) */
		qcom,mode = <1>; /* Digital output */
		qcom,vin-sel = <2>; /* PMA8084 S4 = 1.8V */
		qcom,src_sel = <0>; /* Constant Function */
		qcom,out-strength = <1>;/* Low */
		qcom,invert = <0>; /* Output low initially */
		qcom,master-en = <1>; /* Enable GPIO */
		};

		gpio@c900 { /* GPIO 10 */
		gpio@c900 { /* GPIO 10 - USB OTG 2.0 (Port-2) */
		qcom,mode = <1>; /* Digital output */
		qcom,vin-sel = <2>; /* PMA8084 S4 = 1.8V */
		qcom,src_sel = <0>; /* Constant Function */
		qcom,out-strength = <1>;/* Low */
		qcom,invert = <0>; /* Output low initially */
		qcom,master-en = <1>; /* Enable GPIO */
		};

		gpio@ca00 { /* GPIO 11 */

arch/arm/boot/dts/qti/mpq8092-regulator.dtsi

+44 −0

Original line number	Diff line number	Diff line
		@@ -380,6 +380,50 @@
		};

		&soc {
		smb211_vreg: smb211_vreg {
		compatible = "regulator-fixed";
		regulator-name = "smb211_vreg";
		regulator-always-on;
		status = "disabled";
		};

		smb210_vreg: smb210_vreg {
		compatible = "regulator-fixed";
		regulator-name = "smb210_vreg";
		regulator-always-on;
		status = "disabled";
		};

		hsusb1_otg: hsusb1_vreg {
		compatible = "regulator-fixed";
		regulator-name = "hsusb1_vreg";
		vin-supply = <&smb210_vreg>;
		startup-delay-us = <16000>;
		gpio = <&pma8084_gpios 9 0>;
		enable-active-high;
		status = "disabled";
		};

		hsusb2_otg: hsusb2_vreg {
		compatible = "regulator-fixed";
		regulator-name = "hsusb2_vreg";
		vin-supply = <&smb210_vreg>;
		startup-delay-us = <16000>;
		gpio = <&pma8084_gpios 10 0>;
		enable-active-high;
		status = "disabled";
		};

		usb3_otg: usb3_vreg {
		compatible = "regulator-fixed";
		regulator-name = "usb3_vreg";
		vin-supply = <&smb210_vreg>;
		startup-delay-us = <16000>;
		gpio = <&pma8084_gpios 8 0>;
		enable-active-high;
		status = "disabled";
		};

		krait_pdn: krait-pdn@f9011000 {
		reg = <0xf9011000 0x1000>,
		<0xfc4b80b0 8>;