summaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-11-09 11:34:20 +0530
committerLinus Walleij <linus.walleij@linaro.org>2012-11-17 21:14:04 +0100
commit195812e4b6a631e8eaad4046bf6890db4328ea1f (patch)
tree1dd479a38f8a5fc49c25d9499a61017fc41cdc63 /drivers/gpio
parented32620ea72889c8a9dda278a960bce01136d9a4 (diff)
downloadop-kernel-dev-195812e4b6a631e8eaad4046bf6890db4328ea1f.zip
op-kernel-dev-195812e4b6a631e8eaad4046bf6890db4328ea1f.tar.gz
gpio: tegra: read output value when gpio is set in direction_out
Read the output value when gpio is set for the output mode for gpio_get_value(). Reading input value in direction out does not give correct value. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-tegra.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index cfd9b72..5389be8 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -134,6 +134,11 @@ static void tegra_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int tegra_gpio_get(struct gpio_chip *chip, unsigned offset)
{
+ /* If gpio is in output mode then read from the out value */
+ if ((tegra_gpio_readl(GPIO_OE(offset)) >> GPIO_BIT(offset)) & 1)
+ return (tegra_gpio_readl(GPIO_OUT(offset)) >>
+ GPIO_BIT(offset)) & 0x1;
+
return (tegra_gpio_readl(GPIO_IN(offset)) >> GPIO_BIT(offset)) & 0x1;
}
OpenPOWER on IntegriCloud