Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 910a9f56 authored by Jean-Francois Dagenais's avatar Jean-Francois Dagenais Committed by Dmitry Torokhov
Browse files

Input: adp5588-keys - get value from data out when dir is out 

As discussed here: http://ez.analog.com/message/35852

, the 5587 revC and
5588 revB spec sheets contain a mistake in the GPIO_DAT_STATx register
description.

According to R.Shnell at ADI, as well as my own observations, it should
read: "GPIO data status (shows GPIO state when read for inputs)".

This commit changes the get value function accordingly.

Signed-off-by: default avatarJean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 55df811f

drivers/input/keyboard/adp5588-keys.c

+11 −1
Original line number Diff line number Diff line
@@ -76,8 +76,18 @@ static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off) 
	struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);

	unsigned int bank = ADP5588_BANK(kpad->gpiomap[off]);

	unsigned int bit = ADP5588_BIT(kpad->gpiomap[off]);

	int val;



	return !!(adp5588_read(kpad->client, GPIO_DAT_STAT1 + bank) & bit);

	mutex_lock(&kpad->gpio_lock);



	if (kpad->dir[bank] & bit)

		val = kpad->dat_out[bank];

	else

		val = adp5588_read(kpad->client, GPIO_DAT_STAT1 + bank);



	mutex_unlock(&kpad->gpio_lock);



	return !!(val & bit);

}



static void adp5588_gpio_set_value(struct gpio_chip *chip,