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

Commit d3b0a90f 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: update pull property of MPP pin for apq8096 drone"

parents 97fa26db b2a4b5fe

arch/arm/boot/dts/qcom/apq8096-drone.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ 
&pm8994_mpps {

	mpp@a100 { /* MPP 2 - TP82 */

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

		qcom,pull = <5>;		/* Pull down */

		qcom,pull = <1>;		/* Pull up open */

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

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

		qcom,master-en = <1>;		/* Enable GPIO */
@@ -558,7 +558,7 @@ 


	mpp@a300 { /* MPP 4 - FAN_DETECT */

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

		qcom,pull = <5>;		/* Pull down */

		qcom,pull = <1>;		/* Pull up open */

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

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

		qcom,master-en = <1>;		/* Enable GPIO */
@@ -568,7 +568,7 @@ 


	mpp@a400 { /* MPP 5 - TP81 */

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

		qcom,pull = <5>;		/* Pull down */

		qcom,pull = <1>;		/* Pull up open */

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

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

		qcom,master-en = <1>;		/* Enable GPIO */
@@ -587,7 +587,7 @@ 


	mpp@a600 { /* MPP 7 - TP83 */

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

		qcom,pull = <5>;		/* Pull down */

		qcom,pull = <1>;		/* Pull up open */

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

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

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