From: Greg Kroah-Hartman Date: Sun, 3 Apr 2022 13:10:11 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.17.2~122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5784f04b6a9adc4ae800bcac9e0af0cc17af3866;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch --- diff --git a/queue-4.9/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch b/queue-4.9/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch new file mode 100644 index 00000000000..2964234ff7f --- /dev/null +++ b/queue-4.9/pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch @@ -0,0 +1,42 @@ +From 188e5834b930acd03ad3cf7c5e7aa24db9665a29 Mon Sep 17 00:00:00 2001 +From: Chen-Yu Tsai +Date: Tue, 8 Mar 2022 18:09:46 +0800 +Subject: pinctrl: pinconf-generic: Print arguments for bias-pull-* + +From: Chen-Yu Tsai + +commit 188e5834b930acd03ad3cf7c5e7aa24db9665a29 upstream. + +The bias-pull-* properties, or PIN_CONFIG_BIAS_PULL_* pin config +parameters, accept optional arguments in ohms denoting the strength of +the pin bias. + +Print these values out in debugfs as well. + +Fixes: eec450713e5c ("pinctrl: pinconf-generic: Add flag to print arguments") +Signed-off-by: Chen-Yu Tsai +Reviewed-by: AngeloGioacchino Del Regno +Tested-by: AngeloGioacchino Del Regno +Link: https://lore.kernel.org/r/20220308100956.2750295-2-wenst@chromium.org +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/pinconf-generic.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/pinctrl/pinconf-generic.c ++++ b/drivers/pinctrl/pinconf-generic.c +@@ -31,10 +31,10 @@ static const struct pin_config_item conf + PCONFDUMP(PIN_CONFIG_BIAS_BUS_HOLD, "input bias bus hold", NULL, false), + PCONFDUMP(PIN_CONFIG_BIAS_DISABLE, "input bias disabled", NULL, false), + PCONFDUMP(PIN_CONFIG_BIAS_HIGH_IMPEDANCE, "input bias high impedance", NULL, false), +- PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", NULL, false), ++ PCONFDUMP(PIN_CONFIG_BIAS_PULL_DOWN, "input bias pull down", "ohms", true), + PCONFDUMP(PIN_CONFIG_BIAS_PULL_PIN_DEFAULT, +- "input bias pull to pin specific state", NULL, false), +- PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", NULL, false), ++ "input bias pull to pin specific state", "ohms", true), ++ PCONFDUMP(PIN_CONFIG_BIAS_PULL_UP, "input bias pull up", "ohms", true), + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_DRAIN, "output drive open drain", NULL, false), + PCONFDUMP(PIN_CONFIG_DRIVE_OPEN_SOURCE, "output drive open source", NULL, false), + PCONFDUMP(PIN_CONFIG_DRIVE_PUSH_PULL, "output drive push pull", NULL, false), diff --git a/queue-4.9/series b/queue-4.9/series index cc7b11b6ea6..d48772c0436 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -151,3 +151,4 @@ kvm-prevent-module-exit-until-all-vms-are-freed.patch ubifs-add-missing-iput-if-do_tmpfile-failed-in-rename-whiteout.patch ubifs-setflags-make-dirtied_ino_d-8-bytes-aligned.patch gfs2-make-sure-fitrim-minlen-is-rounded-up-to-fs-block-size.patch +pinctrl-pinconf-generic-print-arguments-for-bias-pull.patch