[PATCH 3.12 171/235] pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE

From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[PATCH 3.12 171/235] pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE
Date	2017-01-27 12:40 +0100
Message-ID	<t4d2P-3w5-29@gated-at.bofh.it> (permalink)
References	<t4cq5-32y-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

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: Jiri Slaby <jslaby@suse.cz>
---
 drivers/pinctrl/sh-pfc/pinctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c
index e758af95c209..b625a1f062bf 100644
--- a/drivers/pinctrl/sh-pfc/pinctrl.c
+++ b/drivers/pinctrl/sh-pfc/pinctrl.c
@@ -479,7 +479,8 @@ static bool sh_pfc_pinconf_validate(struct sh_pfc *pfc, unsigned int _pin,
 
 	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;
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.12 171/235] pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE Jiri Slaby <jslaby@suse.cz> - 2017-01-27 12:40 +0100

csiph-web