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

Commit 862fdd3b 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: Enable ID detection for Host mode on fermium"

parents 8a878b63 8bdf981e

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

+0 −4
Original line number Diff line number Diff line
@@ -76,7 +76,3 @@ 
		qcom,irq-gpio = <&pm8019_mpps 2 0>;

	};

};
 


&usb_otg {

	vbus_otg-supply = <&smb358_otg_vreg>;

};

arch/arm/boot/dts/qcom/mdmfermium-rumi.dts

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
	qcom,emulation;

	/delete-property/ qcom,boost-sysclk-with-streaming;

	/delete-property/ qcom,streaming-func;

	/delete-property/ vbus_otg-supply;

};



&clock_gcc {

arch/arm/boot/dts/qcom/mdmfermium.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -1146,6 +1146,22 @@ 
#include "msm-pm8019.dtsi"

#include "mdmfermium-regulator.dtsi"



/* MPP pin 1 config for USB ID interrupt line */

&pm8019_mpps {

	mpp@a000 {

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

		qcom,vin-sel = <3>;	/* 1.8V (L11) */

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

		qcom,pull = <2>;	/* PULL UP 10KOHM */

		qcom,master-en = <1>;

		status = "okay";

	};

};



&usb_otg {

	vbus_otg-supply = <&smb358_otg_vreg>;

};



&pm8019_vadc {

	chan@31 {

		label = "batt_id_therm";