summaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorSeongho Joo <sjoo@nvidia.com>2011-06-16 00:09:21 +0900
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:26 -0800
commit27ad502db3f5187b442c4077090b63af7b2fcfb6 (patch)
treec6e615efb284fe9722165fa395c9bfe9a6406dc0 /drivers/gpio
parent8a3949c945142e438874b2d75ded6ed25f8a3ded (diff)
arm: tegra: gpio_get_value can read output gpio
gpio_get_value only supports input pin. extend the usage for output pin. Bug 839772 Original-Change-Id: I5a8f5572148afde23e082af18f2e37377ae50bd1 Reviewed-on: http://git-master/r/36758 Tested-by: Seongho Joo <sjoo@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Rebase-Id: R021e8ff272e4cecd855a574b008dbf8663378970
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-tegra.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index e42ebe0be017..40a813c29968 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -138,6 +138,8 @@ 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 (( __raw_readl(GPIO_OE(offset)) >> GPIO_BIT(offset)) & 0x1)
+ return (__raw_readl(GPIO_OUT(offset)) >> GPIO_BIT(offset)) & 0x1;
return (__raw_readl(GPIO_IN(offset)) >> GPIO_BIT(offset)) & 0x1;
}