diff options
author | Jean-Francois Dagenais <jeff.dagenais@gmail.com> | 2014-02-10 12:05:28 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 07:49:16 -0500 |
commit | 992196f28c3c0a589a3d461aab83b7af2eb7b3cf (patch) | |
tree | 920902a2e78aea7ee0240fb7019d544ea17afe02 /drivers/gpio/gpio-adp5588.c | |
parent | 390d82e312c56b75407a3606cbcde8c4bc7f10ae (diff) |
gpio: adp5588: 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: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-adp5588.c')
-rw-r--r-- | drivers/gpio/gpio-adp5588.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c index 3f190e68f973..7d3c8d942ead 100644 --- a/drivers/gpio/gpio-adp5588.c +++ b/drivers/gpio/gpio-adp5588.c | |||
@@ -67,9 +67,20 @@ static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off) | |||
67 | { | 67 | { |
68 | struct adp5588_gpio *dev = | 68 | struct adp5588_gpio *dev = |
69 | container_of(chip, struct adp5588_gpio, gpio_chip); | 69 | container_of(chip, struct adp5588_gpio, gpio_chip); |
70 | unsigned bank = ADP5588_BANK(off); | ||
71 | unsigned bit = ADP5588_BIT(off); | ||
72 | int val; | ||
70 | 73 | ||
71 | return !!(adp5588_gpio_read(dev->client, | 74 | mutex_lock(&dev->lock); |
72 | GPIO_DAT_STAT1 + ADP5588_BANK(off)) & ADP5588_BIT(off)); | 75 | |
76 | if (dev->dir[bank] & bit) | ||
77 | val = dev->dat_out[bank]; | ||
78 | else | ||
79 | val = adp5588_gpio_read(dev->client, GPIO_DAT_STAT1 + bank); | ||
80 | |||
81 | mutex_unlock(&dev->lock); | ||
82 | |||
83 | return !!(val & bit); | ||
73 | } | 84 | } |
74 | 85 | ||
75 | static void adp5588_gpio_set_value(struct gpio_chip *chip, | 86 | static void adp5588_gpio_set_value(struct gpio_chip *chip, |