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

Commit ccd0e451 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 wled external pfet short"

parents 64a618c9 688a83e6

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ 
			qcom,ovp-mv = <29500>;

			qcom,ilim-ma = <980>;

			qcom,boost-duty-ns = <26>;

			qcom,mod-freq-khz = <19200>;

			qcom,mod-freq-khz = <9600>;

			qcom,dim-mode = "hybrid";

			qcom,dim-method = "linear";

			qcom,hyb-thres = <625>;
@@ -431,6 +431,7 @@ 
			qcom,en-phase-stag;

			qcom,ibb-pwrup-dly = <8>;

			qcom,led-strings-list = [00 01 02 03];

			qcom,en-ext-pfet-sc-pro;

		};



		pmi8994_haptics: qcom,haptic@c000 {

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

+3 −1
Original line number Diff line number Diff line
@@ -641,7 +641,9 @@ 
	};

	mpp@a300 { /* MPP 4 */

		/* WLED FET */

		qcom,mode = <1>;

		qcom,mode = <1>;	/* DIGITAL OUT */

		qcom,vin-sel = <0>;	/* VIN0 */

		qcom,src-sel = <5>;	/* DTEST2 */

		qcom,master-en = <1>;

		status = "okay";

	};

arch/arm/boot/dts/qcom/msm8994-fluid.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -545,7 +545,9 @@ 
&pmi8994_mpps {

	mpp@a300 { /* MPP 4 */

		/* WLED FET */

		qcom,mode = <1>;

		qcom,mode = <1>;	/* DIGITAL OUT */

		qcom,vin-sel = <0>;	/* VIN0 */

		qcom,src-sel = <5>;	/* DTEST2 */

		qcom,master-en = <1>;

		status = "okay";

	};

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

+3 −1
Original line number Diff line number Diff line
@@ -628,7 +628,9 @@ 
&pmi8994_mpps {

	mpp@a300 { /* MPP 4 */

		/* WLED FET */

		qcom,mode = <1>;

		qcom,mode = <1>;	/* DIGITAL OUT */

		qcom,vin-sel = <0>;	/* VIN0 */

		qcom,src-sel = <5>;	/* DTEST2 */

		qcom,master-en = <1>;

		status = "okay";

	};