Merge tag 'gpio-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / drivers / gpio / gpio-menz127.c

diff --git a/drivers/gpio/gpio-menz127.c b/drivers/gpio/gpio-menz127.c
index c5c9599..cc103af 100644 (file)
--- a/drivers/gpio/gpio-menz127.c
+++ b/drivers/gpio/gpio-menz127.c
@@ -35,7 +35,6 @@
 struct men_z127_gpio {
        struct gpio_chip gc;
        void __iomem *reg_base;
-       struct mcb_device *mdev;
        struct resource *mem;
 };
 
@@ -43,7 +42,7 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
                             unsigned debounce)
 {
        struct men_z127_gpio *priv = gpiochip_get_data(gc);
-       struct device *dev = &priv->mdev->dev;
+       struct device *dev = gc->parent;
        unsigned int rnd;
        u32 db_en, db_cnt;
 
@@ -88,21 +87,25 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio,
        return 0;
 }
 
-static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)
+static int men_z127_set_single_ended(struct gpio_chip *gc,
+                                    unsigned offset,
+                                    enum single_ended_mode mode)
 {
        struct men_z127_gpio *priv = gpiochip_get_data(gc);
        u32 od_en;
 
-       if (gpio_pin >= gc->ngpio)
-               return -EINVAL;
+       if (mode != LINE_MODE_OPEN_DRAIN &&
+           mode != LINE_MODE_PUSH_PULL)
+               return -ENOTSUPP;
 
        spin_lock(&gc->bgpio_lock);
        od_en = readl(priv->reg_base + MEN_Z127_ODER);
 
-       if (gpiochip_line_is_open_drain(gc, gpio_pin))
-               od_en |= BIT(gpio_pin);
+       if (mode == LINE_MODE_OPEN_DRAIN)
+               od_en |= BIT(offset);
        else
-               od_en &= ~BIT(gpio_pin);
+               /* Implicitly LINE_MODE_PUSH_PULL */
+               od_en &= ~BIT(offset);
 
        writel(od_en, priv->reg_base + MEN_Z127_ODER);
        spin_unlock(&gc->bgpio_lock);
@@ -135,7 +138,6 @@ static int men_z127_probe(struct mcb_device *mdev,
                goto err_release;
        }
 
-       men_z127_gpio->mdev = mdev;
        mcb_set_drvdata(mdev, men_z127_gpio);
 
        ret = bgpio_init(&men_z127_gpio->gc, &mdev->dev, 4,
@@ -148,7 +150,7 @@ static int men_z127_probe(struct mcb_device *mdev,
                goto err_unmap;
 
        men_z127_gpio->gc.set_debounce = men_z127_debounce;
-       men_z127_gpio->gc.request = men_z127_request;
+       men_z127_gpio->gc.set_single_ended = men_z127_set_single_ended;
 
        ret = gpiochip_add_data(&men_z127_gpio->gc, men_z127_gpio);
        if (ret) {