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

Commit 059895f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add DT node for VBUS detect on mpq8092"

parents 47126e6c bccefcc8

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

+6 −1
Original line number Diff line number Diff line
@@ -165,7 +165,12 @@ 
		qcom,master-en = <1>;	/* Enable GPIO */

	};



	gpio@ca00 { /* GPIO 11 */

	gpio@ca00 { /* GPIO 11 - VBUS interrupt */

		qcom,mode = <0>;	/* Digital input */

		qcom,pull = <1>;	/* 1.5uA pull-up */

		qcom,vin-sel = <2>;	/* PMA8084 S4 = 1.8V */

		qcom,src-sel = <0>;	/* Constant Function */

		qcom,master-en = <1>;	/* Enable GPIO */

	};



	gpio@cb00 { /* GPIO 12 */

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

+8 −0
Original line number Diff line number Diff line
@@ -258,6 +258,14 @@ 
		qcom,android-usb-swfi-latency = <1>;

	};



	usb_detect {

		compatible = "qcom,qpnp-usbdetect";

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xca 0x0>;  /* PMA8084 GPIO 11 */

		interrupt-names = "vbus_det_irq";

		vin-supply = <&smb210_vreg>;

	};



	spmi_bus: qcom,spmi@fc4c0000 {

		cell-index = <0>;

		compatible = "qcom,spmi-pmic-arb";