2020-07-09 22:37:51

by Drew Fustini

Subject: [PATCH] gpio: omap: handle pin config bias flags

Modify omap_gpio_set_config() to handle pin config bias flags by calling
gpiochip_generic_config().

The pin group for the gpio line must have the corresponding pinconf
properties:

PIN_CONFIG_BIAS_PULL_UP requires "pinctrl-single,bias-pullup"
PIN_CONFIG_BIAS_PULL_DOWN requires "pinctrl-single,bias-pulldown"

This is necessary for pcs_pinconf_set() to find the requested bias
parameter in the PIN_MAP_TYPE_CONFIGS_GROUP pinctrl map.

Signed-off-by: Drew Fustini <[email protected]>
---
drivers/gpio/gpio-omap.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index b8e2ecc3eade..a471a152f318 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -896,12 +896,25 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset,
unsigned long config)
{
u32 debounce;
+ int ret;

- if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
- return -ENOTSUPP;
+ if ((pinconf_to_config_param(config) == PIN_CONFIG_BIAS_DISABLE) ||
+ (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_UP) ||
+ (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_DOWN))
+ {
+ ret = gpiochip_generic_config(chip, offset, config);
+ }
+ else if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE)
+ {
+ debounce = pinconf_to_config_argument(config);
+ ret = omap_gpio_debounce(chip, offset, debounce);
+ }
+ else
+ {
+ ret = -ENOTSUPP;
+ }

- debounce = pinconf_to_config_argument(config);
- return omap_gpio_debounce(chip, offset, debounce);
+ return ret;
}

static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
--
2.25.1

2020-07-13 18:08:52

by Tony Lindgren

Subject: Re: [PATCH] gpio: omap: handle pin config bias flags

* Drew Fustini <[email protected]> [200709 22:35]:
> Modify omap_gpio_set_config() to handle pin config bias flags by calling
> gpiochip_generic_config().
>
> The pin group for the gpio line must have the corresponding pinconf
> properties:
>
> PIN_CONFIG_BIAS_PULL_UP requires "pinctrl-single,bias-pullup"
> PIN_CONFIG_BIAS_PULL_DOWN requires "pinctrl-single,bias-pulldown"
>
> This is necessary for pcs_pinconf_set() to find the requested bias
> parameter in the PIN_MAP_TYPE_CONFIGS_GROUP pinctrl map.

Looks good to me:

Acked-by: Tony Lindgren <[email protected]>

2020-07-15 11:18:35

by Grygorii Strashko

Subject: Re: [PATCH] gpio: omap: handle pin config bias flags

On 10/07/2020 01:34, Drew Fustini wrote:
> Modify omap_gpio_set_config() to handle pin config bias flags by calling
> gpiochip_generic_config().
>
> The pin group for the gpio line must have the corresponding pinconf
> properties:
>
> PIN_CONFIG_BIAS_PULL_UP requires "pinctrl-single,bias-pullup"
> PIN_CONFIG_BIAS_PULL_DOWN requires "pinctrl-single,bias-pulldown"
>
> This is necessary for pcs_pinconf_set() to find the requested bias
> parameter in the PIN_MAP_TYPE_CONFIGS_GROUP pinctrl map.
>
> Signed-off-by: Drew Fustini <[email protected]>
> ---
> drivers/gpio/gpio-omap.c | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
> index b8e2ecc3eade..a471a152f318 100644
> --- a/drivers/gpio/gpio-omap.c
> +++ b/drivers/gpio/gpio-omap.c
> @@ -896,12 +896,25 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset,
> unsigned long config)
> {
> u32 debounce;
> + int ret;

ret = -ENOTSUPP;

>
> - if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
> - return -ENOTSUPP;
> + if ((pinconf_to_config_param(config) == PIN_CONFIG_BIAS_DISABLE) ||
> + (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_UP) ||
> + (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_DOWN))
> + {
> + ret = gpiochip_generic_config(chip, offset, config);
> + }
> + else if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE)
> + {
> + debounce = pinconf_to_config_argument(config);
> + ret = omap_gpio_debounce(chip, offset, debounce);
> + }
> + else
> + {
> + ret = -ENOTSUPP;
> + }

drop above "else"?

>
> - debounce = pinconf_to_config_argument(config);
> - return omap_gpio_debounce(chip, offset, debounce);
> + return ret;
> }
>
> static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
>

Minor comment, Otherwise:
Acked-by: Grygorii Strashko <[email protected]>

--
Best regards,
grygorii

2020-07-15 21:33:04

by Drew Fustini

Subject: Re: [PATCH] gpio: omap: handle pin config bias flags

On Wed, Jul 15, 2020 at 01:09:12PM +0300, Grygorii Strashko wrote:
>
>
> On 10/07/2020 01:34, Drew Fustini wrote:
> > Modify omap_gpio_set_config() to handle pin config bias flags by calling
> > gpiochip_generic_config().
> >
> > The pin group for the gpio line must have the corresponding pinconf
> > properties:
> >
> > PIN_CONFIG_BIAS_PULL_UP requires "pinctrl-single,bias-pullup"
> > PIN_CONFIG_BIAS_PULL_DOWN requires "pinctrl-single,bias-pulldown"
> >
> > This is necessary for pcs_pinconf_set() to find the requested bias
> > parameter in the PIN_MAP_TYPE_CONFIGS_GROUP pinctrl map.
> >
> > Signed-off-by: Drew Fustini <[email protected]>
> > ---
> > drivers/gpio/gpio-omap.c | 21 +++++++++++++++++----
> > 1 file changed, 17 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
> > index b8e2ecc3eade..a471a152f318 100644
> > --- a/drivers/gpio/gpio-omap.c
> > +++ b/drivers/gpio/gpio-omap.c
> > @@ -896,12 +896,25 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset,
> > unsigned long config)
> > {
> > u32 debounce;
> > + int ret;
>
> ret = -ENOTSUPP;
>
> > - if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
> > - return -ENOTSUPP;
> > + if ((pinconf_to_config_param(config) == PIN_CONFIG_BIAS_DISABLE) ||
> > + (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_UP) ||
> > + (pinconf_to_config_param(config) == PIN_CONFIG_BIAS_PULL_DOWN))
> > + {
> > + ret = gpiochip_generic_config(chip, offset, config);
> > + }
> > + else if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE)
> > + {
> > + debounce = pinconf_to_config_argument(config);
> > + ret = omap_gpio_debounce(chip, offset, debounce);
> > + }
> > + else
> > + {
> > + ret = -ENOTSUPP;
> > + }
>
> drop above "else"?
>
> > - debounce = pinconf_to_config_argument(config);
> > - return omap_gpio_debounce(chip, offset, debounce);
> > + return ret;
> > }
> > static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
> >
>
> Minor comment, Otherwise:
> Acked-by: Grygorii Strashko <[email protected]>
>
> --
> Best regards,
> grygorii

Thanks for reviewing. I'll post a new version with the return value
improvement per your suggestion.

-Drew