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

Commit b56a31e7 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 backlight control for 8909 with PM8916"

parents 4b614862 b86e5454

arch/arm/boot/dts/qcom/msm8909-pm8916-cdp.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -43,19 +43,19 @@ 
};



&dsi_hx8394d_720_vid {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&dsi_sharp_qhd_vid {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&dsi_truly_wvga_cmd {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&dsi_hx8394d_qhd_vid {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&sdhc_1 {
@@ -140,12 +140,8 @@ 
	};



	mpp@a100 { /* MPP 2 */

		/* Backlight PWM */

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

		qcom,invert = <0>;		/* Disable invert */

		qcom,src-sel = <4>;		/* DTEST1 */

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

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

		/* HR LED */

		status = "disabled";

	};



	mpp@a200 { /* MPP 3 */
@@ -154,8 +150,12 @@ 
	};



	mpp@a300 { /* MPP 4 */

		/* HR LED */

		status = "disabled";

		/* Backlight PWM */

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

		qcom,invert = <0>;		/* Disable invert */

		qcom,src-sel = <4>;		/* DTEST1 */

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

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

	};

};

arch/arm/boot/dts/qcom/msm8909-pm8916-mtp.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -94,11 +94,11 @@ 
};



&dsi_hx8394d_720_vid {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&dsi_hx8394d_qhd_vid {

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 2 0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;

};



&pm8916_chg {
@@ -146,12 +146,8 @@ 
	};



	mpp@a100 { /* MPP 2 */

		/* Backlight PWM */

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

		qcom,invert = <0>;		/* Disable invert */

		qcom,src-sel = <4>;		/* DTEST1 */

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

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

		/* HR LED */

		status = "disabled";

	};



	mpp@a200 { /* MPP 3 */
@@ -160,8 +156,12 @@ 
	};



	mpp@a300 { /* MPP 4 */

		/* HR LED */

		status = "disabled";

		/* Backlight PWM */

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

		qcom,invert = <0>;		/* Disable invert */

		qcom,src-sel = <4>;		/* DTEST1 */

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

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

	};

};