]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2017 09:01:51 +0000 (10:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2017 09:01:51 +0000 (10:01 +0100)
added patches:
pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch

queue-4.4/pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-4.4/pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch b/queue-4.4/pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch
new file mode 100644 (file)
index 0000000..771fd18
--- /dev/null
@@ -0,0 +1,47 @@
+From 5d7400c4acbf7fe633a976a89ee845f7333de3e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20S=C3=B6derlund?=
+ <niklas.soderlund+renesas@ragnatech.se>
+Date: Sat, 12 Nov 2016 17:04:24 +0100
+Subject: pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
+
+commit 5d7400c4acbf7fe633a976a89ee845f7333de3e4 upstream.
+
+Always stating PIN_CONFIG_BIAS_DISABLE is supported gives untrue output
+when examining /sys/kernel/debug/pinctrl/e6060000.pfc/pinconf-pins if
+the operation get_bias() is implemented but the pin is not handled by
+the get_bias() implementation. In that case the output will state that
+"input bias disabled" indicating that this pin has bias control
+support.
+
+Make support for PIN_CONFIG_BIAS_DISABLE depend on that the pin either
+supports SH_PFC_PIN_CFG_PULL_UP or SH_PFC_PIN_CFG_PULL_DOWN. This also
+solves the issue where SoC specific implementations print error messages
+if their particular implementation of {set,get}_bias() is called with a
+pin it does not know about.
+
+Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
+Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pinctrl/sh-pfc/pinctrl.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/pinctrl/sh-pfc/pinctrl.c
++++ b/drivers/pinctrl/sh-pfc/pinctrl.c
+@@ -483,7 +483,8 @@ static bool sh_pfc_pinconf_validate(stru
+       switch (param) {
+       case PIN_CONFIG_BIAS_DISABLE:
+-              return true;
++              return pin->configs &
++                      (SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN);
+       case PIN_CONFIG_BIAS_PULL_UP:
+               return pin->configs & SH_PFC_PIN_CFG_PULL_UP;
index e632d711d3f377741ce67153ec807892d5b56268..fa8a1a6dac944864d1b10a2fdd182188a593cee2 100644 (file)
@@ -45,3 +45,4 @@ blk-mq-always-schedule-hctx-next_cpu.patch
 bus-vexpress-config-fix-device-reference-leak.patch
 powerpc-ibmebus-fix-further-device-reference-leaks.patch
 powerpc-ibmebus-fix-device-reference-leaks-in-sysfs-interface.patch
+pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch