summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2019-03-06 15:02:55 +0100
committerLinus Walleij <linus.walleij@linaro.org>2019-03-08 14:11:30 +0100
commitf777cda3937007ef2818644bfa6d383c69d6bb28 (patch)
tree621ef6024f2c0922552bf6c594a6941fd4a475f9
parentx86: apuv2: remove unused variable (diff)
downloadlinux-f777cda3937007ef2818644bfa6d383c69d6bb28.tar.xz
linux-f777cda3937007ef2818644bfa6d383c69d6bb28.zip
gpio: amd-fch: Set proper output level for direction_output
Current amd_fch_gpio_direction_output implementation ignores the value argument, fix it so direction_output will set proper output level. Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Reviewed-by: Enrico Weigelt <info@metux.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-amd-fch.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-amd-fch.c b/drivers/gpio/gpio-amd-fch.c
index 4c585d4e7e74..38c3f4a3d4aa 100644
--- a/drivers/gpio/gpio-amd-fch.c
+++ b/drivers/gpio/gpio-amd-fch.c
@@ -65,9 +65,18 @@ static int amd_fch_gpio_direction_output(struct gpio_chip *gc,
unsigned long flags;
struct amd_fch_gpio_priv *priv = gpiochip_get_data(gc);
void __iomem *ptr = amd_fch_gpio_addr(priv, gpio);
+ u32 val;
spin_lock_irqsave(&priv->lock, flags);
- writel_relaxed(readl_relaxed(ptr) | AMD_FCH_GPIO_FLAG_DIRECTION, ptr);
+
+ val = readl_relaxed(ptr);
+ if (value)
+ val |= AMD_FCH_GPIO_FLAG_WRITE;
+ else
+ val &= ~AMD_FCH_GPIO_FLAG_WRITE;
+
+ writel_relaxed(val | AMD_FCH_GPIO_FLAG_DIRECTION, ptr);
+
spin_unlock_irqrestore(&priv->lock, flags);
return 0;