pinctrl / gpio: Introduce .set_config() callback for GPIO chips

Currently we already have two pin configuration related callbacks
available for GPIO chips .set_single_ended() and .set_debounce(). In
future we expect to have even more, which does not scale well if we need
to add yet another callback to the GPIO chip structure for each possible
configuration parameter.

Better solution is to reuse what we already have available in the
generic pinconf.

To support this, we introduce a new .set_config() callback for GPIO
chips. The callback takes a single packed pin configuration value as
parameter. This can then be extended easily beyond what is currently
supported by just adding new types to the generic pinconf enum.

If the GPIO driver is backed up by a pinctrl driver the GPIO driver can
just assign gpiochip_generic_config() (introduced in this patch) to
.set_config and that will take care configuration requests are directed
to the pinctrl driver.

We then convert the existing drivers over .set_config() and finally
remove the .set_single_ended() and .set_debounce() callbacks.

Suggested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index be97101c2c9a..433b45ef332e 100644
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -100,9 +100,8 @@ static int tc3589x_gpio_get_direction(struct gpio_chip *chip,
         return !(ret & BIT(pos));
 }
 
-static int tc3589x_gpio_set_single_ended(struct gpio_chip *chip,
-                                         unsigned int offset,
-                                         enum single_ended_mode mode)
+static int tc3589x_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
+                                   unsigned long config)
 {
         struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);
         struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
@@ -116,22 +115,22 @@ static int tc3589x_gpio_set_single_ended(struct gpio_chip *chip,
         unsigned int pos = offset % 8;
         int ret;
 
-        switch(mode) {
-        case LINE_MODE_OPEN_DRAIN:
+        switch (pinconf_to_config_param(config)) {
+        case PIN_CONFIG_DRIVE_OPEN_DRAIN:
                 /* Set open drain mode */
                 ret = tc3589x_set_bits(tc3589x, odmreg, BIT(pos), 0);
                 if (ret)
                         return ret;
                 /* Enable open drain/source mode */
                 return tc3589x_set_bits(tc3589x, odereg, BIT(pos), BIT(pos));
-        case LINE_MODE_OPEN_SOURCE:
+        case PIN_CONFIG_DRIVE_OPEN_SOURCE:
                 /* Set open source mode */
                 ret = tc3589x_set_bits(tc3589x, odmreg, BIT(pos), BIT(pos));
                 if (ret)
                         return ret;
                 /* Enable open drain/source mode */
                 return tc3589x_set_bits(tc3589x, odereg, BIT(pos), BIT(pos));
-        case LINE_MODE_PUSH_PULL:
+        case PIN_CONFIG_DRIVE_PUSH_PULL:
                 /* Disable open drain/source mode */
                 return tc3589x_set_bits(tc3589x, odereg, BIT(pos), 0);
         default:
@@ -148,7 +147,7 @@ static const struct gpio_chip template_chip = {
         .direction_output       = tc3589x_gpio_direction_output,
         .direction_input        = tc3589x_gpio_direction_input,
         .get_direction          = tc3589x_gpio_get_direction,
-        .set_single_ended       = tc3589x_gpio_set_single_ended,
+        .set_config             = tc3589x_gpio_set_config,
         .can_sleep              = true,
 };