gpio: cs5535-gpio: fix input direction

The cs5535-gpio driver's get() function was returning the output value.
This means that the GPIO pins would never work as an input, even if
configured as an input.

The driver should return the READ_BACK value, which is the sensed line
value. To make that work when the direction is 'output', INPUT_ENABLE
needs to be set.

In addition, the driver was not disabling OUTPUT_ENABLE when the direction
is set to 'input'. That would cause the GPIO to continue to drive the pin
if the direction was ever set to output.

This issue was noticed when attempting to use the gpiolib driver to read
an external input. I had previously been using the char/cs5535-gpio
driver.

Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
Acked-by: Andres Salomon <dilinger@collabora.co.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: <stable@kernel.org> [2.6.33.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Ben Gardner and committed by Linus Torvalds a8a5164c 89ea8bbe

+3 -1
+3 -1
drivers/gpio/cs5535-gpio.c
··· 154 155 static int chip_gpio_get(struct gpio_chip *chip, unsigned offset) 156 { 157 - return cs5535_gpio_isset(offset, GPIO_OUTPUT_VAL); 158 } 159 160 static void chip_gpio_set(struct gpio_chip *chip, unsigned offset, int val) ··· 172 173 spin_lock_irqsave(&chip->lock, flags); 174 __cs5535_gpio_set(chip, offset, GPIO_INPUT_ENABLE); 175 spin_unlock_irqrestore(&chip->lock, flags); 176 177 return 0; ··· 185 186 spin_lock_irqsave(&chip->lock, flags); 187 188 __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_ENABLE); 189 if (val) 190 __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_VAL);
··· 154 155 static int chip_gpio_get(struct gpio_chip *chip, unsigned offset) 156 { 157 + return cs5535_gpio_isset(offset, GPIO_READ_BACK); 158 } 159 160 static void chip_gpio_set(struct gpio_chip *chip, unsigned offset, int val) ··· 172 173 spin_lock_irqsave(&chip->lock, flags); 174 __cs5535_gpio_set(chip, offset, GPIO_INPUT_ENABLE); 175 + __cs5535_gpio_clear(chip, offset, GPIO_OUTPUT_ENABLE); 176 spin_unlock_irqrestore(&chip->lock, flags); 177 178 return 0; ··· 184 185 spin_lock_irqsave(&chip->lock, flags); 186 187 + __cs5535_gpio_set(chip, offset, GPIO_INPUT_ENABLE); 188 __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_ENABLE); 189 if (val) 190 __cs5535_gpio_set(chip, offset, GPIO_OUTPUT_VAL);