Skip to content

Commit

Permalink
Input: atmel_mxt_ts - output status from T48 Noise Supression
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
  • Loading branch information
ndyer committed Apr 26, 2016
1 parent 7086a01 commit 2895a6f
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/input/touchscreen/atmel_mxt_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ struct mxt_data {
u16 T18_address;
u8 T19_reportid;
u16 T44_address;
u8 T48_reportid;
u8 T100_reportid_min;
u8 T100_reportid_max;

Expand Down Expand Up @@ -904,6 +905,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 & 0x01 ? "FREQCHG " : "",
status & 0x02 ? "APXCHG " : "",
status & 0x04 ? "ALGOERR " : "",
status & 0x10 ? "STATCHG " : "",
status & 0x20 ? "NLVLCHG " : "");

return 0;
}

static int mxt_proc_message(struct mxt_data *data, u8 *message)
{
u8 report_id = message[0];
Expand All @@ -913,6 +932,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
Expand Down Expand Up @@ -1587,6 +1608,7 @@ static void mxt_free_object_table(struct mxt_data *data)
data->T18_address = 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;
Expand Down Expand Up @@ -1668,6 +1690,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;
Expand Down

0 comments on commit 2895a6f

Please sign in to comment.