pinctrl: armada-37xx: set GPIO output value before setting direction

commit e6ebd4942981f8ad37189bbb36a3c8495e21ef4c upstream.

Changing the direction before updating the output value in the
OUTPUT_VAL register may result in a glitch on the output line
if the previous value in the OUTPUT_VAL register is different
from the one we want to set.

In order to avoid that, update the output value before changing
the direction.

Cc: stable@vger.kernel.org
Fixes: 6702abb3bf ("pinctrl: armada-37xx: Fix direction_output() callback behavior")
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
Link: https://lore.kernel.org/20250514-pinctrl-a37xx-fixes-v2-2-07e9ac1ab737@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gabor Juhos
2025-05-14 21:18:33 +02:00
committed by Greg Kroah-Hartman
parent 8f0f45a312
commit 39ed85ae48

View File

@@ -417,23 +417,22 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip,
unsigned int offset, int value) unsigned int offset, int value)
{ {
struct armada_37xx_pinctrl *info = gpiochip_get_data(chip); struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
unsigned int val_offset = offset; unsigned int en_offset = offset;
unsigned int reg = OUTPUT_EN; unsigned int reg = OUTPUT_VAL;
unsigned int mask, val, ret; unsigned int mask, val, ret;
armada_37xx_update_reg(&reg, &offset); armada_37xx_update_reg(&reg, &offset);
mask = BIT(offset); mask = BIT(offset);
val = value ? mask : 0;
ret = regmap_update_bits(info->regmap, reg, mask, mask); ret = regmap_update_bits(info->regmap, reg, mask, val);
if (ret) if (ret)
return ret; return ret;
reg = OUTPUT_VAL; reg = OUTPUT_EN;
armada_37xx_update_reg(&reg, &val_offset); armada_37xx_update_reg(&reg, &en_offset);
val = value ? mask : 0; regmap_update_bits(info->regmap, reg, mask, mask);
regmap_update_bits(info->regmap, reg, mask, val);
return 0; return 0;
} }