From 87f429da74d4cc0d5d59ee44953c86df05748e14 Mon Sep 17 00:00:00 2001 From: wingte49 Date: Fri, 21 Jan 2022 21:37:54 +0800 Subject: [PATCH] rhodec:Bringup touch TXD ILI7807S Modify: - Add the configuration for txd ili7807s. - Change the ic name to ilitek_txd for CQA test. Change-Id: I61ebc4ea91dbb0e016589ff3938a31f727514144 Reviewed-on: https://gerrit.mot.com/2176648 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Yeqing Wang Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- .../input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h | 8 ++++++++ drivers/input/touchscreen/ili9882_mmi/ili9882.c | 9 +++++++++ drivers/input/touchscreen/ili9882_mmi/ili9882.h | 2 ++ drivers/input/touchscreen/ili9882_mmi/ili9882_node.c | 3 +++ drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c | 5 ++++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h b/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h index 2ab9e3f11058..70551398f81c 100755 --- a/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h +++ b/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h @@ -135,6 +135,14 @@ static unsigned char CTPM_FW_CSOT_7807S[] = { 0xFF, }; +#define TXD_7807S_INI_NAME_PATH "/sdcard/mp_txd_7807s.ini" +#define TXD_7807S_FW_FILP_PATH "/sdcard/ILITEK_FW_TXD_7807S" +#define TXD_7807S_INI_REQUEST_PATH "mp_txd_7807s.ini" +#define TXD_7807S_FW_REQUEST_PATH "ILITEK_FW_TXD_7807S" +static unsigned char CTPM_FW_TXD_7807S[] = { + 0xFF, +}; + #define TIANMA_9882N_INI_NAME_PATH "/sdcard/mp_tianma_9882n.ini" #define TIANMA_9882N_FW_FILP_PATH "/sdcard/ILITEK_FW_TIANMA_9882N" #define TIANMA_9882N_INI_REQUEST_PATH "mp_tianma_9882n.ini" diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.c b/drivers/input/touchscreen/ili9882_mmi/ili9882.c index 1bf6876b9ebd..46f329ab913a 100644 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.c @@ -984,6 +984,15 @@ static void ili_update_tp_module_info(void) ilits->md_fw_ili = CTPM_FW_CSOT_7807S; ilits->md_fw_ili_size = sizeof(CTPM_FW_CSOT_7807S); break; + case MODEL_TXD_7807S: + ilits->md_name = "TXD_7807S"; + ilits->md_fw_filp_path = TXD_7807S_FW_FILP_PATH; + ilits->md_fw_rq_path = TXD_7807S_FW_REQUEST_PATH; + ilits->md_ini_path = TXD_7807S_INI_NAME_PATH; + ilits->md_ini_rq_path = TXD_7807S_INI_REQUEST_PATH; + ilits->md_fw_ili = CTPM_FW_TXD_7807S; + ilits->md_fw_ili_size = sizeof(CTPM_FW_TXD_7807S); + break; case MODEL_AUO: ilits->md_name = "AUO"; ilits->md_fw_filp_path = AUO_FW_FILP_PATH; diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.h b/drivers/input/touchscreen/ili9882_mmi/ili9882.h index d378d4dc4883..13c465e762a4 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.h +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.h @@ -359,6 +359,8 @@ enum TP_MODEL { MODEL_TXD_9882H, MODEL_TXD_9882N, MODEL_TXD_7806S, + MODEL_TXD_7807S, + MODEL_TXD_END, //For txd panel check MODEL_TM, MODEL_TM_9882N, MODEL_TM_9882H, diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882_node.c b/drivers/input/touchscreen/ili9882_mmi/ili9882_node.c index 90e00bd185a2..c74fd303542d 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882_node.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882_node.c @@ -110,6 +110,7 @@ static unsigned char g_user_buf[USER_STR_BUFF] = {0}; #define ILI_SPI_NAME "ilitek" #define ILI_SPI_NAME_TM "ilitek_tm" #define ILI_SPI_NAME_CSOT "ilitek_csot" +#define ILI_SPI_NAME_TXD "ilitek_txd" static struct class *touchscreen_class; static struct device *touchscreen_class_dev; @@ -2568,6 +2569,8 @@ int ilitek_sys_init(void) touchscreen_class_dev = device_create(touchscreen_class, NULL, devno, NULL, ILI_SPI_NAME_TM); else if((ilits->tp_module >= MODEL_CSOT) && (ilits->tp_module < MODEL_CSOT_END)) touchscreen_class_dev = device_create(touchscreen_class, NULL, devno, NULL, ILI_SPI_NAME_CSOT); + else if((ilits->tp_module >= MODEL_TXD) && (ilits->tp_module < MODEL_TXD_END)) + touchscreen_class_dev = device_create(touchscreen_class, NULL, devno, NULL, ILI_SPI_NAME_TXD); else touchscreen_class_dev = device_create(touchscreen_class, NULL, devno, NULL, ILI_SPI_NAME); diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c b/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c index 2713ca71f87d..51a37aab2b5a 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c @@ -474,7 +474,10 @@ static int ili_parse_tp_module() if (strstr(active_panel_name, "ili7807s")) { tp_module = MODEL_CSOT_7807S; } - } + } else if (strstr(active_panel_name, "txd")) { + if (strstr(active_panel_name, "ili7807s")) { + tp_module = MODEL_TXD_7807S; + } } ILI_INFO("ili_parse_tp_module=%d\n", tp_module); return tp_module;