diff options
Diffstat (limited to 'drivers/input/touchscreen/melfas_ts.c')
| -rw-r--r-- | drivers/input/touchscreen/melfas_ts.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/input/touchscreen/melfas_ts.c b/drivers/input/touchscreen/melfas_ts.c index 4d09be4..177487b 100644 --- a/drivers/input/touchscreen/melfas_ts.c +++ b/drivers/input/touchscreen/melfas_ts.c @@ -143,7 +143,7 @@ struct melfas_ts_data { struct notifier_block fb_notif; bool was_enabled_at_suspend; #endif -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ +#if defined(CONFIG_MACH_M0_CHNOPEN) || \ defined(CONFIG_MACH_M0_CMCC) || defined(CONFIG_MACH_M0_CTC) int (*lcd_type)(void); #endif @@ -314,8 +314,7 @@ static void firmware_update(struct melfas_ts_data *ts) } pr_info("[TSP] firmware_update"); -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ - defined(CONFIG_MACH_M0_CTC) +#if defined(CONFIG_MACH_M0_CHNOPEN) || defined(CONFIG_MACH_M0_CTC) if (ts->lcd_type() == 0x20) { FW_VERSION = FW_VERSION_4_65; pr_info("[TSP] lcd type is 4.8, FW_VER: 0x%x\n", buf[3]); @@ -343,7 +342,7 @@ static void firmware_update(struct melfas_ts_data *ts) FW_VERSION = FW_VERSION_4_65; #endif -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ +#if defined(CONFIG_MACH_M0_CHNOPEN) || \ defined(CONFIG_MACH_M0_CMCC) || defined(CONFIG_MACH_M0_CTC) if (buf[3] != FW_VERSION || buf[3] == 0xFF) { #else @@ -381,7 +380,7 @@ show_firm_version_phone(struct device *dev, if (!tsp_enabled) return 0; -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ +#if defined(CONFIG_MACH_M0_CHNOPEN) || \ defined(CONFIG_MACH_M0_CMCC) || defined(CONFIG_MACH_M0_CTC) if (ts->lcd_type() == 0x20) FW_VERSION = FW_VERSION_4_65; @@ -1275,11 +1274,11 @@ static void melfas_ts_get_data(struct work_struct *work) (uint16_t) (buf[i + 1] & 0x0F) << 8 | buf[i + 2]; g_Mtouch_info[FingerID].posY = (uint16_t) (buf[i + 1] & 0xF0) << 4 | buf[i + 3]; -#if !defined(CONFIG_MACH_C1) && !defined(CONFIG_MACH_C1VZW) && \ - !defined(CONFIG_MACH_M0) && \ - !defined(CONFIG_MACH_SLP_PQ) && \ - !defined(CONFIG_MACH_SLP_PQ_LTE) && \ - !defined(CONFIG_MACH_M3) +#if !defined(CONFIG_MACH_C1) && \ + !defined(CONFIG_MACH_M3) && \ + !defined(CONFIG_MACH_M0) && \ + !defined(CONFIG_MACH_SLP_PQ) && \ + !defined(CONFIG_MACH_SLP_PQ_LTE) g_Mtouch_info[FingerID].posX = 720 - g_Mtouch_info[FingerID].posX; g_Mtouch_info[FingerID].posY = @@ -1487,7 +1486,7 @@ melfas_ts_probe(struct i2c_client *client, const struct i2c_device_id *id) ts->set_touch_i2c_to_gpio = data->set_touch_i2c_to_gpio; ts->input_event = data->input_event; -#if defined(CONFIG_MACH_C1CTC) || defined(CONFIG_MACH_M0_CHNOPEN) ||\ +#if defined(CONFIG_MACH_M0_CHNOPEN) || \ defined(CONFIG_MACH_M0_CMCC) || defined(CONFIG_MACH_M0_CTC) ts->lcd_type = data->lcd_type; #endif |