--- d560b989ea1f11116718798a2a3992e48b352ca8
+++ 877aa07a428a335c9f5bfa3bc83c627dc7951b43
@@ -2173,11 +2173,7 @@ static void get_fw_ver_bin(void)
 	set_default_result(data);
 	sprintf(data->cmd_buff, "SY%02X%02X%02X",
 			rmi4_data->ic_revision_of_bin,
-#ifdef CONFIG_TOUCHSCREEN_FACTORY_PLATFORM
-			rmi4_data->factory_read_panel_wakeup,
-#else
 			rmi4_data->board->panel_touch_type,
-#endif
 			rmi4_data->fw_version_of_bin);
 	set_cmd_result(data, data->cmd_buff, strlen(data->cmd_buff));
 
@@ -2194,11 +2190,7 @@ static void get_fw_ver_ic(void)
 	set_default_result(data);
 	sprintf(data->cmd_buff, "SY%02X%02X%02X",
 			rmi4_data->ic_revision_of_ic,
-#ifdef CONFIG_TOUCHSCREEN_FACTORY_PLATFORM
-			rmi4_data->factory_read_panel_wakeup,
-#else
 			rmi4_data->board->panel_touch_type,
-#endif
 			rmi4_data->fw_version_of_ic);
 
 	set_cmd_result(data, data->cmd_buff, strlen(data->cmd_buff));
@@ -2216,14 +2208,9 @@ static void get_fac_fw_ver_bin(void)
 	const struct firmware *fw_entry = NULL;
 
 	set_default_result(data);
-#if defined(CONFIG_MACH_JACTIVE_EUR) || defined(CONFIG_MACH_JACTIVE_ATT)
-	retval = request_firmware(&fw_entry, FW_IMAGE_NAME_B0_HSYNC_FAC,
-			&rmi4_data->i2c_client->dev);
-#else
+
 	retval = request_firmware(&fw_entry, FW_IMAGE_NAME_B0_FAC,
 			&rmi4_data->i2c_client->dev);
-#endif
-
 	if (retval < 0) {
 		dev_err(&rmi4_data->i2c_client->dev,
 				"%s: factory firmware request failed\n",