text2

Change-Id: I2dc8b3086cfe97e23ae5c79a4a50e59fc6622a64
Atom-X-Devs · Jan 24, 2025 · 8af9a1a · 8af9a1a
1 parent 6d17e47
commit 8af9a1a
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 208 deletions.
diff --git a/arch/arm64/boot/dts/vendor/qcom/redwood-sm7325.dtsi b/arch/arm64/boot/dts/vendor/qcom/redwood-sm7325.dtsi
@@ -384,7 +384,7 @@
 	pinctrl-1 = <&qupv3_se13_spi_sleep &qupv3_se13_spi_sleep_cs>;
 
 	xiaomi_m20_touch@0 {
-		compatible = "goodix,brl-d";
+		compatible = "focaltech,fts_ts";
 		reg = <0>;
 		spi-max-frequency = <5000000>;
 		interrupt-parent = <&tlmm>;
@@ -404,6 +404,16 @@
 		goodix,iovdd-name = "vdd";
 		goodix,avdd-gpio = <&tlmm 107 0x00>;
 
+		focaltech,reset-gpio = <&tlmm 105 0x00>;
+		focaltech,irq-gpio = <&tlmm 81 0x2808>;
+		focaltech,display-coords = <0 0 1080 2400>;
+		focaltech,ic-type = <0x3680008A>;
+		focaltech,max-touch-number = <10>;
+		focaltech,touch-type = "primary";
+
+		focaltech,iovdd-name = "vdd";
+		focaltech,avdd-gpio = <&tlmm 107 0x00>;
+
 		vdd-supply = <&L2C>;
 	};
 };

diff --git a/arch/arm64/configs/vendor/xiaomi-qgki_defconfig b/arch/arm64/configs/vendor/xiaomi-qgki_defconfig
@@ -123,7 +123,7 @@ CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_THINLTO is not set
-CONFIG_LTO_CLANG=y
+CONFIG_LTO_CLANG=n
 CONFIG_BLK_WBT=y
 CONFIG_BLK_INLINE_ENCRYPTION=y
 CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y

diff --git a/techpack/display/msm/Kbuild b/techpack/display/msm/Kbuild
@@ -255,6 +255,3 @@ msm_drm-$(CONFIG_DRM_MSM) += msm_atomic.o \
 			     msm_smmu.o \
 			     msm_cooling_device.o \
 			     msm_prop.o
-
-CDEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
-
diff --git a/techpack/touch/Kbuild b/techpack/touch/Kbuild
@@ -71,7 +71,6 @@ ifeq ($(CONFIG_TOUCHSCREEN_FOCALTECH), y)
 	LINUX_INC += -include $(TOUCH_ROOT)/focaltech_touch/focaltech_common.h
 	LINUX_INC += -include $(TOUCH_ROOT)/focaltech_touch/focaltech_config.h
 	LINUX_INC += -include $(TOUCH_ROOT)/focaltech_touch/focaltech_core.h
-	LINUX_INC += -include $(TOUCH_ROOT)/focaltech_touch/focaltech_flash.h
 
 	focaltech_fts-y := \
 		 ./focaltech_touch/focaltech_core.o \

diff --git a/techpack/touch/config/gki_lahainatouch.conf b/techpack/touch/config/gki_lahainatouch.conf
@@ -1,5 +1,5 @@
-export CONFIG_TOUCHSCREEN_XIAOMI_TOUCHFEATURE=y
+export CONFIG_TOUCHSCREEN_XIAOMI_TOUCHFEATURE=n
 export CONFIG_TOUCHSCREEN_FOCALTECH=y
-export CONFIG_TOUCHSCREEN_GOODIX_BRL=y
-export CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y
+export CONFIG_TOUCHSCREEN_GOODIX_BRL=n
+export CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=n
 export CONFIG_MSM_TOUCH=y
diff --git a/techpack/touch/config/gki_lahainatouchconf.h b/techpack/touch/config/gki_lahainatouchconf.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#define CONFIG_TOUCHSCREEN_XIAOMI_TOUCHFEATURE 1
+#define CONFIG_TOUCHSCREEN_XIAOMI_TOUCHFEATURE 0
 #define CONFIG_TOUCHSCREEN_FOCALTECH 1
-#define CONFIG_TOUCHSCREEN_GOODIX_BRL 1
-#define CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI 1
+#define CONFIG_TOUCHSCREEN_GOODIX_BRL 0
+#define CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI 0
diff --git a/techpack/touch/focaltech_touch/focaltech_common.h b/techpack/touch/focaltech_touch/focaltech_common.h
@@ -113,7 +113,7 @@ struct ts_ic_info {
 /*****************************************************************************
 * DEBUG function define here
 *****************************************************************************/
-#if FTS_DEBUG_EN
+#if 1//FTS_DEBUG_EN
 #define FTS_DEBUG(fmt, args...) do { \
 	printk("[FTS_TS]%s:"fmt"\n", __func__, ##args); \
 } while (0)

diff --git a/techpack/touch/focaltech_touch/focaltech_config.h b/techpack/touch/focaltech_touch/focaltech_config.h
@@ -212,6 +212,11 @@
  */
 #define FTS_SUPPORT_I2C							0
 
+/*
+ * FTS PROC SUPPORT FOR DEBUG
+ */
+#define FTS_DEBUG_APK							0
+
 /*
  * module_id: mean vendor_id generally, also maybe gpio or lcm_id...
  * If means vendor_id, the FTS_MODULE_ID = PANEL_ID << 8 + VENDOR_ID