Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[mirror_ubuntu-bionic-kernel.git] / drivers / gpio / gpio-f7188x.c

diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index daac2d480db1de8081f46f40c94306a8662b88cc..05aa538c3767a3b5e90cedd4eb95a5e89b04c4fa 100644 (file)
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -15,7 +15,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
+#include <linux/bitops.h>
 
 #define DRVNAME "gpio-f7188x"
 
@@ -129,6 +130,9 @@ static int f7188x_gpio_get(struct gpio_chip *chip, unsigned offset);
 static int f7188x_gpio_direction_out(struct gpio_chip *chip,
                                     unsigned offset, int value);
 static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value);
+static int f7188x_gpio_set_single_ended(struct gpio_chip *gc,
+                                       unsigned offset,
+                                       enum single_ended_mode mode);
 
 #define F7188X_GPIO_BANK(_base, _ngpio, _regbase)                      \
        {                                                               \
@@ -139,6 +143,7 @@ static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value);
                        .get              = f7188x_gpio_get,            \
                        .direction_output = f7188x_gpio_direction_out,  \
                        .set              = f7188x_gpio_set,            \
+                       .set_single_ended = f7188x_gpio_set_single_ended, \
                        .base             = _base,                      \
                        .ngpio            = _ngpio,                     \
                        .can_sleep        = true,                       \
@@ -217,7 +222,7 @@ static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
        superio_select(sio->addr, SIO_LD_GPIO);
 
        dir = superio_inb(sio->addr, gpio_dir(bank->regbase));
-       dir &= ~(1 << offset);
+       dir &= ~BIT(offset);
        superio_outb(sio->addr, gpio_dir(bank->regbase), dir);
 
        superio_exit(sio->addr);
@@ -238,7 +243,7 @@ static int f7188x_gpio_get(struct gpio_chip *chip, unsigned offset)
        superio_select(sio->addr, SIO_LD_GPIO);
 
        dir = superio_inb(sio->addr, gpio_dir(bank->regbase));
-       dir = !!(dir & (1 << offset));
+       dir = !!(dir & BIT(offset));
        if (dir)
                data = superio_inb(sio->addr, gpio_data_out(bank->regbase));
        else
@@ -246,7 +251,7 @@ static int f7188x_gpio_get(struct gpio_chip *chip, unsigned offset)
 
        superio_exit(sio->addr);
 
-       return !!(data & 1 << offset);
+       return !!(data & BIT(offset));
 }
 
 static int f7188x_gpio_direction_out(struct gpio_chip *chip,
@@ -264,13 +269,13 @@ static int f7188x_gpio_direction_out(struct gpio_chip *chip,
 
        data_out = superio_inb(sio->addr, gpio_data_out(bank->regbase));
        if (value)
-               data_out |= (1 << offset);
+               data_out |= BIT(offset);
        else
-               data_out &= ~(1 << offset);
+               data_out &= ~BIT(offset);
        superio_outb(sio->addr, gpio_data_out(bank->regbase), data_out);
 
        dir = superio_inb(sio->addr, gpio_dir(bank->regbase));
-       dir |= (1 << offset);
+       dir |= BIT(offset);
        superio_outb(sio->addr, gpio_dir(bank->regbase), dir);
 
        superio_exit(sio->addr);
@@ -292,14 +297,43 @@ static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 
        data_out = superio_inb(sio->addr, gpio_data_out(bank->regbase));
        if (value)
-               data_out |= (1 << offset);
+               data_out |= BIT(offset);
        else
-               data_out &= ~(1 << offset);
+               data_out &= ~BIT(offset);
        superio_outb(sio->addr, gpio_data_out(bank->regbase), data_out);
 
        superio_exit(sio->addr);
 }
 
+static int f7188x_gpio_set_single_ended(struct gpio_chip *chip,
+                                       unsigned offset,
+                                       enum single_ended_mode mode)
+{
+       int err;
+       struct f7188x_gpio_bank *bank = gpiochip_get_data(chip);
+       struct f7188x_sio *sio = bank->data->sio;
+       u8 data;
+
+       if (mode != LINE_MODE_OPEN_DRAIN &&
+           mode != LINE_MODE_PUSH_PULL)
+               return -ENOTSUPP;
+
+       err = superio_enter(sio->addr);
+       if (err)
+               return err;
+       superio_select(sio->addr, SIO_LD_GPIO);
+
+       data = superio_inb(sio->addr, gpio_out_mode(bank->regbase));
+       if (mode == LINE_MODE_OPEN_DRAIN)
+               data &= ~BIT(offset);
+       else
+               data |= BIT(offset);
+       superio_outb(sio->addr, gpio_out_mode(bank->regbase), data);
+
+       superio_exit(sio->addr);
+       return 0;
+}
+
 /*
  * Platform device and driver.
  */