From 313d899ea76a728046c194ded35c2d20909cb707 Mon Sep 17 00:00:00 2001
From: huangcm <1263938474@qq.com>
Date: Mon, 10 Mar 2025 02:49:38 +0000
Subject: [PATCH] fix(touchscreen): fix ft8756 .i to .h
---
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample_1.h | 0
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample.h | 0
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_flash/focaltech_upgrade_ft8756m.c | 2 +-
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/pramboot/FT8756_Pramboot_V1.3_20200116.h | 0
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_config.h | 6 +++---
longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_core.c | 3 +++
6 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_config.h b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_config.h
index c13ef80..0c4c4f9 100755
--- a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_config.h
+++ b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_config.h
@@ -343,19 +343,19 @@
* define your own fw_file, the sample one to be replaced is invalid
* NOTE: if FTS_GET_MODULE_NUM > 1, it's the fw corresponding with FTS_MODULE_ID
*/
-#define FTS_UPGRADE_FW_FILE "include/firmware/fw_sample.i"
+#define FTS_UPGRADE_FW_FILE "include/firmware/fw_sample.h"
/*
* if FTS_GET_MODULE_NUM >= 2, fw corrsponding with FTS_MODULE2_ID
* define your own fw_file, the sample one is invalid
*/
-#define FTS_UPGRADE_FW2_FILE "include/firmware/fw_sample.i"
+#define FTS_UPGRADE_FW2_FILE "include/firmware/fw_sample.h"
/*
* if FTS_GET_MODULE_NUM >= 3, fw corrsponding with FTS_MODULE3_ID
* define your own fw_file, the sample one is invalid
*/
-#define FTS_UPGRADE_FW3_FILE "include/firmware/fw_sample.i"
+#define FTS_UPGRADE_FW3_FILE "include/firmware/fw_sample.h"
/*********************************************************/
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_core.c b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_core.c
index 3281e42..4db0042 100755
--- a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_core.c
+++ b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_core.c
@@ -2027,6 +2027,9 @@
static void fts_resume_work(struct work_struct *work)
{
struct fts_ts_data *ts_data = container_of(work, struct fts_ts_data, resume_work);
+ if (ts_data == NULL) {
+ printk("ts_data is NULL \n");
+ }
// fts_ts_resume(ts_data->dev);
}
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_flash/focaltech_upgrade_ft8756m.c b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_flash/focaltech_upgrade_ft8756m.c
index f506aad..a4a0d67 100755
--- a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_flash/focaltech_upgrade_ft8756m.c
+++ b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/focaltech_flash/focaltech_upgrade_ft8756m.c
@@ -38,7 +38,7 @@
* Global variable or extern global variabls/functions
*****************************************************************************/
u8 pb_file_ft8756[] = {
-#include "../include/pramboot/FT8756_Pramboot_V1.3_20200116.i"
+#include "../include/pramboot/FT8756_Pramboot_V1.3_20200116.h"
};
/*****************************************************************************
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample.i b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample.h
similarity index 100%
rename from longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample.i
rename to longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample.h
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample_1.i b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample_1.h
similarity index 100%
rename from longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample_1.i
rename to longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/firmware/fw_sample_1.h
diff --git a/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/pramboot/FT8756_Pramboot_V1.3_20200116.i b/longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/pramboot/FT8756_Pramboot_V1.3_20200116.h
similarity index 100%
rename from longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/pramboot/FT8756_Pramboot_V1.3_20200116.i
rename to longan/kernel/linux-4.9/drivers/input/touchscreen/focaltech_touch_ft8756/include/pramboot/FT8756_Pramboot_V1.3_20200116.h
--
Gitblit v1.6.2