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

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

Merge "ARM: dts: msm: add touch support for holi target"

parents c41188de caa2bb03

qcom/holi-atp.dtsi

+34 −0
Original line number Diff line number Diff line 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

#include "display/holi-sde-display-atp.dtsi"

#include "holi-thermal-overlay.dtsi"



&ufsphy_mem {
@@ -91,3 +92,36 @@ 
&pm6150a_amoled {

	status = "ok";

};



&qupv3_se8_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <22 0x2008>;

		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>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

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

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

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

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

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

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

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

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

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

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware.img";



		panel = <&dsi_rm69299_visionox_amoled_video>;

	};

};

qcom/holi-cdp.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

#include "display/holi-sde-display-cdp.dtsi"

#include "holi-thermal-overlay.dtsi"



&ufsphy_mem {
@@ -80,3 +81,36 @@ 
&pm6150a_amoled {

	status = "ok";

};



&qupv3_se8_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <22 0x2008>;

		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>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

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

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

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

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

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

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

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

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

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

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware.img";



		panel = <&dsi_rm69299_visionox_amoled_video>;

	};

};

qcom/holi-mtp.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/linux-event-codes.h>

#include "holi-pmic-overlay.dtsi"

#include "display/holi-sde-display-mtp.dtsi"

#include "holi-thermal-overlay.dtsi"



&ufsphy_mem {
@@ -80,3 +81,36 @@ 
&pm6150a_amoled {

	status = "ok";

};



&qupv3_se8_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <22 0x2008>;

		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>;

		vdd-supply = <&L11A>;

		avdd-supply = <&L6A>;

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

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

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

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

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

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

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

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

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

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware.img";



		panel = <&dsi_rm69299_visionox_amoled_video>;

	};

};

qcom/holi-pinctrl.dtsi

+60 −0
Original line number Diff line number Diff line
@@ -664,6 +664,66 @@ 
			};

		};



		pmx_ts_active {

			ts_active: ts_active {

				mux {

					pins = "gpio21", "gpio22";

					function = "gpio";

				};



				config {

					pins = "gpio21", "gpio22";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio22";

					function = "gpio";

				};



				config {

					pins = "gpio22";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio21";

					function = "gpio";

				};



				config {

					pins = "gpio21";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			pmx_ts_release: pmx_ts_release {

				mux {

					pins = "gpio21", "gpio22";

					function = "gpio";

				};



				config {

					pins = "gpio21", "gpio22";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		/* Camera GPIOs  CCI*/

		cci0_active: cci0_active {

			mux {

qcom/holi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2383,6 +2383,7 @@ 
#include "holi-thermal.dtsi"

#include "holi-pinctrl.dtsi"

#include "holi-qupv3.dtsi"

#include "display/holi-sde.dtsi"

#include "holi-audio.dtsi"



&gcc_camss_top_gdsc {