Linux-Amlogic Archive on
 help / Atom feed
* [PATCH AUTOSEL 4.9 01/35] pinctrl: meson: fix pull enable register calculation
@ 2018-12-26 22:41 Sasha Levin
  0 siblings, 0 replies; 1+ messages in thread
From: Sasha Levin @ 2018-12-26 22:41 UTC (permalink / raw)
  To: stable, linux-kernel
  Cc: Sasha Levin, linux-gpio, Linus Walleij, linux-amlogic, Jerome Brunet

From: Jerome Brunet <>

[ Upstream commit 614b1868a125a0ba24be08f3a7fa832ddcde6bca ]

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 <>
Acked-by: Neil Armstrong <>
Signed-off-by: Linus Walleij <>
Signed-off-by: Sasha Levin <>
 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 df61a71420b1..8e73641bd823 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -274,7 +274,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin,
 			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)

linux-amlogic mailing list

^ permalink raw reply	[flat|nested] 1+ messages in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-26 22:41 [PATCH AUTOSEL 4.9 01/35] pinctrl: meson: fix pull enable register calculation Sasha Levin

Linux-Amlogic Archive on

Archives are clonable:
	git clone --mirror linux-amlogic/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-amlogic linux-amlogic/ \
	public-inbox-index linux-amlogic

Newsgroup available over NNTP:

AGPL code for this site: git clone public-inbox