On Thu, Jan 12, 2017 at 02:42:27AM +0900, Akinobu Mita wrote:
> 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.
>
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
> ---
> drivers/input/keyboard/mpr121_touchkey.c | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
> index a2c5305..c809f70 100644
> --- a/drivers/input/keyboard/mpr121_touchkey.c
> +++ b/drivers/input/keyboard/mpr121_touchkey.c
> @@ -86,7 +86,8 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id)
> struct mpr121_touchkey *mpr121 = dev_id;
> struct i2c_client *client = mpr121->client;
> struct input_dev *input = mpr121->input_dev;
> - unsigned int key_num, key_val, pressed;
> + unsigned int bit_changed;
> + unsigned int key_num;
> int reg;
>
> reg = i2c_smbus_read_byte_data(client, ELE_TOUCH_STATUS_1_ADDR);
> @@ -104,18 +105,25 @@ static irqreturn_t mpr_touchkey_interrupt(int irq, void *dev_id)
>
> reg &= TOUCH_STATUS_MASK;
> /* use old press bit to figure out which bit changed */
> - key_num = ffs(reg ^ mpr121->statusbits) - 1;
> - pressed = reg & (1 << key_num);
> + bit_changed = reg ^ mpr121->statusbits;
> mpr121->statusbits = reg;
> + for (key_num = 0; key_num < mpr121->keycount; key_num++) {
> + unsigned int key_val, pressed;
maybe change bit_changed to long and use for_each_set_bit()?
>
> - key_val = mpr121->keycodes[key_num];
> + if (!(bit_changed & (1 << key_num)))
> + continue;
>
> - input_event(input, EV_MSC, MSC_SCAN, key_num);
> - input_report_key(input, key_val, pressed);
> - input_sync(input);
> + pressed = reg & (1 << key_num);
> + key_val = mpr121->keycodes[key_num];
> +
> + input_event(input, EV_MSC, MSC_SCAN, key_num);
> + input_report_key(input, key_val, pressed);
> +
> + dev_dbg(&client->dev, "key %d %d %s\n", key_num, key_val,
> + pressed ? "pressed" : "released");
>
> - dev_dbg(&client->dev, "key %d %d %s\n", key_num, key_val,
> - pressed ? "pressed" : "released");
> + }
> + input_sync(input);
>
> out:
> return IRQ_HANDLED;
> --
> 2.7.4
>
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
