From: Nick Dyer <nick.dyer@xxxxxxxxxxx> This patch outputs status from T48 Noise Suppression Signed-off-by: Nick Dyer <nick.dyer@xxxxxxxxxxx> Acked-by: Benson Leung <bleung@xxxxxxxxxxxx> Acked-by: Yufeng Shen <miletus@xxxxxxxxxxxx> (cherry picked from ndyer/linux/for-upstream commit 2895a6ff150a49f27a02938f8d262be238b296d8) Signed-off-by: George G. Davis <george_davis@xxxxxxxxxx> [jiada: Replace bits with symbolic names, Fixed typo in commit title & message] Signed-off-by: Jiada Wang <jiada_wang@xxxxxxxxxx> --- drivers/input/touchscreen/atmel_mxt_ts.c | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index a2189739e30f..729c8dcb9cd1 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -153,6 +153,13 @@ struct t37_debug { #define MXT_RESET_VALUE 0x01 #define MXT_BACKUP_VALUE 0x55 +/* Define for MXT_PROCG_NOISESUPPRESSION_T48 */ +#define MXT_T48_MSG_NOISESUP_FREQCHG BIT(0) +#define MXT_T48_MSG_NOISESUP_APXCHG BIT(1) +#define MXT_T48_MSG_NOISESUP_ALGOERR BIT(2) +#define MXT_T48_MSG_NOISESUP_STATCHG BIT(4) +#define MXT_T48_MSG_NOISESUP_NLVLCHG BIT(5) + /* T100 Multiple Touch Touchscreen */ #define MXT_T100_CTRL 0 #define MXT_T100_CFG1 1 @@ -320,6 +327,7 @@ struct mxt_data { u8 T9_reportid_max; u8 T19_reportid; u16 T44_address; + u8 T48_reportid; u8 T100_reportid_min; u8 T100_reportid_max; @@ -952,6 +960,24 @@ static void mxt_proc_t100_message(struct mxt_data *data, u8 *message) data->update_input = true; } +static int mxt_proc_t48_messages(struct mxt_data *data, u8 *msg) +{ + struct device *dev = &data->client->dev; + u8 status, state; + + status = msg[1]; + state = msg[4]; + + dev_dbg(dev, "T48 state %d status %02X %s%s%s%s%s\n", state, status, + status & MXT_T48_MSG_NOISESUP_FREQCHG ? "FREQCHG " : "", + status & MXT_T48_MSG_NOISESUP_APXCHG ? "APXCHG " : "", + status & MXT_T48_MSG_NOISESUP_ALGOERR ? "ALGOERR " : "", + status & MXT_T48_MSG_NOISESUP_STATCHG ? "STATCHG " : "", + status & MXT_T48_MSG_NOISESUP_NLVLCHG ? "NLVLCHG " : ""); + + return 0; +} + static int mxt_proc_message(struct mxt_data *data, u8 *message) { u8 report_id = message[0]; @@ -961,6 +987,8 @@ static int mxt_proc_message(struct mxt_data *data, u8 *message) if (report_id == data->T6_reportid) { mxt_proc_t6_messages(data, message); + } else if (report_id == data->T48_reportid) { + mxt_proc_t48_messages(data, message); } else if (!data->input_dev) { /* * Do not report events if input device @@ -1606,6 +1634,7 @@ static void mxt_free_object_table(struct mxt_data *data) data->T9_reportid_max = 0; data->T19_reportid = 0; data->T44_address = 0; + data->T48_reportid = 0; data->T100_reportid_min = 0; data->T100_reportid_max = 0; data->max_reportid = 0; @@ -1684,6 +1713,9 @@ static int mxt_parse_object_table(struct mxt_data *data, case MXT_SPT_GPIOPWM_T19: data->T19_reportid = min_id; break; + case MXT_PROCG_NOISESUPPRESSION_T48: + data->T48_reportid = min_id; + break; case MXT_TOUCH_MULTITOUCHSCREEN_T100: data->multitouch = MXT_TOUCH_MULTITOUCHSCREEN_T100; data->T100_reportid_min = min_id; -- 2.17.1