Re: [PATCH 02/15] dm: gpio: Rename set_dir_flags() method to update_flags()
Hi Simon, On 1/15/21 3:04 PM, Simon Glass wrote: The current method is a misnomer since it is also used (e.g. by stm32) to update pull settings and open source/open drain. Rename it and expand the documentation to cover a few more details. Signed-off-by: Simon Glass --- drivers/gpio/gpio-uclass.c | 16 drivers/gpio/sandbox.c | 6 +++--- drivers/gpio/stm32_gpio.c | 6 +++--- drivers/pinctrl/pinctrl-stmfx.c | 6 +++--- include/asm-generic/gpio.h | 30 -- test/dm/gpio.c | 8 6 files changed, 45 insertions(+), 27 deletions(-) Reviewed-by: Patrick Delaunay Thanks Patrick
Re: [PATCH 02/15] dm: gpio: Rename set_dir_flags() method to update_flags()
Hi Simon,
> Subject: [PATCH 02/15] dm: gpio: Rename set_dir_flags() method to
> update_flags()
Why not call it set_flags()? Matches up nicely with get_flags() in
03/15.
On 15/01/21 07:04AM, Simon Glass wrote:
> The current method is a misnomer since it is also used (e.g. by stm32) to
> update pull settings and open source/open drain.
>
> Rename it and expand the documentation to cover a few more details.
>
> Signed-off-by: Simon Glass
> ---
>
> drivers/gpio/gpio-uclass.c | 16
> drivers/gpio/sandbox.c | 6 +++---
> drivers/gpio/stm32_gpio.c | 6 +++---
> drivers/pinctrl/pinctrl-stmfx.c | 6 +++---
> include/asm-generic/gpio.h | 30 --
> test/dm/gpio.c | 8
> 6 files changed, 45 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
> index e84b68db772..0862a28bf86 100644
> --- a/drivers/gpio/gpio-uclass.c
> +++ b/drivers/gpio/gpio-uclass.c
> @@ -619,7 +619,7 @@ static int check_dir_flags(ulong flags)
> return 0;
> }
>
> -static int _dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags)
> +static int _dm_gpio_update_flags(struct gpio_desc *desc, ulong flags)
> {
> struct udevice *dev = desc->dev;
> struct dm_gpio_ops *ops = gpio_get_ops(dev);
> @@ -637,9 +637,9 @@ static int _dm_gpio_set_dir_flags(struct gpio_desc *desc,
> ulong flags)
> return ret;
> }
>
> - /* GPIOD_ are directly managed by driver in set_dir_flags*/
> - if (ops->set_dir_flags) {
> - ret = ops->set_dir_flags(dev, desc->offset, flags);
> + /* GPIOD_ are directly managed by driver in update_flags */
> + if (ops->update_flags) {
> + ret = ops->update_flags(dev, desc->offset, flags);
> } else {
> if (flags & GPIOD_IS_OUT) {
> ret = ops->direction_output(dev, desc->offset,
> @@ -666,7 +666,7 @@ int dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong
> flags)
>
> /* combine the requested flags (for IN/OUT) and the descriptor flags */
> flags |= desc->flags;
> - ret = _dm_gpio_set_dir_flags(desc, flags);
> + ret = _dm_gpio_update_flags(desc, flags);
>
> return ret;
> }
> @@ -679,7 +679,7 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
> if (ret)
> return ret;
>
> - return _dm_gpio_set_dir_flags(desc, desc->flags);
> + return _dm_gpio_update_flags(desc, desc->flags);
> }
>
> int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags)
> @@ -1307,8 +1307,8 @@ static int gpio_post_bind(struct udevice *dev)
> ops->get_function += gd->reloc_off;
> if (ops->xlate)
> ops->xlate += gd->reloc_off;
> - if (ops->set_dir_flags)
> - ops->set_dir_flags += gd->reloc_off;
> + if (ops->update_flags)
> + ops->update_flags += gd->reloc_off;
> if (ops->get_dir_flags)
> ops->get_dir_flags += gd->reloc_off;
>
> diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
> index dc8d506e8d4..029908dc9f9 100644
> --- a/drivers/gpio/sandbox.c
> +++ b/drivers/gpio/sandbox.c
> @@ -177,8 +177,8 @@ static int sb_gpio_xlate(struct udevice *dev, struct
> gpio_desc *desc,
> return 0;
> }
>
> -static int sb_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
> - ulong flags)
> +static int sb_gpio_update_flags(struct udevice *dev, unsigned int offset,
> + ulong flags)
> {
> ulong *dir_flags;
>
> @@ -272,7 +272,7 @@ static const struct dm_gpio_ops gpio_sandbox_ops = {
> .set_value = sb_gpio_set_value,
> .get_function = sb_gpio_get_function,
> .xlate = sb_gpio_xlate,
> - .set_dir_flags = sb_gpio_set_dir_flags,
> + .update_flags = sb_gpio_update_flags,
> .get_dir_flags = sb_gpio_get_dir_flags,
> #if CONFIG_IS_ENABLED(ACPIGEN)
> .get_acpi = sb_gpio_get_acpi,
> diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
> index 79d55e812db..daae6ddb93f 100644
> --- a/drivers/gpio/stm32_gpio.c
> +++ b/drivers/gpio/stm32_gpio.c
> @@ -189,8 +189,8 @@ static int stm32_gpio_get_function(struct udevice *dev,
> unsigned int offset)
> return GPIOF_FUNC;
> }
>
> -static int stm32_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
> -
[PATCH 02/15] dm: gpio: Rename set_dir_flags() method to update_flags()
The current method is a misnomer since it is also used (e.g. by stm32) to
update pull settings and open source/open drain.
Rename it and expand the documentation to cover a few more details.
Signed-off-by: Simon Glass
---
drivers/gpio/gpio-uclass.c | 16
drivers/gpio/sandbox.c | 6 +++---
drivers/gpio/stm32_gpio.c | 6 +++---
drivers/pinctrl/pinctrl-stmfx.c | 6 +++---
include/asm-generic/gpio.h | 30 --
test/dm/gpio.c | 8
6 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index e84b68db772..0862a28bf86 100644
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -619,7 +619,7 @@ static int check_dir_flags(ulong flags)
return 0;
}
-static int _dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags)
+static int _dm_gpio_update_flags(struct gpio_desc *desc, ulong flags)
{
struct udevice *dev = desc->dev;
struct dm_gpio_ops *ops = gpio_get_ops(dev);
@@ -637,9 +637,9 @@ static int _dm_gpio_set_dir_flags(struct gpio_desc *desc,
ulong flags)
return ret;
}
- /* GPIOD_ are directly managed by driver in set_dir_flags*/
- if (ops->set_dir_flags) {
- ret = ops->set_dir_flags(dev, desc->offset, flags);
+ /* GPIOD_ are directly managed by driver in update_flags */
+ if (ops->update_flags) {
+ ret = ops->update_flags(dev, desc->offset, flags);
} else {
if (flags & GPIOD_IS_OUT) {
ret = ops->direction_output(dev, desc->offset,
@@ -666,7 +666,7 @@ int dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong
flags)
/* combine the requested flags (for IN/OUT) and the descriptor flags */
flags |= desc->flags;
- ret = _dm_gpio_set_dir_flags(desc, flags);
+ ret = _dm_gpio_update_flags(desc, flags);
return ret;
}
@@ -679,7 +679,7 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
if (ret)
return ret;
- return _dm_gpio_set_dir_flags(desc, desc->flags);
+ return _dm_gpio_update_flags(desc, desc->flags);
}
int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags)
@@ -1307,8 +1307,8 @@ static int gpio_post_bind(struct udevice *dev)
ops->get_function += gd->reloc_off;
if (ops->xlate)
ops->xlate += gd->reloc_off;
- if (ops->set_dir_flags)
- ops->set_dir_flags += gd->reloc_off;
+ if (ops->update_flags)
+ ops->update_flags += gd->reloc_off;
if (ops->get_dir_flags)
ops->get_dir_flags += gd->reloc_off;
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index dc8d506e8d4..029908dc9f9 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -177,8 +177,8 @@ static int sb_gpio_xlate(struct udevice *dev, struct
gpio_desc *desc,
return 0;
}
-static int sb_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
-ulong flags)
+static int sb_gpio_update_flags(struct udevice *dev, unsigned int offset,
+ ulong flags)
{
ulong *dir_flags;
@@ -272,7 +272,7 @@ static const struct dm_gpio_ops gpio_sandbox_ops = {
.set_value = sb_gpio_set_value,
.get_function = sb_gpio_get_function,
.xlate = sb_gpio_xlate,
- .set_dir_flags = sb_gpio_set_dir_flags,
+ .update_flags = sb_gpio_update_flags,
.get_dir_flags = sb_gpio_get_dir_flags,
#if CONFIG_IS_ENABLED(ACPIGEN)
.get_acpi = sb_gpio_get_acpi,
diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c
index 79d55e812db..daae6ddb93f 100644
--- a/drivers/gpio/stm32_gpio.c
+++ b/drivers/gpio/stm32_gpio.c
@@ -189,8 +189,8 @@ static int stm32_gpio_get_function(struct udevice *dev,
unsigned int offset)
return GPIOF_FUNC;
}
-static int stm32_gpio_set_dir_flags(struct udevice *dev, unsigned int offset,
- ulong flags)
+static int stm32_gpio_update_flags(struct udevice *dev, unsigned int offset,
+ ulong flags)
{
struct stm32_gpio_priv *priv = dev_get_priv(dev);
struct stm32_gpio_regs *regs = priv->regs;
@@ -268,7 +268,7 @@ static const struct dm_gpio_ops gpio_stm32_ops = {
.get_value = stm32_gpio_get_value,
.set_value = stm32_gpio_set_value,
.get_function = stm32_gpio_get_function,
- .set_dir_flags = stm32_gpio_set_dir_flags,
+ .update_flags = stm32_gpio_update_flags,
.get_dir_flags = stm32_gpio_get_dir_flags,
};
diff --git a/drivers/pinctrl/pinctrl-stmfx.c
