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, 8 insertions, 5 deletions

diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fff718352e0c..5d61d0871f2e 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -1329,17 +1329,20 @@ static int cp210x_gpio_direction_output(struct gpio_chip *gc, unsigned int gpio,
         return 0;
 }
 
-static int cp210x_gpio_set_single_ended(struct gpio_chip *gc, unsigned int gpio,
-                                        enum single_ended_mode mode)
+static int cp210x_gpio_set_config(struct gpio_chip *gc, unsigned int gpio,
+                                  unsigned long config)
 {
         struct usb_serial *serial = gpiochip_get_data(gc);
         struct cp210x_serial_private *priv = usb_get_serial_data(serial);
+        enum pin_config_param param = pinconf_to_config_param(config);
 
         /* Succeed only if in correct mode (this can't be set at runtime) */
-        if ((mode == LINE_MODE_PUSH_PULL) && (priv->gpio_mode & BIT(gpio)))
+        if ((param == PIN_CONFIG_DRIVE_PUSH_PULL) &&
+            (priv->gpio_mode & BIT(gpio)))
                 return 0;
 
-        if ((mode == LINE_MODE_OPEN_DRAIN) && !(priv->gpio_mode & BIT(gpio)))
+        if ((param == PIN_CONFIG_DRIVE_OPEN_DRAIN) &&
+            !(priv->gpio_mode & BIT(gpio)))
                 return 0;
 
         return -ENOTSUPP;
@@ -1402,7 +1405,7 @@ static int cp2105_shared_gpio_init(struct usb_serial *serial)
         priv->gc.direction_output = cp210x_gpio_direction_output;
         priv->gc.get = cp210x_gpio_get;
         priv->gc.set = cp210x_gpio_set;
-        priv->gc.set_single_ended = cp210x_gpio_set_single_ended;
+        priv->gc.set_config = cp210x_gpio_set_config;
         priv->gc.owner = THIS_MODULE;
         priv->gc.parent = &serial->interface->dev;
         priv->gc.base = -1;