| Message ID | 20200622214548.265417-2-paul@crapouillou.net |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH | expand |
Hi
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag
fixing commit: ebd6651418b6 ("pinctrl: ingenic: Implement .get_direction for GPIO chips").
The bot has tested the following trees: v5.7.5, v5.4.48.
v5.7.5: Build OK!
v5.4.48: Failed to apply! Possible dependencies:
1948d5c51dba4 ("pinctrl: Add pinmux & GPIO controller driver for a new SoC")
3c827873590c3 ("pinctrl: Use new GPIO_LINE_DIRECTION")
54787d7c14a4a ("pinctrl: rza1: remove unnecessary static inline function")
5ec008bfac7da ("pinctrl: ingenic: Remove platform ID table")
7009d046a6011 ("pinctrl: ingenic: Handle PIN_CONFIG_OUTPUT config")
9e65527ac3bab ("pinctrl: ingenic: Fixup PIN_CONFIG_OUTPUT config")
baf15647387e8 ("pinctrl: ingenic: Put ingenic_chip_info pointer in match data")
d5a362149c4db ("pinctrl: Modify Kconfig to fix linker error")
d7da2a1e4e084 ("pinctrl: Ingenic: Add pinctrl driver for X1830.")
f742e5ebdd633 ("pinctrl: Ingenic: Introduce reg_offset and use it instead hard code.")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 241e563d5814..a8d1b53ec4c1 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -1958,7 +1958,8 @@ static int ingenic_gpio_get_direction(struct gpio_chip *gc, unsigned int offset) unsigned int pin = gc->base + offset; if (jzpc->info->version >= ID_JZ4760) { - if (ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1)) + if (ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_INT) || + ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1)) return GPIO_LINE_DIRECTION_IN; return GPIO_LINE_DIRECTION_OUT; }
The PAT1 register contains information about the IRQ type (edge/level) for input GPIOs with IRQ enabled, and the direction for non-IRQ GPIOs. So it makes sense to read it only if the GPIO has no interrupt configured, otherwise input GPIOs configured for level IRQs are misdetected as output GPIOs. Cc: stable@vger.kernel.org Fixes: ebd6651418b6 ("pinctrl: ingenic: Implement .get_direction for GPIO chips") Reported-by: João Henrique <johnnyonflame@hotmail.com> Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/pinctrl/pinctrl-ingenic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)