diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-05-31 15:30:10 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-07 15:21:17 +0200 |
| commit | 9b692449ef425c042cc4dbc075eed9c4fbe48cf6 (patch) | |
| tree | 1afebdf9a2c41b2be1b17017446e97b15b29f936 /drivers/pinctrl | |
| parent | bb3c678900a3511e54ff51a6f75aef96932ffbdf (diff) | |
| download | linux-stable-9b692449ef425c042cc4dbc075eed9c4fbe48cf6.tar.gz linux-stable-9b692449ef425c042cc4dbc075eed9c4fbe48cf6.tar.bz2 linux-stable-9b692449ef425c042cc4dbc075eed9c4fbe48cf6.zip | |
pinctrl: uniphier: fix .pin_dbg_show() callback
commit 10ef8277ec658bf6619da9b3fd65c2db7353c2a4 upstream.
Without this, reading the "pins" in the debugfs causes kernel BUG.
Fixes: 6e9088920258 ("pinctrl: UniPhier: add UniPhier pinctrl core support")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c index 967400971d45..5d08de0b13f5 100644 --- a/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c +++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-core.c @@ -73,6 +73,12 @@ static void uniphier_pctl_pin_dbg_show(struct pinctrl_dev *pctldev, case UNIPHIER_PIN_PULL_DOWN: pull_dir = "DOWN"; break; + case UNIPHIER_PIN_PULL_UP_FIXED: + pull_dir = "UP(FIXED)"; + break; + case UNIPHIER_PIN_PULL_DOWN_FIXED: + pull_dir = "DOWN(FIXED)"; + break; case UNIPHIER_PIN_PULL_NONE: pull_dir = "NONE"; break; |