aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/wm831x-gpio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index 5b8dc098d80f..d09021f4a7d3 100644
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -44,7 +44,8 @@ static int wm831x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
44 val |= WM831X_GPN_TRI; 44 val |= WM831X_GPN_TRI;
45 45
46 return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset, 46 return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
47 WM831X_GPN_DIR | WM831X_GPN_TRI, val); 47 WM831X_GPN_DIR | WM831X_GPN_TRI |
48 WM831X_GPN_FN_MASK, val);
48} 49}
49 50
50static int wm831x_gpio_get(struct gpio_chip *chip, unsigned offset) 51static int wm831x_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -84,7 +85,8 @@ static int wm831x_gpio_direction_out(struct gpio_chip *chip,
84 val |= WM831X_GPN_TRI; 85 val |= WM831X_GPN_TRI;
85 86
86 ret = wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset, 87 ret = wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,
87 WM831X_GPN_DIR | WM831X_GPN_TRI, val); 88 WM831X_GPN_DIR | WM831X_GPN_TRI |
89 WM831X_GPN_FN_MASK, val);
88 if (ret < 0) 90 if (ret < 0)
89 return ret; 91 return ret;
90 92