Commit 9e65527a authored by Paul Cercueil's avatar Paul Cercueil Committed by Linus Walleij
Browse files

pinctrl: ingenic: Fixup PIN_CONFIG_OUTPUT config 



JZ4760 support was added in parallel of the previous patch so this one
slipped through. The first SoC to use the new register is the JZ4760 and
not the JZ4770, fix it here.

Fixes: 7009d046 ("pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config")
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20191210164446.53912-1-paul@crapouillou.net


[Folded into OF dependency]
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent d5a36214

drivers/pinctrl/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ config PINCTRL_TB10X 


config PINCTRL_EQUILIBRIUM

	tristate "Generic pinctrl and GPIO driver for Intel Lightning Mountain SoC"

	depends on OF

	depends on OF && HAS_IOMEM

	select PINMUX

	select PINCONF

	select GPIOLIB

drivers/pinctrl/pinctrl-ingenic.c

+1 −1
Original line number Diff line number Diff line
@@ -1809,7 +1809,7 @@ static void ingenic_set_bias(struct ingenic_pinctrl *jzpc, 
static void ingenic_set_output_level(struct ingenic_pinctrl *jzpc,

				     unsigned int pin, bool high)

{

	if (jzpc->version >= ID_JZ4770)

	if (jzpc->version >= ID_JZ4760)

		ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT0, high);

	else

		ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DATA, high);

CRA Git | Maintained and supported by SUSTech CRA and CCSE