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

Commit 66f4f85a 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 us-euro gpio switch configuration"

parents 34a8637d d221b356

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

+10 −0
Original line number Diff line number Diff line
@@ -612,10 +612,20 @@ 
		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

	};

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

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

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

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

		status = "okay";

	};



	mpp@a300 { /* MPP 4 */

		/* HDMI_5v_vreg regulator enable */

		qcom,mode = <1>;		/* Digital output */

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

+10 −0
Original line number Diff line number Diff line
@@ -453,6 +453,15 @@ 
};



&pm8994_mpps {

	mpp@a100 { /* MPP 2 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

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

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

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

		status = "okay";

	};



	mpp@a300 { /* MPP 4 */

		/* HDMI_5v_vreg regulator enable */

		qcom,mode = <1>;		/* Digital output */
@@ -646,6 +655,7 @@ 
		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,hph-en1-gpio = <&pmi8994_gpios 10 0>;

		qcom,hph-en0-gpio = <&pm8994_gpios 13 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

	};

};