| From d46dd4bcb031b2ced3912d59bdc29d492e365b64 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 11 May 2022 10:15:04 +0800 |
| Subject: gpio: gpio-vf610: do not touch other bits when set the target bit |
| |
| From: Haibo Chen <haibo.chen@nxp.com> |
| |
| [ Upstream commit 9bf3ac466faa83d51a8fe9212131701e58fdef74 ] |
| |
| 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> |
| Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 e0f2b67558e7..47e191e11c69 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.35.1 |
| |