--- drivers/input/touchscreen/synaptics_i2c_rmi.h

+++ drivers/input/touchscreen/synaptics_i2c_rmi.h

@@ -45,14 +45,8 @@

#define SYNAPTICS_PRODUCT_ID_B0_SPAIR "S5000B"

#if defined(CONFIG_MACH_JACTIVE_EUR) || defined(CONFIG_MACH_JACTIVE_ATT)

-#define FW_IMAGE_NAME_B0_HSYNC "tsp_synaptics/jactive/synaptics_b0_hsync.fw"

-#define FW_IMAGE_NAME_B0_HSYNC_FAC "tsp_synaptics/jactive/synaptics_b0_hsync_fac.fw"

-

-/* NON HYNC F/W will be removed */

-/* PRODUCT ID : SY 01, SY 02, S5000B */

-#define FW_IMAGE_NAME_B0_NON_HSYNC "tsp_synaptics/jactive/synaptics_b0_non_hsync.fw"

-#define FW_IMAGE_NAME_B0_NON_HSYNC_FAC "tsp_synaptics/jactive/synaptics_b0_non_hsync_fac.fw"

-

+#define FW_IMAGE_NAME_A1 "tsp_synaptics/synaptics_JA_a1.fw"

+#define FW_IMAGE_NAME_B0_34 "tsp_synaptics/synaptics_JA_b0_3_4.fw"

#else

#define FW_IMAGE_NAME_A1 "tsp_synaptics/synaptics_a1.fw"

#define FW_IMAGE_NAME_B0_34 "tsp_synaptics/synaptics_b0_3_4.fw"

@@ -292,7 +286,6 @@ struct synaptics_rmi4_data {

int fw_version_of_bin; /* firmware version of binary */

int fw_release_date_of_ic; /* Config release data from IC */

int panel_revision; /* Octa panel revision */

- int factory_read_panel_wakeup;

bool doing_reflash;

#ifdef CONFIG_GLOVE_TOUCH