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

Commit 49aae483 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add touch support for lcd lagoon"

parents 089d8afe 0198f12a

qcom/lagoon-cdp.dtsi

+47 −0
Original line number Diff line number Diff line
@@ -259,6 +259,25 @@ 
	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;

};



&dsi_sharp_qsync_fhd_video {

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

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

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

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

	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;

	qcom,platform-bklight-en-gpio = <&pm6350_gpios 6 0>;

};



&dsi_sharp_qsync_fhd_cmd {

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

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

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

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

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

	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;

	qcom,platform-bklight-en-gpio = <&pm6350_gpios 6 0>;

};



&dsi_sim_cmd {

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

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
@@ -329,4 +348,32 @@ 
		panel = <&dsi_rm69299_visionox_amoled_video

			&dsi_rm69299_visionox_amoled_cmd>;

	};



	synaptics_dsx@22 {

		compatible = "synaptics,dsx-i2c";

		reg = <0x22>;

		interrupt-parent = <&tlmm>;

		interrupts = <39 0x2008>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend",

						"pmx_ts_release";

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&pmx_ts_release>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,ub-i2c-addr = <0x22>;

		synaptics,max-y-for-2d = <1859>;

		synaptics,irq-gpio = <&tlmm 22 0x2008>;

		synaptics,reset-gpio = <&tlmm 21 0x0>;

		synaptics,irq-on-state = <0>;

		synaptics,power-delay-ms = <200>;

		synaptics,reset-delay-ms = <200>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;



		panel = <&dsi_sharp_qsync_fhd_video

			&dsi_sharp_qsync_fhd_cmd>;

	};

};

qcom/lagoon-sde-display.dtsi

+287 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include "dsi-panel-r66451-dsc-fhd-plus-60hz-video.dtsi"

#include "dsi-panel-r66451-dsc-fhd-plus-90hz-video.dtsi"

#include "dsi-panel-r66451-dsc-fhd-plus-120hz-video.dtsi"

#include "dsi-panel-sharp-qsync-fhd-video.dtsi"

#include "dsi-panel-sharp-qsync-fhd-cmd.dtsi"

#include "dsi-panel-sim-cmd.dtsi"

#include "dsi-panel-sim-video.dtsi"
@@ -305,6 +307,291 @@ 
	};

};



&dsi_sharp_qsync_fhd_video {

	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";

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

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

	qcom,dsi-ctrl-num = <0>;

	qcom,dsi-phy-num = <0>;

	qcom,mdss-dsi-display-timings {

		timing@0 {

			qcom,mdss-dsi-panel-width = <1080>;

			qcom,mdss-dsi-panel-phy-timings = [00 1A 06 06 22 20 07

				07 07 02 04 00];

			qcom,display-topology = <1 1 1>;

			qcom,default-topology-index = <0>;

			qcom,mdss-dsi-on-command = [

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 40

				39 01 00 00 10 00 02 f1 40

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 10 00 06 2c 01 02 04 08 10

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 00

				39 01 00 00 10 00 02 f1 00

				/* Initial Setting */

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 ba 07

				39 01 00 00 00 00 02 bc 08

				39 01 00 00 00 00 02 c0 85

				39 01 00 00 00 00 11 c1 89 28 00 08 02

					00 02 0e 00 bb 00 07 0d b7 0c b7

				39 01 00 00 00 00 03 c2 10 f0

				39 01 00 00 00 00 02 d5 00

				39 01 00 00 00 00 02 d6 00

				39 01 00 00 00 00 02 de 00

				39 01 00 00 00 00 02 e1 00

				39 01 00 00 00 00 02 e5 01

				39 01 00 00 00 00 02 bb 03

				39 01 00 00 00 00 02 f6 70

				39 01 00 00 00 00 02 f7 80

				39 01 00 00 00 00 05 be 00 10 00 10

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 44 00

				39 01 00 00 00 00 02 ff 20

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 87 02

				39 01 00 00 00 00 02 5d 00

				39 01 00 00 00 00 02 5e 14

				39 01 00 00 00 00 02 5f eb

				39 01 00 00 00 00 02 ff 26

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 60 00

				39 01 00 00 00 00 02 62 01

				39 01 00 00 00 00 02 40 00

				39 01 00 00 00 00 02 ff 28

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 91 02

				39 01 00 00 00 00 02 ff e0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 48 81

				39 01 00 00 00 00 02 8e 09

				39 01 00 00 00 00 02 ff f0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 33 20

				39 01 00 00 00 00 02 34 35

				39 01 00 00 00 00 02 ff 10

				05 01 00 00 78 00 01 11

				05 01 00 00 78 00 01 29

			];

		};

	};

};



