gpio: tps65218: use the new open drain callback

The TPS65218 supports open drain mode on its three pins,
with one of them configurable also as push-pull. Use the
new .set_single_ended() callback to set this up properly
from the core, so the core actually see it can drive the
pin(s) as open drain, and does not attempt to emulate
open drain by switching the pin to an input.

Acked-by: Nicolas Saenz Julienne <nicolassaenzj@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-tps65218.c b/drivers/gpio/gpio-tps65218.c
index 313c0e48460773771823d3114090a77099cac788..0eaeac8de9de7683bf3df6d6b67c44ef49d9fd57 100644 (file)
--- a/drivers/gpio/gpio-tps65218.c
+++ b/drivers/gpio/gpio-tps65218.c
@@ -101,16 +101,6 @@ static int tps65218_gpio_request(struct gpio_chip *gc, unsigned offset)
 
                break;
        case 1:
-               /* GP02 is push-pull by default, can be set as open drain. */
-               if (gpiochip_line_is_open_drain(gc, offset)) {
-                       ret = tps65218_clear_bits(tps65218,
-                                                 TPS65218_REG_CONFIG1,
-                                                 TPS65218_CONFIG1_GPO2_BUF,
-                                                 TPS65218_PROTECT_L1);
-                       if (ret)
-                               return ret;
-               }
-
                /* Setup GPO2 */
                ret = tps65218_clear_bits(tps65218, TPS65218_REG_CONFIG1,
                                          TPS65218_CONFIG1_IO1_SEL,
@@ -148,6 +138,40 @@ static int tps65218_gpio_request(struct gpio_chip *gc, unsigned offset)
        return 0;
 }
 
+static int tps65218_gpio_set_single_ended(struct gpio_chip *gc,
+                                         unsigned offset,
+                                         enum single_ended_mode mode)
+{
+       struct tps65218_gpio *tps65218_gpio = gpiochip_get_data(gc);
+       struct tps65218 *tps65218 = tps65218_gpio->tps65218;
+
+       switch (offset) {
+       case 0:
+       case 2:
+               /* GPO1 is hardwired to be open drain */
+               if (mode == LINE_MODE_OPEN_DRAIN)
+                       return 0;
+               return -ENOTSUPP;
+       case 1:
+               /* GPO2 is push-pull by default, can be set as open drain. */
+               if (mode == LINE_MODE_OPEN_DRAIN)
+                       return tps65218_clear_bits(tps65218,
+                                                  TPS65218_REG_CONFIG1,
+                                                  TPS65218_CONFIG1_GPO2_BUF,
+                                                  TPS65218_PROTECT_L1);
+               if (mode == LINE_MODE_PUSH_PULL)
+                       return tps65218_set_bits(tps65218,
+                                                TPS65218_REG_CONFIG1,
+                                                TPS65218_CONFIG1_GPO2_BUF,
+                                                TPS65218_CONFIG1_GPO2_BUF,
+                                                TPS65218_PROTECT_L1);
+               return -ENOTSUPP;
+       default:
+               break;
+       }
+       return -ENOTSUPP;
+}
+
 static struct gpio_chip template_chip = {
        .label                  = "gpio-tps65218",
        .owner                  = THIS_MODULE,
@@ -156,6 +180,7 @@ static struct gpio_chip template_chip = {
        .direction_input        = tps65218_gpio_input,
        .get                    = tps65218_gpio_get,
        .set                    = tps65218_gpio_set,
+       .set_single_ended       = tps65218_gpio_set_single_ended,
        .can_sleep              = true,
        .ngpio                  = 3,
        .base                   = -1,