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

Commit 33b1b38a authored by Gabor Juhos's avatar Gabor Juhos Committed by Greg Kroah-Hartman
Browse files

pinctrl: armada-37xx: use correct OUTPUT_VAL register for GPIOs > 31 



commit 947c93eb29c2a581c0b0b6d5f21af3c2b7ff6d25 upstream.

The controller has two consecutive OUTPUT_VAL registers and both
holds output value for 32 GPIOs. Due to a missing adjustment, the
current code always uses the first register while setting the
output value whereas it should use the second one for GPIOs > 31.

Add the missing armada_37xx_update_reg() call to adjust the register
according to the 'offset' parameter of the function to fix the issue.

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-1-07e9ac1ab737@gmail.com


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

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

+3 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ 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 mask, val, ret;
@@ -421,6 +422,8 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip, 
		return ret;



	reg = OUTPUT_VAL;

	armada_37xx_update_reg(&reg, &val_offset);



	val = value ? mask : 0;

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