2022-05-11 09:43:41

by Bough Chen

Subject: [PATCH v2] gpio: gpio-vf610: do not touch other bits when set the target bit

From: Haibo Chen <[email protected]>

For gpio controller contain register PDDR, when set one target bit,
current logic will clear all other bits, this is wrong. Use operator
'|=' to fix it.

Fixes: 659d8a62311f ("gpio: vf610: add imx7ulp support")
Reviewed-by: Peng Fan <[email protected]>
Signed-off-by: Haibo Chen <[email protected]>
---
drivers/gpio/gpio-vf610.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index 20780c35da1b..23cddb265a0d 100644
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -125,9 +125,13 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
{
struct vf610_gpio_port *port = gpiochip_get_data(chip);
unsigned long mask = BIT(gpio);
+ u32 val;

- if (port->sdata && port->sdata->have_paddr)
- vf610_gpio_writel(mask, port->gpio_base + GPIO_PDDR);
+ if (port->sdata && port->sdata->have_paddr) {
+ val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
+ val |= mask;
+ vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
+ }

vf610_gpio_set(chip, gpio, value);

--
2.25.1

2022-05-14 01:08:04

by Bartosz Golaszewski

Subject: Re: [PATCH v2] gpio: gpio-vf610: do not touch other bits when set the target bit

On Wed, May 11, 2022 at 4:27 AM <[email protected]> wrote:
>
> From: Haibo Chen <[email protected]>
>
> For gpio controller contain register PDDR, when set one target bit,
> current logic will clear all other bits, this is wrong. Use operator
> '|=' to fix it.
>
> Fixes: 659d8a62311f ("gpio: vf610: add imx7ulp support")
> Reviewed-by: Peng Fan <[email protected]>
> Signed-off-by: Haibo Chen <[email protected]>
> ---
> drivers/gpio/gpio-vf610.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
> index 20780c35da1b..23cddb265a0d 100644
> --- a/drivers/gpio/gpio-vf610.c
> +++ b/drivers/gpio/gpio-vf610.c
> @@ -125,9 +125,13 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
> {
> struct vf610_gpio_port *port = gpiochip_get_data(chip);
> unsigned long mask = BIT(gpio);
> + u32 val;
>
> - if (port->sdata && port->sdata->have_paddr)
> - vf610_gpio_writel(mask, port->gpio_base + GPIO_PDDR);
> + if (port->sdata && port->sdata->have_paddr) {
> + val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
> + val |= mask;
> + vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
> + }
>
> vf610_gpio_set(chip, gpio, value);
>
> --
> 2.25.1
>

Applied, thanks!

Bart