Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ce2e102 authored by Gabor Juhos's avatar Gabor Juhos Committed by Greg Kroah-Hartman
Browse files

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: 6702abb3 ("pinctrl: armada-37xx: Fix direction_output() callback behavior")
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGabor Juhos <j4g8y7@gmail.com>
Link: https://lore.kernel.org/20250514-pinctrl-a37xx-fixes-v2-2-07e9ac1ab737@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33b1b38a

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+7 −8
Original line number Diff line number Diff line
@@ -409,23 +409,22 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip, 
					     unsigned int offset, int value)

{

	struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);

	unsigned int val_offset = offset;

	unsigned int reg = OUTPUT_EN;

	unsigned int en_offset = offset;

	unsigned int reg = OUTPUT_VAL;

	unsigned int mask, val, ret;



	armada_37xx_update_reg(&reg, &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)

		return ret;



	reg = OUTPUT_VAL;

	armada_37xx_update_reg(&reg, &val_offset);

	reg = OUTPUT_EN;

	armada_37xx_update_reg(&reg, &en_offset);



	val = value ? mask : 0;

	regmap_update_bits(info->regmap, reg, mask, val);

	regmap_update_bits(info->regmap, reg, mask, mask);



	return 0;

}