[PATCH 3.12 073/133] pinctrl: sunxi: Honor GPIO output initial vaules
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2014-02-04 22:04:01
Also in:
lkml
3.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen-Yu Tsai <redacted> commit fa8cf57c923e86a693a85aff1df579245a27cbb3 upstream. Some GPIO users, such as fixed-regulator, request GPIO output with initial value of 1. This was ignored by sunxi driver. Signed-off-by: Chen-Yu Tsai <redacted> Acked-by: Maxime Ripard <redacted> Signed-off-by: Linus Walleij <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/pinctrl/pinctrl-sunxi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
--- a/drivers/pinctrl/pinctrl-sunxi.c
+++ b/drivers/pinctrl/pinctrl-sunxi.c@@ -469,12 +469,6 @@ static int sunxi_pinctrl_gpio_get(struct return val; } -static int sunxi_pinctrl_gpio_direction_output(struct gpio_chip *chip, - unsigned offset, int value) -{ - return pinctrl_gpio_direction_output(chip->base + offset); -} - static void sunxi_pinctrl_gpio_set(struct gpio_chip *chip, unsigned offset, int value) {
@@ -498,6 +492,13 @@ static void sunxi_pinctrl_gpio_set(struc spin_unlock_irqrestore(&pctl->lock, flags); } +static int sunxi_pinctrl_gpio_direction_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + sunxi_pinctrl_gpio_set(chip, offset, value); + return pinctrl_gpio_direction_output(chip->base + offset); +} + static int sunxi_pinctrl_gpio_of_xlate(struct gpio_chip *gc, const struct of_phandle_args *gpiospec, u32 *flags)