&dsi_sharp_qsync_fhd_cmd {

	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";

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

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

	qcom,dsi-ctrl-num = <0>;

	qcom,dsi-phy-num = <0>;

	qcom,mdss-dsi-display-timings {

		timing@0 {

			qcom,mdss-dsi-panel-width = <1080>;

			qcom,mdss-dsi-panel-phy-timings = [00 0c 03 03 1d 1d 03

				03 02 02 04 00];

			qcom,display-topology = <1 1 1>;

			qcom,default-topology-index = <0>;

			qcom,mdss-dsi-on-command = [

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 40

				39 01 00 00 10 00 02 f1 40

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 10 00 06 2c 01 02 04 08 10

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 00

				39 01 00 00 10 00 02 f1 00

				/* Initial Setting */

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 ba 07

				39 01 00 00 00 00 02 bc 08

				39 01 00 00 00 00 02 c0 85

				39 01 00 00 00 00 11 c1 89 28 00 08 02

				00 02 0e 00 bb 00 07 0d b7 0c b7

				39 01 00 00 00 00 03 c2 10 f0

				39 01 00 00 00 00 02 d5 00

				39 01 00 00 00 00 02 d6 00

				39 01 00 00 00 00 02 de 00

				39 01 00 00 00 00 02 e1 00

				39 01 00 00 00 00 02 e5 01

				39 01 00 00 00 00 02 bb 10

				39 01 00 00 00 00 02 f6 70

				39 01 00 00 00 00 02 f7 80

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 44 00

				39 01 00 00 00 00 02 ff 20

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 87 02

				39 01 00 00 00 00 02 5d 00

				39 01 00 00 00 00 02 5e 14

				39 01 00 00 00 00 02 5f eb

				39 01 00 00 00 00 02 ff 24

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 14 00

				39 01 00 00 00 00 02 15 10

				39 01 00 00 00 00 02 16 0a

				39 01 00 00 00 00 02 17 30

				39 01 00 00 00 00 02 ff 26

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 60 00

				39 01 00 00 00 00 02 62 01

				39 01 00 00 00 00 02 40 00

				39 01 00 00 00 00 02 ff 28

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 91 02

				39 01 00 00 00 00 02 ff e0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 48 81

				39 01 00 00 00 00 02 8e 09

				39 01 00 00 00 00 02 ff f0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 33 20

				39 01 00 00 00 00 02 34 35

				39 01 00 00 00 00 02 ff 10

				05 01 00 00 78 00 01 11

				05 01 00 00 78 00 01 29

			];

		};



		timing@1 {

			qcom,mdss-dsi-panel-width = <1080>;

			qcom,mdss-dsi-panel-phy-timings = [00 15 05 05 20 1f 05

				05 06 02 04 00];

			qcom,display-topology = <1 1 1>;

			qcom,default-topology-index = <0>;

			qcom,mdss-dsi-on-command = [

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 40

				39 01 00 00 10 00 02 f1 40

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 10 00 06 2c 01 02 04 08 10

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 00

				39 01 00 00 10 00 02 f1 00

				/* Initial Setting */

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 ba 07

				39 01 00 00 00 00 02 bc 08

				39 01 00 00 00 00 02 c0 85

				39 01 00 00 00 00 11 c1 89 28 00 08 02

				00 02 0e 00 bb 00 07 0d b7 0c b7

				39 01 00 00 00 00 03 c2 10 f0

				39 01 00 00 00 00 02 d5 00

				39 01 00 00 00 00 02 d6 00

				39 01 00 00 00 00 02 de 00

				39 01 00 00 00 00 02 e1 00

				39 01 00 00 00 00 02 e5 01

				39 01 00 00 00 00 02 bb 10

				39 01 00 00 00 00 02 f6 70

				39 01 00 00 00 00 02 f7 80

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 44 00

				39 01 00 00 00 00 02 ff 20

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 87 02

				39 01 00 00 00 00 02 5d 00

				39 01 00 00 00 00 02 5e 14

				39 01 00 00 00 00 02 5f eb

				39 01 00 00 00 00 02 ff 24

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 14 00

				39 01 00 00 00 00 02 15 10

				39 01 00 00 00 00 02 16 00

				39 01 00 00 00 00 02 17 10

				39 01 00 00 00 00 02 ff 26

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 60 00

				39 01 00 00 00 00 02 62 00

				39 01 00 00 00 00 02 40 00

				39 01 00 00 00 00 02 ff 28

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 91 02

				39 01 00 00 00 00 02 ff e0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 48 81

				39 01 00 00 00 00 02 8e 09

				39 01 00 00 00 00 02 ff f0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 33 20

				39 01 00 00 00 00 02 34 35

				39 01 00 00 00 00 02 ff 10

				05 01 00 00 78 00 01 11

				05 01 00 00 78 00 01 29

			];

		};



		timing@2 {

			qcom,mdss-dsi-panel-width = <1080>;

			qcom,mdss-dsi-panel-phy-timings = [00 10 04 04 1e 1e 04

				04 03 02 04 00];

			qcom,display-topology = <1 1 1>;

			qcom,default-topology-index = <0>;

			qcom,mdss-dsi-on-command = [

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 40

				39 01 00 00 10 00 02 f1 40

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 10 00 06 2c 01 02 04 08 10

				39 01 00 00 00 00 02 ff d0

				39 01 00 00 00 00 02 75 00

				39 01 00 00 10 00 02 f1 00

				/* Initial Setting */

				39 01 00 00 00 00 02 ff 10

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 ba 07

				39 01 00 00 00 00 02 bc 08

				39 01 00 00 00 00 02 c0 85

				39 01 00 00 00 00 11 c1 89 28 00 08 02

				00 02 0e 00 bb 00 07 0d b7 0c b7

				39 01 00 00 00 00 03 c2 10 f0

				39 01 00 00 00 00 02 d5 00

				39 01 00 00 00 00 02 d6 00

				39 01 00 00 00 00 02 de 00

				39 01 00 00 00 00 02 e1 00

				39 01 00 00 00 00 02 e5 01

				39 01 00 00 00 00 02 bb 10

				39 01 00 00 00 00 02 f6 70

				39 01 00 00 00 00 02 f7 80

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 44 00

				39 01 00 00 00 00 02 ff 20

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 87 02

				39 01 00 00 00 00 02 5d 00

				39 01 00 00 00 00 02 5e 14

				39 01 00 00 00 00 02 5f eb

				39 01 00 00 00 00 02 ff 24

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 14 00

				39 01 00 00 00 00 02 15 10

				39 01 00 00 00 00 02 16 03

				39 01 00 00 00 00 02 17 70

				39 01 00 00 00 00 02 ff 26

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 60 00

				39 01 00 00 00 00 02 62 01

				39 01 00 00 00 00 02 40 00

				39 01 00 00 00 00 02 ff 28

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 91 02

				39 01 00 00 00 00 02 ff e0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 48 81

				39 01 00 00 00 00 02 8e 09

				39 01 00 00 00 00 02 ff f0

				39 01 00 00 00 00 02 fb 01

				39 01 00 00 00 00 02 33 20

				39 01 00 00 00 00 02 34 35

				39 01 00 00 00 00 02 ff 10

				05 01 00 00 78 00 01 11

				05 01 00 00 78 00 01 29

			];

		};

	};

};



&dsi_sim_vid {

	qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0";

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