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

Commit 7b7b6e1e 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 support for FHD+ video mode panel"

parents 3e85aeed cb56df48

arch/arm/boot/dts/qcom/dsi-panel-lgd-incell-sw49106-fhd-video.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";

		qcom,mdss-dsi-off-command-state = "dsi_lp_mode";

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

		qcom,mdss-dsi-reset-sequence = <1 200>, <0 200>, <1 200>;

		qcom,mdss-dsi-reset-sequence = <1 400>, <0 400>, <1 400>;

		qcom,mdss-dsi-tx-eot-append;

		qcom,mdss-dsi-post-init-delay = <1>;

	};

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

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -193,6 +193,13 @@ 
	qcom,panel-roi-alignment = <2 2 4 2 1080 2>;

};



&dsi_lgd_incell_sw49106_fhd_video {

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

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

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

};



&pm660l_pwm_4 {

	qcom,dtest-line = <2>;   /* DTEST2 */

	qcom,dtest-output = <2>; /* OUTPUT PWM */

arch/arm/boot/dts/qcom/sdm630-mdss-panels.dtsi

+12 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -17,6 +17,7 @@ 
#include "dsi-panel-truly-1080p-video.dtsi"

#include "dsi-panel-rm67195-amoled-fhd-cmd.dtsi"

#include "dsi-panel-sharp-split-link-wuxga-video.dtsi"

#include "dsi-panel-lgd-incell-sw49106-fhd-video.dtsi"



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {
@@ -243,3 +244,13 @@ 
	qcom,mdss-dsi-pan-enable-dynamic-fps;

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

};



&dsi_lgd_incell_sw49106_fhd_video {

	qcom,mdss-dsi-panel-timings-phy-v2 = [24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1f 08 09 05 03 04 a0

		24 1b 08 09 05 03 04 a0];

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

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

};

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

+8 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -216,3 +216,10 @@ 
&dsi_rm67195_amoled_fhd_cmd {

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

};



&dsi_lgd_incell_sw49106_fhd_video {

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

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

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

};