Commit 7795686d authored by Hans Verkuil's avatar Hans Verkuil Committed by Linus Walleij
Browse files

pinctrl-sunxi: sunxi_pinctrl_gpio_direction_in/output: use correct offset 



The commit that sets the direction directly without calling
pinctrl_gpio_direction(), forgot to add chip->base to the offset when
calling sunxi_pmx_gpio_set_direction().

This caused failures for various Allwinner boards which have two
GPIO blocks.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: default avatar5kft <5kft@5kft.org>
Suggested-by: default avatar5kft <5kft@5kft.org>
Reported-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Fixes: 8df89a7c (pinctrl-sunxi: don't call pinctrl_gpio_direction())
Tested-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/0f536cd8-01db-5d16-2cec-ec6d19409a49@xs4all.nl


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
[Picked from linux-next to pinctrl fixes]
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7e57714c

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+4 −2
Original line number Diff line number Diff line
@@ -837,7 +837,8 @@ static int sunxi_pinctrl_gpio_direction_input(struct gpio_chip *chip, 
{

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);



	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL, offset, true);

	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL,

					    chip->base + offset, true);

}



static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -890,7 +891,8 @@ static int sunxi_pinctrl_gpio_direction_output(struct gpio_chip *chip, 
	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);



	sunxi_pinctrl_gpio_set(chip, offset, value);

	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL, offset, false);

	return sunxi_pmx_gpio_set_direction(pctl->pctl_dev, NULL,

					    chip->base + offset, false);

}



static int sunxi_pinctrl_gpio_of_xlate(struct gpio_chip *gc,