5.4-stable patches

added patches:
	pinctrl-ingenic-properly-detect-gpio-direction-when-configured-for-irq.patch

diff --git a/queue-5.4/pinctrl-ingenic-properly-detect-gpio-direction-when-configured-for-irq.patch b/queue-5.4/pinctrl-ingenic-properly-detect-gpio-direction-when-configured-for-irq.patch
new file mode 100644 (file)
index 0000000..4ad1019
--- /dev/null
+++ b/queue-5.4/pinctrl-ingenic-properly-detect-gpio-direction-when-configured-for-irq.patch
@@ -0,0 +1,42 @@
+From 84e7a946da71f678affacea301f6d5cb4d9784e8 Mon Sep 17 00:00:00 2001
+From: Paul Cercueil <paul@crapouillou.net>
+Date: Mon, 22 Jun 2020 23:45:48 +0200
+Subject: pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Paul Cercueil <paul@crapouillou.net>
+
+commit 84e7a946da71f678affacea301f6d5cb4d9784e8 upstream.
+
+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.
+
+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>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20200622214548.265417-2-paul@crapouillou.net
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pinctrl/pinctrl-ingenic.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/pinctrl/pinctrl-ingenic.c
++++ b/drivers/pinctrl/pinctrl-ingenic.c
+@@ -1644,7 +1644,8 @@ static int ingenic_gpio_get_direction(st
+       unsigned int pin = gc->base + offset;
+ 
+       if (jzpc->version >= ID_JZ4760)
+-              return ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1);
++              return ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_INT) ||
++                      ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1);
+ 
+       if (ingenic_get_pin_config(jzpc, pin, JZ4740_GPIO_SELECT))
+               return true;

diff --git a/queue-5.4/series b/queue-5.4/series
index 702b7932265230a3342c912eb69a2818d7bf9150..d3a4603e2242bb31d5b77467c02af2943e508fbc 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -73,3 +73,4 @@ remoteproc-qcom_q6v5_mss-validate-mba-firmware-size-before-load.patch
 remoteproc-qcom_q6v5_mss-validate-modem-blob-firmware-size-before-load.patch
 drm-imx-imx-ldb-disable-both-channels-for-split-mode-in-enc-disable.patch
 orangefs-get-rid-of-knob-code.patch
+pinctrl-ingenic-properly-detect-gpio-direction-when-configured-for-irq.patch