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

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

[haibo.chen]

From: Haibo Chen <haibo.chen@nxp.com>

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 <peng.fan@nxp.com>
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
---
 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

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

[Bartosz Golaszewski]

On Wed, May 11, 2022 at 4:27 AM <haibo.chen@nxp.com> wrote:
>
> From: Haibo Chen <haibo.chen@nxp.com>
>
> 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 <peng.fan@nxp.com>
> Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
> ---
>  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