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

Commit 7c4d4ee9 authored by Ke Liu's avatar Ke Liu
Browse files

ARM: dts: msm: remove USB detection by MPP1 for msmzirc CDP/MTP 



Currently, MPP1 is used for VBUS detection in msmzirc CDP/MTP. New design
requires SMB to handle VBUS detection for CDP/MTP. Hence remove MPP1
configurations in msmzirc CDP/MTP files.

Change-Id: I3425c402f469e667461173e29244774f958ddd4f
Signed-off-by: default avatarKe Liu <keliu@codeaurora.org>
parent 069f11cb

arch/arm/boot/dts/qcom/msmzirc-cdp.dtsi

+0 −13
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
#include "msmzirc-display.dtsi"

#include "qpic-panel-ili-hvga.dtsi"



&soc {

	usb_detect {

		compatible = "qcom,qpnp-usbdetect";

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xa0 0x0>;  /* PMD9635 MPP 1 */

		interrupt-names = "vbus_det_irq";

	};

};



&blsp1_uart3 {

	status = "ok";

	pinctrl-names = "default";
@@ -90,10 +81,6 @@ 


&pmd9635_mpps {

	mpp@a000 { /* MPP 1 */

		status = "ok";

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

		qcom,vin-sel = <2>;	/* PMD9635 LDO 6 = 1.8 V */

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

	};



	mpp@a100 { /* MPP 2 */

arch/arm/boot/dts/qcom/msmzirc-mtp.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ 
#include "msmzirc-pinctrl.dtsi"



&soc {

	usb_detect {

		compatible = "qcom,qpnp-usbdetect";

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xa0 0x0>;  /* PMD9635 MPP 1 */

		interrupt-names = "vbus_det_irq";

	};



	sound {

		qcom,cdc-micbias2-headset-only;

	};
@@ -93,10 +86,6 @@ 


&pmd9635_mpps {

	mpp@a000 { /* MPP 1 */

		status = "ok";

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

		qcom,vin-sel = <2>;	/* PMD9635 LDO 6 = 1.8 V */

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

	};



	mpp@a100 { /* MPP 2 */