Commit 08fea55e authored by Akinobu Mita's avatar Akinobu Mita Committed by Dmitry Torokhov

Input: mpr121 - handle multiple bits change of status register

This driver reports input events on their interrupts which are triggered
by the sensor's status register changes.  But only single bit change is
reported in the interrupt handler.  So if there are multiple bits are
changed at almost the same time, other press or release events are ignored.

This fixes it by detecting all changed bits in the status register.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9723ddc8
...@@ -86,7 +86,8 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id) ...@@ -86,7 +86,8 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id)
struct mpr121_touchkey *mpr121 = dev_id; struct mpr121_touchkey *mpr121 = dev_id;
struct i2c_client *client = mpr121->client; struct i2c_client *client = mpr121->client;
struct input_dev *input = mpr121->input_dev; struct input_dev *input = mpr121->input_dev;
unsigned int key_num, key_val, pressed; unsigned long bit_changed;
unsigned int key_num;
int reg; int reg;
reg = i2c_smbus_read_byte_data(client, ELE_TOUCH_STATUS_1_ADDR); reg = i2c_smbus_read_byte_data(client, ELE_TOUCH_STATUS_1_ADDR);
...@@ -104,19 +105,23 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id) ...@@ -104,19 +105,23 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id)
reg &= TOUCH_STATUS_MASK; reg &= TOUCH_STATUS_MASK;
/* use old press bit to figure out which bit changed */ /* use old press bit to figure out which bit changed */
key_num = ffs(reg ^ mpr121->statusbits) - 1; bit_changed = reg ^ mpr121->statusbits;
pressed = reg & (1 << key_num);
mpr121->statusbits = reg; mpr121->statusbits = reg;
for_each_set_bit(key_num, &bit_changed, mpr121->keycount) {
unsigned int key_val, pressed;
pressed = reg & BIT(key_num);
key_val = mpr121->keycodes[key_num]; key_val = mpr121->keycodes[key_num];
input_event(input, EV_MSC, MSC_SCAN, key_num); input_event(input, EV_MSC, MSC_SCAN, key_num);
input_report_key(input, key_val, pressed); input_report_key(input, key_val, pressed);
input_sync(input);
dev_dbg(&client->dev, "key %d %d %s\n", key_num, key_val, dev_dbg(&client->dev, "key %d %d %s\n", key_num, key_val,
pressed ? "pressed" : "released"); pressed ? "pressed" : "released");
}
input_sync(input);
out: out:
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment