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

Commit b75488f7 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 LCD backlight configuration for MSM8994 CDP"

parents e0449bcc 9f636224

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

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
			qcom,ramp-index = <2>;

		};



		pwm@b400 {

		pmi8994_pwm_4: pwm@b400 {

			compatible = "qcom,qpnp-pwm";

			reg = <0xb400 0x100>,

			      <0xb042 0x7e>;
@@ -377,6 +377,7 @@ 
			qcom,channel-id = <3>;

			qcom,supported-sizes = <6>, <7>, <9>;

			qcom,ramp-index = <3>;

			#pwm-cells = <2>;

		};



		qcom,leds@d800 {

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

+14 −0
Original line number Diff line number Diff line
@@ -613,6 +613,13 @@ 
};



&pmi8994_mpps {

	mpp@a000 { /* MPP 1 */

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

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

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

		qcom,src-sel = <7>;		/* DTEST4 */

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

	};

	mpp@a300 { /* MPP 4 */

		/* WLED FET */

		qcom,mode = <1>;
@@ -624,6 +631,13 @@ 
	qcom,charging-disabled;

};



&pmi8994_pwm_4 {

	qcom,channel-owner = "lcd_bl";

	qcom,lpg-dtest-line = <4>;

	qcom,dtest-output = <1>;

	status = "okay";

};



&slim_msm {

	tomtom_codec {

		cdc-vdd-spkdrv-supply = <&pmi8994_boost_pin_ctrl>;