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

Commit b6e10e24 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 FHD+ and HD+ with upscaling on SDM439"

parents a799c7f3 a5dc494d

arch/arm64/boot/dts/qcom/msm8937-mdss-panels.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include "dsi-panel-r69006-1080p-video.dtsi"

#include "dsi-adv7533-1080p.dtsi"

#include "dsi-adv7533-720p.dtsi"



#include "dsi-panel-hx8399c-fhd-plus-video.dtsi"

#include "dsi-panel-hx8399c-hd-plus-video.dtsi"

&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {

		#address-cells = <1>;

arch/arm64/boot/dts/qcom/sdm439-cdp.dtsi

+64 −0
Original line number Diff line number Diff line
@@ -104,3 +104,67 @@ 
		};

	};

};



&pm8953_gpios {

	bklt_en {

		bklt_en_default: bklt_en_default {

		pins = "gpio4";

		function = "normal";

		power-source = <0>;

		output-high;

		};

	};

};



&pm8953_pwm {

	status = "ok";

};



#include "msm8937-mdss-panels.dtsi"



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_truly_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active &bklt_en_default>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-bklight-en-gpio = <&pm8953_gpios 4 0>;

	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-reset-gpio = <&tlmm 61 0>;

	lab-supply = <&lcdb_ldo_vreg>;

	ibb-supply = <&lcdb_ncp_vreg>;



};



&dsi_hx8399c_truly_vid {

	qcom,mdss-dsi-panel-timings =

		[f3 3a 26 00 6c 6e 2c 3e 2f 03 04 00];

	qcom,mdss-dsi-t-clk-post = <0x02>;

	qcom,mdss-dsi-t-clk-pre = <0x2d>;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};





&dsi_hx8399c_hd_vid {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

};

arch/arm64/boot/dts/qcom/sdm439-mtp.dtsi

+63 −0
Original line number Diff line number Diff line
@@ -104,3 +104,66 @@ 
		};

	};

};



#include "msm8937-mdss-panels.dtsi"



&pm8953_gpios {

	bklt_en {

		bklt_en_default: bklt_en_default {

		pins = "gpio4";

		function = "normal";

		power-source = <0>;

		output-high;

		};

	};

};



&pm8953_pwm {

	status = "ok";

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_truly_vid>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active &bklt_en_default>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,platform-bklight-en-gpio = <&pm8953_gpios 4 0>;

	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-reset-gpio = <&tlmm 61 0>;

	lab-supply = <&lcdb_ldo_vreg>;

	ibb-supply = <&lcdb_ncp_vreg>;



};



&dsi_hx8399c_truly_vid {

	qcom,mdss-dsi-panel-timings =

		[f3 3a 26 00 6c 6e 2c 3e 2f 03 04 00];

	qcom,mdss-dsi-t-clk-post = <0x02>;

	qcom,mdss-dsi-t-clk-pre = <0x2d>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};



&dsi_hx8399c_hd_vid {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";

	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

};

arch/arm64/boot/dts/qcom/sdm439-pm8953.dtsi

+9 −8
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ 
};



&mdss_dsi {

	/delete-property/ vdda-supply;

	/delete-property/ vddio-supply;

	vdda-supply = <&pm8953_l2>; /*1.2V*/

	vddio-supply = <&pm8953_l6>; /*1.8V*/

};



&usb_otg {
@@ -137,21 +137,22 @@ 
};



&mdss_dsi0_pll {

	/delete-property/ vddio-supply;

	vddio-supply = <&pm8953_l6>;

};



&mdss_dsi1_pll {

	/delete-property/ vddio-supply;

	vddio-supply = <&pm8953_l6>;

};



&mdss_dsi0 {

	/delete-property/ vdd-supply;

	/delete-property/ vddio-supply;

	vdd-supply = <&pm8953_l17>;

	vddio-supply = <&pm8953_l6>;

};



&mdss_dsi1 {

	/delete-property/ vdd-supply;

	/delete-property/ vddio-supply;

	status = "disabled";

	vdd-supply = <&pm8953_l17>;

	vddio-supply = <&pm8953_l6>;

};



&int_codec {