diff --git a/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h b/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h index a9b4f1ae3d39..ec826e6b7b3a 100755 --- a/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h +++ b/drivers/input/touchscreen/ili9882_mmi/firmware/ili9882_fw.h @@ -83,7 +83,7 @@ static unsigned char CTPM_FW_TXD[] = { #define TXD_9882H_FW_FILP_PATH "/sdcard/ILITEK_FW_TXD_9882H" #define TXD_9882H_INI_REQUEST_PATH "mp_txd_9882h.ini" #define TXD_9882H_FW_REQUEST_PATH "ILITEK_FW_TXD_9882H" -static unsigned char CTPM_FW_TXD_9882N[] = { +static unsigned char CTPM_FW_TXD_9882H[] = { 0xFF, }; @@ -91,7 +91,15 @@ static unsigned char CTPM_FW_TXD_9882N[] = { #define TXD_9882N_FW_FILP_PATH "/sdcard/ILITEK_FW_TXD_9882N" #define TXD_9882N_INI_REQUEST_PATH "mp_txd_9882n.ini" #define TXD_9882N_FW_REQUEST_PATH "ILITEK_FW_TXD_9882N" -static unsigned char CTPM_FW_TXD_9882H[] = { +static unsigned char CTPM_FW_TXD_9882N[] = { + 0xFF, +}; + +#define TXD_7806S_INI_NAME_PATH "/sdcard/mp_txd_7806s.ini" +#define TXD_7806S_FW_FILP_PATH "/sdcard/ILITEK_FW_TXD_7806S" +#define TXD_7806S_INI_REQUEST_PATH "mp_txd_7806s.ini" +#define TXD_7806S_FW_REQUEST_PATH "ILITEK_FW_TXD_7806S" +static unsigned char CTPM_FW_TXD_7806S[] = { 0xFF, }; diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.c b/drivers/input/touchscreen/ili9882_mmi/ili9882.c index 85fcbde8c7dd..1d0a1bb3be6a 100644 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.c @@ -973,6 +973,15 @@ static void ili_update_tp_module_info(void) ilits->md_fw_ili = CTPM_FW_TXD_9882N; ilits->md_fw_ili_size = sizeof(CTPM_FW_TXD_9882N); break; + case MODEL_TXD_7806S: + ilits->md_name = "TXD_7806S"; + ilits->md_fw_filp_path = TXD_7806S_FW_FILP_PATH; + ilits->md_fw_rq_path = TXD_7806S_FW_REQUEST_PATH; + ilits->md_ini_path = TXD_7806S_INI_NAME_PATH; + ilits->md_ini_rq_path = TXD_7806S_INI_REQUEST_PATH; + ilits->md_fw_ili = CTPM_FW_TXD_7806S; + ilits->md_fw_ili_size = sizeof(CTPM_FW_TXD_7806S); + break; case MODEL_TM: ilits->md_name = "ILITEK_TDDI_TM"; ilits->md_fw_filp_path = TM_FW_REQUEST_PATH; diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.h b/drivers/input/touchscreen/ili9882_mmi/ili9882.h index 36e095943024..8988fe81c3bc 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.h +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.h @@ -344,6 +344,7 @@ enum TP_MODEL { MODEL_TXD, MODEL_TXD_9882H, MODEL_TXD_9882N, + MODEL_TXD_7806S, MODEL_TM, MODEL_TM_9882N, MODEL_TM_9882H, diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c b/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c index 92bbe653bcf6..2b1878a86f7a 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882_spi.c @@ -451,6 +451,8 @@ static int ili_parse_tp_module() tp_module = MODEL_TXD_9882H; } else if (strstr(active_panel_name, "ili9882n")) { tp_module = MODEL_TXD_9882N; + } else if (strstr(active_panel_name, "ili7806s")) { + tp_module = MODEL_TXD_7806S; } } else if (strstr(active_panel_name, "tm")) { // || strstr(active_panel_name, "tianma")) { if (strstr(active_panel_name, "ili9882n")) {