diff --git a/qcom/diting-sm8475.dtsi b/qcom/diting-sm8475.dtsi
index 0854e7d0..af904ff6 100755
--- a/qcom/diting-sm8475.dtsi
+++ b/qcom/diting-sm8475.dtsi
@@ -16,64 +16,61 @@
         };
 
 };
+
 &qupv3_se4_spi {
-	status = "ok";
+	status = "okay";
 	qcom,rt;
 	pinctrl-0 = <&mi_ts_spi_active &mi_ts_cs_active>;
 	pinctrl-1 = <&mi_ts_spi_sleep &mi_ts_cs_suspend>;
+
 	xiaomi_touch@0 {
-		status = "ok";
-		compatible = "xiaomi,l12-spi";
+		status = "okay";
+		compatible = "st,spi", "goodix,gt9916S";
 		reg = <0>;
 		spi-max-frequency = <12000000>;
 		interrupt-parent = <&tlmm>;
-		interrupts = <21 0x2008>;
-		//goodix,avdd-name = "avdd";
-		//avdd-supply = <&L7C>;
+		interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
 		pinctrl-0 = <&mi_ts_active>;
 		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
 
-		goodix,avdd-gpio = <&tlmm 71 0x0>;
-		goodix,iovdd-name = "vdd";
-		vdd-supply = <&L2C>;
-		goodix,irq-gpio = <&tlmm 21 0x2008>;
-		goodix,reset-gpio = <&tlmm 20 0x00>;
-		goodix,irq-flags = <2>;
+		goodix,reset-gpio = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+		goodix,irq-gpio = <&tlmm 21 GPIO_TRANSITORY>;
+		goodix,irq-flags = <IRQ_TYPE_EDGE_FALLING>;
 		goodix,panel-max-x = <12200>;
 		goodix,panel-max-y = <27120>;
 		goodix,panel-max-w = <255>;
 		goodix,panel-max-p = <4096>;
-		goodix,firmware-name = "goodix_firmware_l12";
-		goodix,config-name = "goodix_cfg_group_l12";
-		goodix,touch-expert-array = <2 3 2 2
-					     4 3 3 2
-					     3 3 4 2>;
+		goodix,avdd-gpio = <&tlmm 71 GPIO_ACTIVE_HIGH>;
+		// TODO: Check this in schematics
+		// goodix,avdd-name = "avdd";
+		// avdd-supply = <&L7C>;
+		goodix,iovdd-name = "vdd";
+		vdd-supply = <&L2C>;
+		goodix,panel-id-gpio-a = <&tlmm 119 GPIO_ACTIVE_LOW>;
+		goodix,panel-id-gpio-b = <&tlmm 117 GPIO_ACTIVE_LOW>;
+		goodix,firmware-namea = "goodix_firmware_l12.bin";
+		goodix,config-namea = "goodix_cfg_group_l12.bin";
 
-		fts,avdd-gpio = <&tlmm 71 0x0>;
+		fts,avdd-gpio = <&tlmm 71 GPIO_ACTIVE_HIGH>;
 		//avdd-supply = <&L3C>;
 		//vdd-supply = <&L2C>;
-		/*panel = <&dsi_k8_42_02_0a_dsc_cmd>;*/
 		//fts,pwr-reg-name = "avdd";
 		fts,bus-reg-name = "vdd";
-		fts,irq-gpio = <&tlmm 21 0x2008>;
+		fts,irq-gpio = <&tlmm 21 GPIO_TRANSITORY>;
 		fts,irq-gpio-name = "fts_irq";
 		fts,reset-gpio-enable;
-		fts,reset-gpio = <&tlmm 20 0x00>;
+		fts,reset-gpio = <&tlmm 20 GPIO_ACTIVE_HIGH>;
 		fts,reset-gpio-name = "fts_rst";
 		fts,irq-flags = <0x2008>;
 		fts,x-max = <12200>;
 		fts,y-max = <27120>;
-		//fts,swap-y;
-		//fts,swap-x;
 		fts,support-fod = <1>;
 		fts,fod-lx = <4960>;
 		fts,fod-ly = <23300>;
 		fts,fod-x-size = <2280>;
 		fts,fod-y-size = <2280>;
-		//spi-max-frequency = <12000000>;
 		fts,default-fw-name = "st_fts_l12.ftb";
-		//fts,htp-fw-name = "st_fts_l10_thp.ftb";
 		fts,non-curved-display = <1>;
 		fts,config-array-size = <1>;
 		fts,support-super-resolution = <1>;
@@ -142,6 +139,7 @@
 		};
 	};
 };
+
 &tlmm {
         mi_ts_active: mi_ts_active {
                 mux {