lkml.org 
[lkml]   [2010]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 061/123] gpiolib: Actually set output state in wm831x_gpio_direction_output()
    2.6.33-stable review patch.  If anyone has any objections, please let me know.

    -----------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit 3383d23d86791503559cb87837491af37469d9e5 upstream.

    wm831x_gpio_direction_output() ignored the state passed into it.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpio/wm831x-gpio.c | 22 +++++++++++++++-------
    1 file changed, 15 insertions(+), 7 deletions(-)

    --- a/drivers/gpio/wm831x-gpio.c
    +++ b/drivers/gpio/wm831x-gpio.c
    @@ -60,23 +60,31 @@ static int wm831x_gpio_get(struct gpio_c
    return 0;
    }

    -static int wm831x_gpio_direction_out(struct gpio_chip *chip,
    - unsigned offset, int value)
    +static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
    {
    struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
    struct wm831x *wm831x = wm831x_gpio->wm831x;

    - return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
    - WM831X_GPN_DIR | WM831X_GPN_TRI, 0);
    + wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,
    + value << offset);
    }

    -static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
    +static int wm831x_gpio_direction_out(struct gpio_chip *chip,
    + unsigned offset, int value)
    {
    struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
    struct wm831x *wm831x = wm831x_gpio->wm831x;
    + int ret;

    - wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,
    - value << offset);
    + ret = wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
    + WM831X_GPN_DIR | WM831X_GPN_TRI, 0);
    + if (ret < 0)
    + return ret;
    +
    + /* Can only set GPIO state once it's in output mode */
    + wm831x_gpio_set(chip, offset, value);
    +
    + return 0;
    }

    static int wm831x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)



    \
     
     \ /
      Last update: 2010-03-13 02:25    [W:0.033 / U:0.204 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site