From: Greg Kroah-Hartman Date: Wed, 18 Jan 2017 09:01:51 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.9.5~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06c01a51d4e839f813b9c7c821bc794074e8562d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch --- 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 index 00000000000..771fd18bfac --- /dev/null +++ b/queue-4.4/pinctrl-sh-pfc-do-not-unconditionally-support-pin_config_bias_disable.patch @@ -0,0 +1,47 @@ +From 5d7400c4acbf7fe633a976a89ee845f7333de3e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= + +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 + +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 +Acked-by: Laurent Pinchart +Signed-off-by: Geert Uytterhoeven +Signed-off-by: Greg Kroah-Hartman + +--- + 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; diff --git a/queue-4.4/series b/queue-4.4/series index e632d711d3f..fa8a1a6dac9 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -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