* [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin
@ 2020-06-15 12:59 Alexandre Torgue
2020-06-15 12:59 ` [PATCH 1/2] pinctrl: stm32: return proper error code in pin_config_set Alexandre Torgue
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alexandre Torgue @ 2020-06-15 12:59 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-kernel, linux-gpio, linux-stm32, alexandre.torgue
Hi,
Currently stm32 pinctrl driver offers only the possibility to configure pins
groups thanks "pin_config_group_set" callback. To configure pins thanks to the
GPIOlib (i.e. GPIO_PULL_UP ...) this driver needs also to support
"pin_config_set" callback.
Regards
Alex
Alexandre Torgue (2):
pinctrl: stm32: return proper error code in pin_config_set
pinctrl: stm32: add possibility to configure pins individually
drivers/pinctrl/stm32/pinctrl-stm32.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] pinctrl: stm32: return proper error code in pin_config_set
2020-06-15 12:59 [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Alexandre Torgue
@ 2020-06-15 12:59 ` Alexandre Torgue
2020-06-15 12:59 ` [PATCH 2/2] pinctrl: stm32: add possibility to configure pins individually Alexandre Torgue
2020-06-20 21:08 ` [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Torgue @ 2020-06-15 12:59 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-kernel, linux-gpio, linux-stm32, alexandre.torgue
".pin_config_set" or ".pin_config_group_set" can be called with a
configuration not supported (i.e. PIN_CONFIG_PERSIST_STATE). In this case,
it is more suitable to return -ENOTSUPP instead of -EINVAL.
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index a657cd829ce6..5d9839beaa07 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1084,7 +1084,7 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev,
ret = stm32_pmx_gpio_set_direction(pctldev, range, pin, false);
break;
default:
- ret = -EINVAL;
+ ret = -ENOTSUPP;
}
return ret;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pinctrl: stm32: add possibility to configure pins individually
2020-06-15 12:59 [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Alexandre Torgue
2020-06-15 12:59 ` [PATCH 1/2] pinctrl: stm32: return proper error code in pin_config_set Alexandre Torgue
@ 2020-06-15 12:59 ` Alexandre Torgue
2020-06-20 21:08 ` [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Torgue @ 2020-06-15 12:59 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-kernel, linux-gpio, linux-stm32, alexandre.torgue
Adds the possibility to configure a single pin through the gpiolib (i.e:
to set PULL_UP/PULL_DOWN config).
Mutex behavior is slightly changed to avoid a deadlock when pin_config_set
is called (in this case pctldev->mutex is already taken).
Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 5d9839beaa07..b5cb7d9536dc 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -302,6 +302,7 @@ static const struct gpio_chip stm32_gpio_template = {
.direction_output = stm32_gpio_direction_output,
.to_irq = stm32_gpio_to_irq,
.get_direction = stm32_gpio_get_direction,
+ .set_config = gpiochip_generic_config,
};
static void stm32_gpio_irq_trigger(struct irq_data *d)
@@ -1051,7 +1052,7 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev,
struct stm32_gpio_bank *bank;
int offset, ret = 0;
- range = pinctrl_find_gpio_range_from_pin(pctldev, pin);
+ range = pinctrl_find_gpio_range_from_pin_nolock(pctldev, pin);
if (!range) {
dev_err(pctl->dev, "No gpio range defined.\n");
return -EINVAL;
@@ -1109,9 +1110,11 @@ static int stm32_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
int i, ret;
for (i = 0; i < num_configs; i++) {
+ mutex_lock(&pctldev->mutex);
ret = stm32_pconf_parse_conf(pctldev, g->pin,
pinconf_to_config_param(configs[i]),
pinconf_to_config_argument(configs[i]));
+ mutex_unlock(&pctldev->mutex);
if (ret < 0)
return ret;
@@ -1121,6 +1124,22 @@ static int stm32_pconf_group_set(struct pinctrl_dev *pctldev, unsigned group,
return 0;
}
+static int stm32_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
+ unsigned long *configs, unsigned int num_configs)
+{
+ int i, ret;
+
+ for (i = 0; i < num_configs; i++) {
+ ret = stm32_pconf_parse_conf(pctldev, pin,
+ pinconf_to_config_param(configs[i]),
+ pinconf_to_config_argument(configs[i]));
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
struct seq_file *s,
unsigned int pin)
@@ -1186,10 +1205,10 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
}
}
-
static const struct pinconf_ops stm32_pconf_ops = {
.pin_config_group_get = stm32_pconf_group_get,
.pin_config_group_set = stm32_pconf_group_set,
+ .pin_config_set = stm32_pconf_set,
.pin_config_dbg_show = stm32_pconf_dbg_show,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin
2020-06-15 12:59 [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Alexandre Torgue
2020-06-15 12:59 ` [PATCH 1/2] pinctrl: stm32: return proper error code in pin_config_set Alexandre Torgue
2020-06-15 12:59 ` [PATCH 2/2] pinctrl: stm32: add possibility to configure pins individually Alexandre Torgue
@ 2020-06-20 21:08 ` Linus Walleij
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2020-06-20 21:08 UTC (permalink / raw)
To: Alexandre Torgue; +Cc: linux-kernel, open list:GPIO SUBSYSTEM, linux-stm32
On Mon, Jun 15, 2020 at 2:59 PM Alexandre Torgue
<alexandre.torgue@st.com> wrote:
> Currently stm32 pinctrl driver offers only the possibility to configure pins
> groups thanks "pin_config_group_set" callback. To configure pins thanks to the
> GPIOlib (i.e. GPIO_PULL_UP ...) this driver needs also to support
> "pin_config_set" callback.
Nice feature growth!
Patches applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-20 21:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 12:59 [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Alexandre Torgue
2020-06-15 12:59 ` [PATCH 1/2] pinctrl: stm32: return proper error code in pin_config_set Alexandre Torgue
2020-06-15 12:59 ` [PATCH 2/2] pinctrl: stm32: add possibility to configure pins individually Alexandre Torgue
2020-06-20 21:08 ` [PATCH 0/2] pinctrl: stm32: Add possibility to configure only one pin Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).