2023-06-05 16:13:27

by Andy Shevchenko

Subject: [PATCH v1 1/2] pinctrl: merrifield: Fix open-drain pin mode configuration

Currently the pin may not be configured as open-drain in some
cases because the argument may be 0 for the boolean types of
the pin configurations. Fix this by ignoring the argument.

With that, allow to actually restore pin to the push-pull mode.

Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/pinctrl/intel/pinctrl-merrifield.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 365c391c97a3..f1d0b7576703 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -710,6 +710,11 @@ static int mrfld_config_get(struct pinctrl_dev *pctldev, unsigned int pin,

break;

+ case PIN_CONFIG_DRIVE_PUSH_PULL:
+ if (value & BUFCFG_OD_EN)
+ return -EINVAL;
+ break;
+
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
if (!(value & BUFCFG_OD_EN))
return -EINVAL;
@@ -791,10 +796,14 @@ static int mrfld_config_set_pin(struct mrfld_pinctrl *mp, unsigned int pin,

break;

+ case PIN_CONFIG_DRIVE_PUSH_PULL:
+ mask |= BUFCFG_OD_EN;
+ bits &= ~BUFCFG_OD_EN;
+ break;
+
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
mask |= BUFCFG_OD_EN;
- if (arg)
- bits |= BUFCFG_OD_EN;
+ bits |= BUFCFG_OD_EN;
break;

case PIN_CONFIG_SLEW_RATE:
@@ -826,6 +835,7 @@ static int mrfld_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
case PIN_CONFIG_BIAS_DISABLE:
case PIN_CONFIG_BIAS_PULL_UP:
case PIN_CONFIG_BIAS_PULL_DOWN:
+ case PIN_CONFIG_DRIVE_PUSH_PULL:
case PIN_CONFIG_DRIVE_OPEN_DRAIN:
case PIN_CONFIG_SLEW_RATE:
ret = mrfld_config_set_pin(mp, pin, configs[i]);
--
2.40.0.1.gaa8946217a0b

2023-06-05 16:23:55

by Andy Shevchenko

Subject: [PATCH v1 2/2] pinctrl: merrifield: Use BUFCFG_PINMODE_GPIO in ->pin_dbg_show()

Use explicit comparison to BUFCFG_PINMODE_GPIO instead of implying it.

Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index f1d0b7576703..fb6de38b1c50 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -549,7 +549,7 @@ static void mrfld_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
}

mode = (value & BUFCFG_PINMODE_MASK) >> BUFCFG_PINMODE_SHIFT;
- if (!mode)
+ if (mode == BUFCFG_PINMODE_GPIO)
seq_puts(s, "GPIO ");
else
seq_printf(s, "mode %d ", mode);
--
2.40.0.1.gaa8946217a0b

2023-06-06 05:22:54

by Mika Westerberg

Subject: Re: [PATCH v1 2/2] pinctrl: merrifield: Use BUFCFG_PINMODE_GPIO in ->pin_dbg_show()

On Mon, Jun 05, 2023 at 06:45:09PM +0300, Andy Shevchenko wrote:
> Use explicit comparison to BUFCFG_PINMODE_GPIO instead of implying it.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Acked-by: Mika Westerberg <[email protected]>

2023-06-06 05:23:00

by Mika Westerberg

Subject: Re: [PATCH v1 1/2] pinctrl: merrifield: Fix open-drain pin mode configuration

On Mon, Jun 05, 2023 at 06:45:08PM +0300, Andy Shevchenko wrote:
> Currently the pin may not be configured as open-drain in some
> cases because the argument may be 0 for the boolean types of
> the pin configurations. Fix this by ignoring the argument.
>
> With that, allow to actually restore pin to the push-pull mode.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Acked-by: Mika Westerberg <[email protected]>

2023-06-06 13:32:58

by Andy Shevchenko

Subject: Re: [PATCH v1 1/2] pinctrl: merrifield: Fix open-drain pin mode configuration

On Tue, Jun 06, 2023 at 08:12:10AM +0300, Mika Westerberg wrote:
> On Mon, Jun 05, 2023 at 06:45:08PM +0300, Andy Shevchenko wrote:
> > Currently the pin may not be configured as open-drain in some
> > cases because the argument may be 0 for the boolean types of
> > the pin configurations. Fix this by ignoring the argument.
> >
> > With that, allow to actually restore pin to the push-pull mode.
> >
> > Signed-off-by: Andy Shevchenko <[email protected]>
>
> Acked-by: Mika Westerberg <[email protected]>

Both pushed to my review and testing queue, thanks!

--
With Best Regards,
Andy Shevchenko