Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-14 12:09:56 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-14 12:09:58 +0100
commit4914f9efd7fccf65f06d64696d590fd23712158a (patch)
tree68d98acd6eb6e637f04f7a9b7497dc8b61a5a3c9
parent9dd5b776408f45b5ed5b7b1543fd567186603fd0 (diff)
pinctrl: meson: fix pull enable register calculation
(bsc#1051510).
-rw-r--r--patches.drivers/pinctrl-meson-fix-pull-enable-register-calculation.patch44
-rw-r--r--series.conf1
2 files changed, 45 insertions, 0 deletions
diff --git a/patches.drivers/pinctrl-meson-fix-pull-enable-register-calculation.patch b/patches.drivers/pinctrl-meson-fix-pull-enable-register-calculation.patch
new file mode 100644
index 0000000000..84d63fdd44
--- /dev/null
+++ b/patches.drivers/pinctrl-meson-fix-pull-enable-register-calculation.patch
@@ -0,0 +1,44 @@
+From 614b1868a125a0ba24be08f3a7fa832ddcde6bca Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Tue, 13 Nov 2018 11:55:36 +0100
+Subject: [PATCH] pinctrl: meson: fix pull enable register calculation
+Git-commit: 614b1868a125a0ba24be08f3a7fa832ddcde6bca
+Patch-mainline: v4.20-rc7
+References: bsc#1051510
+
+We just changed the code so we apply bias disable on the correct
+register but forgot to align the register calculation. The result
+is that we apply the change on the correct register, but possibly
+at the incorrect offset/bit
+
+This went undetected because offsets tends to be the same between
+REG_PULL and REG_PULLEN for a given pin the EE controller. This
+is not true for the AO controller.
+
+Fixes: e39f9dd8206a ("pinctrl: meson: fix pinconf bias disable")
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Acked-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/pinctrl/meson/pinctrl-meson.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
+index 53d449076dee..ea87d739f534 100644
+--- a/drivers/pinctrl/meson/pinctrl-meson.c
++++ b/drivers/pinctrl/meson/pinctrl-meson.c
+@@ -191,7 +191,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,
+ case PIN_CONFIG_BIAS_DISABLE:
+ dev_dbg(pc->dev, "pin %u: disable bias\n", pin);
+
+- meson_calc_reg_and_bit(bank, pin, REG_PULL, &reg, &bit);
++ meson_calc_reg_and_bit(bank, pin, REG_PULLEN, &reg,
++ &bit);
+ ret = regmap_update_bits(pc->reg_pullen, reg,
+ BIT(bit), 0);
+ if (ret)
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index bcd6be343f..62286329aa 100644
--- a/series.conf
+++ b/series.conf
@@ -19838,6 +19838,7 @@
patches.drm/Revert-drm-rockchip-Allow-driver-to-be-shutdown-on-r.patch
patches.drm/0001-drm-amdgpu-update-SMC-firmware-image-for-polaris10-v.patch
patches.drm/0001-drm-nouveau-kms-Fix-memory-leak-in-nv50_mstm_del.patch
+ patches.drivers/pinctrl-meson-fix-pull-enable-register-calculation.patch
patches.arch/powerpc-boot-Fix-build-failures-with-j-1.patch
patches.fixes/0011-arm64-dma-mapping-Fix-FORCE_CONTIGUOUS-buffer-cleari.patch
patches.fixes/aio-fix-spectre-gadget-in-lookup_ioctx.patch