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

Commit c255fd32 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: mdss: enable pwm back light for msm8994"

parents 08aa6d79 c39f1b03
Loading
Loading
Loading
Loading
+23 −2
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;
	qcom,dsi-panel-bias-vreg;
	qcom,platform-reset-gpio = <&msm_gpio 78 0>;
	qcom,platform-bklight-en-gpio = <&pmi8994_gpios 2 0>;

	qcom,platform-enable-gpio = <&pm8994_gpios 14 0>;
};
@@ -333,7 +334,11 @@
};

&dsi_dual_jdi_video_0 {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	pwms = <&pmi8994_pwm_4 0 0>;
	pwm-names = "backlight";
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pwm-pmi;
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <4095>;
	qcom,cont-splash-enabled;
@@ -344,7 +349,11 @@
};

&dsi_dual_jdi_cmd_0 {
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
	pwms = <&pmi8994_pwm_4 0 0>;
	pwm-names = "backlight";
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pwm-pmi;
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-min-level = <1>;
	qcom,mdss-dsi-bl-max-level = <4095>;
	qcom,cont-splash-enabled;
@@ -638,6 +647,18 @@
	status = "okay";
};

&pmi8994_gpios {
	gpio@c100 {	/* GPIO 2, lcd_bklt_reg_en  */
		qcom,mode = <1>;	/* DIGITAL OUT */
		qcom,output-type = <0>;		/* CMOS logic */
		qcom,invert = <1>; 	/* output hight initially */
		qcom,vin-sel = <2>;	/* 1.8 */
		qcom,src-sel = <0>;	/* CONSTANT */
		qcom,out-strength = <1>;	/* Low drive strength */
		qcom,master-en = <1>;	/* ENABLE GPIO */
	};
};

&slim_msm {
	tomtom_codec {
		cdc-vdd-spkdrv-supply = <&pmi8994_boost_pin_ctrl>;