| Message ID | 20200715213738.1640030-1-drew@beagleboard.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] gpio: omap: handle pin config bias flags | expand |
On Wed, Jul 15, 2020 at 11:37 PM Drew Fustini <drew@beagleboard.org> 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. > > Acked-by: Grygorii Strashko <grygorii.strashko@ti.com> > Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Drew Fustini <drew@beagleboard.org> This v2 version applied! Yours, Linus Walleij
On Thu, Jul 16, 2020 at 10:29:30AM +0200, Linus Walleij wrote: > On Wed, Jul 15, 2020 at 11:37 PM Drew Fustini <drew@beagleboard.org> 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. > > > > Acked-by: Grygorii Strashko <grygorii.strashko@ti.com> > > Acked-by: Tony Lindgren <tony@atomide.com> > > Signed-off-by: Drew Fustini <drew@beagleboard.org> > > This v2 version applied! > > Yours, > Linus Walleij Thanks! I'm curious which branch should I look in to find it? I didn't see it in any of the branches in: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/refs/ -Drew
On Fri, Jul 17, 2020 at 02:40:48PM +0200, Drew Fustini wrote: > On Thu, Jul 16, 2020 at 10:29:30AM +0200, Linus Walleij wrote: > > On Wed, Jul 15, 2020 at 11:37 PM Drew Fustini <drew@beagleboard.org> 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. > > > > > > Acked-by: Grygorii Strashko <grygorii.strashko@ti.com> > > > Acked-by: Tony Lindgren <tony@atomide.com> > > > Signed-off-by: Drew Fustini <drew@beagleboard.org> > > > > This v2 version applied! > > > > Yours, > > Linus Walleij > > Thanks! > > I'm curious which branch should I look in to find it? > > I didn't see it in any of the branches in: > https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git/refs/ > > -Drew Oh, nevermind. I found it in linux-pinctrl: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=40e30d26d909af89de2dcd0b4abdd27c47ac2235 Thanks, Drew
On Thu, Jul 16, 2020 at 12:38 AM Drew Fustini <drew@beagleboard.org> 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. ... > + 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); > + } It's a rather strange indentation of the curly braces. Don't you run checkpatch?
On Fri, Jul 17, 2020 at 08:56:45PM +0200, Drew Fustini wrote: > On Fri, Jul 17, 2020, 17:15 Andy Shevchenko <andy.shevchenko@gmail.com> > wrote: > > > On Thu, Jul 16, 2020 at 12:38 AM Drew Fustini <drew@beagleboard.org> > > 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. > > > > ... > > > > > + 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); > > > + } > > > > It's a rather strange indentation of the curly braces. Don't you run > > checkpatch? > > > > -- > > With Best Regards, > > Andy Shevchenko > > > > Thanks for pointing that out. I should have caught that. > > Linus - I submitted a v2 with the braces fixed. Please let me know if I > should send a patch just for the braces on top of what is already in > for-next. > > Thanks, > Drew Sorry for the noise. I failed to realize that I had already sent v2 (regarding the handling of the return value). I have now submitted v3 patch [0] to fix the braces formatting that Andy pointed out. thanks, drew [0] https://lore.kernel.org/linux-omap/20200717194043.1774643-1-drew@beagleboard.org/
On Fri, Jul 17, 2020 at 9:42 PM Drew Fustini <drew@beagleboard.org> wrote: > Sorry for the noise. I failed to realize that I had already sent v2 > (regarding the handling of the return value). I have now submitted v3 > patch [0] to fix the braces formatting that Andy pointed out. Oh, OK I applied the v3 instead. To the GPIO tree. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index b8e2ecc3eade..eba303cff7cb 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -896,12 +896,21 @@ static int omap_gpio_set_config(struct gpio_chip *chip, unsigned offset, unsigned long config) { u32 debounce; + int 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); + } - 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)