beryllium: add nt36xxx

Signed-off-by: rupansh <rupanshsekar@hotmail.com>
rupansh · Apr 18, 2020 · fc7e377 · fc7e377
1 parent fa77b85
commit fc7e377
Show file tree

Hide file tree

Showing 16 changed files with 7,834 additions and 2 deletions.
diff --git a/arch/arm64/boot/dts/qcom/sdm845-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-beryllium.dts
@@ -417,9 +417,45 @@
 };
 
 &qupv3_id_1 {
-	status = "okay";
+        status = "okay";
 };
 
+&i2c14 {
+	status = "okay";
+	/* Novatek device tree node */
+        novatek@62 {
+                        compatible = "novatek,NVT-ts";
+                        reg = <0x62>;
+                        status = "ok";
+
+                        vddio-supply = <&vreg_l14a_1p88>;
+                        /*avdd-supply = <&pm8994_l22>;*/
+                        lab-supply = <&lab_regulator>;
+                        ibb-supply = <&ibb_regulator>;
+                        novatek,vddio-reg-name = "vddio";
+                        novatek,lab-reg-name = "lab";
+                        novatek,ibb-reg-name = "ibb";
+
+                        novatek,reset-tddi = <&tlmm 6 0x00>;
+                        novatek,reset-gpio = <&tlmm 32 0x00>;
+                        novatek,irq-gpio = <&tlmm 31 0x2001>;
+                        pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
+                        pinctrl-0 = <&ts_int_active &ts_reset_active>;
+                        pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
+                        novatek,config-array-size = <2>;
+                        novatek,cfg_0 {
+                                novatek,tp-vendor = <0x46>;
+                                novatek,hw-version = <0x1>;
+                                novatek,fw-name = "novatek_nt36672_e10_hw01.fw";
+                        };
+                        novatek,cfg_1 {
+                                novatek,tp-vendor = <0x46>;
+                                novatek,hw-version = <0x2>;
+                                novatek,fw-name = "novatek_nt36672_e10_hw02.fw";
+                        };
+                };
+        };
+
 &sdhc_2 {
 	status = "okay";
 
@@ -436,6 +472,64 @@
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
+	ts_mux {
+
+		ts_int_active: ts_int_active {
+			mux {
+				pins = "gpio31";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio31";
+				drive-strength = <16>;
+				bias-pull-down;
+				input-enable;
+			};
+		};
+
+		ts_reset_active: ts_reset_active {
+			mux {
+				pins = "gpio32";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio32";
+				drive-strength = <16>;
+				output-high;
+			};
+		};
+
+		ts_reset_suspend: ts_reset_suspend {
+			mux {
+				pins = "gpio32";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio32";
+				drive-strength = <2>;
+				bias-disable;
+				output-low;
+			};
+		};
+
+		ts_int_suspend: ts_int_suspend {
+			mux {
+				pins = "gpio31";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio31";
+				drive-strength = <2>;
+				bias-pull-down;
+				input-enable;
+			};
+		};
+	};
+
 	pcie0_pwren_state: pcie0-pwren {
 		pins = "gpio90";
 		function = "gpio";

diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -32,10 +32,11 @@ static struct msm_dsi_manager msm_dsim_glb;
 #define IS_SYNC_NEEDED()	(msm_dsim_glb.is_sync_needed)
 #define IS_MASTER_DSI_LINK(id)	(msm_dsim_glb.master_dsi_link_id == id)
 
-static inline struct msm_dsi *dsi_mgr_get_dsi(int id)
+struct msm_dsi *dsi_mgr_get_dsi(int id)
 {
 	return msm_dsim_glb.dsi[id];
 }
+EXPORT_SYMBOL_GPL(dsi_mgr_get_dsi)
 
 static inline struct msm_dsi *dsi_mgr_get_other_dsi(int id)
 {

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
@@ -684,6 +684,8 @@ config TOUCHSCREEN_PENMOUNT
 	  To compile this driver as a module, choose M here: the
 	  module will be called penmount.
 
+source "drivers/input/touchscreen/nt36xxx/Kconfig"
+
 config TOUCHSCREEN_EDT_FT5X06
 	tristate "EDT FocalTech FT5x06 I2C Touchscreen support"
 	depends on I2C

diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
@@ -110,3 +110,4 @@ obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o
 obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o
 obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
 obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o
+obj-$(CONFIG_TOUCHSCREEN_NT36XXX)	+= nt36xxx/
diff --git a/drivers/input/touchscreen/nt36xxx/Kconfig b/drivers/input/touchscreen/nt36xxx/Kconfig
@@ -0,0 +1,11 @@
+#
+# Novatek NT36xxx touchscreen driver configuration
+#
+config TOUCHSCREEN_NT36XXX
+	bool "Novatek NT36XXX"
+	default y
+	help
+	  Say Y here if you have a Novatek NT36xxx touchscreen connected
+	  to your system.
+
+	  If unsure, say N.
diff --git a/drivers/input/touchscreen/nt36xxx/Makefile b/drivers/input/touchscreen/nt36xxx/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Novatek NT36xxx touchscreen driver.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_TOUCHSCREEN_NT36XXX) += nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o
diff --git a/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10.fw b/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10.fw
diff --git a/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10_hw01.fw b/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10_hw01.fw
diff --git a/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10_hw02.fw b/drivers/input/touchscreen/nt36xxx/fw/novatek_nt36672_e10_hw02.fw