All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Sasha Levin <sashal@kernel.org>,
	linux-gpio@vger.kernel.org,
	Linus Walleij <linus.walleij@linaro.org>,
	linux-amlogic@lists.infradead.org,
	Jerome Brunet <jbrunet@baylibre.com>
Subject: [PATCH AUTOSEL 4.19 02/97] pinctrl: meson: fix pull enable register calculation
Date: Wed, 26 Dec 2018 17:34:22 -0500	[thread overview]
Message-ID: <20181226223557.149329-2-sashal@kernel.org> (raw)
In-Reply-To: <20181226223557.149329-1-sashal@kernel.org>

From: Jerome Brunet <jbrunet@baylibre.com>

[ 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 <jbrunet@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 4f3ab18636a3..c8eff70fdb1c 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.19.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jerome Brunet <jbrunet@baylibre.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Sasha Levin <sashal@kernel.org>,
	linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org
Subject: [PATCH AUTOSEL 4.19 02/97] pinctrl: meson: fix pull enable register calculation
Date: Wed, 26 Dec 2018 17:34:22 -0500	[thread overview]
Message-ID: <20181226223557.149329-2-sashal@kernel.org> (raw)
In-Reply-To: <20181226223557.149329-1-sashal@kernel.org>

From: Jerome Brunet <jbrunet@baylibre.com>

[ 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 <jbrunet@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 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 4f3ab18636a3..c8eff70fdb1c 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.19.1

  reply	other threads:[~2018-12-26 22:36 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-26 22:34 [PATCH AUTOSEL 4.19 01/97] ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V Sasha Levin
2018-12-26 22:34 ` Sasha Levin [this message]
2018-12-26 22:34   ` [PATCH AUTOSEL 4.19 02/97] pinctrl: meson: fix pull enable register calculation Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 03/97] arm64: dts: mt7622: fix no more console output on rfb1 Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 04/97] powerpc: Fix COFF zImage booting on old powermacs Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 05/97] powerpc/mm: Fix linux page tables build with some configs Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 06/97] HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 07/97] ARM: dts: imx7d-pico: Describe the Wifi clock Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 09/97] ARM: dts: imx7d-nitrogen7: Fix the description of " Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 10/97] IB/mlx5: Block DEVX umem from the non applicable cases Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 11/97] Input: restore EV_ABS ABS_RESERVED Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 12/97] powerpc/mm: Fallback to RAM if the altmap is unusable Sasha Levin
     [not found] ` <20181226223557.149329-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2018-12-26 22:34   ` [PATCH AUTOSEL 4.19 13/97] drm/amdgpu: Fix DEBUG_LOCKS_WARN_ON(depth <= 0) in amdgpu_ctx.lock Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 14/97] IB/core: Fix oops in netdev_next_upper_dev_rcu() Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 19/97] ieee802154: hwsim: fix off-by-one in parse nested Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 20/97] netfilter: nf_tables: fix suspicious RCU usage in nft_chain_stats_replace() Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 21/97] netfilter: seqadj: re-load tcp header pointer after possible head reallocation Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 22/97] Revert "scsi: qla2xxx: Fix NVMe Target discovery" Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 23/97] scsi: bnx2fc: Fix NULL dereference in error handling Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 24/97] Input: omap-keypad - fix idle configuration to not block SoC idle states Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 25/97] Input: synaptics - enable RMI on ThinkPad T560 Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 26/97] ibmvnic: Convert reset work item mutex to spin lock Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 27/97] ibmvnic: Fix non-atomic memory allocation in IRQ context Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 29/97] ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 30/97] x86/mm: Fix guard hole handling Sasha Levin
2018-12-26 22:34 ` Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 31/97] x86/dump_pagetables: Fix LDT remap address marker Sasha Levin
2018-12-26 22:34   ` Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 35/97] netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 36/97] netfilter: nat: can't use dst_hold on noref dst Sasha Levin
2018-12-26 22:34 ` [PATCH AUTOSEL 4.19 37/97] netfilter: nf_conncount: use rb_link_node_rcu() instead of rb_link_node() Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 41/97] scsi: target: iscsi: cxgbit: fix csk leak Sasha Levin
2018-12-26 22:35   ` Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 42/97] scsi: target: iscsi: cxgbit: add missing spin_lock_init() Sasha Levin
2018-12-26 22:35   ` Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 43/97] net/mlx5e: RX, Verify MPWQE stride size is in range Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 44/97] net/mlx5e: Cancel DIM work on close SQ Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 45/97] mt76: fix potential NULL pointer dereference in mt76_stop_tx_queues Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 65/97] mac80211: fix a kernel panic when TXing after TXQ teardown Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 66/97] SUNRPC: Fix a race with XPRT_CONNECTING Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 80/97] nl80211: fix memory leak if validate_pae_over_nl80211() fails Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 81/97] mac80211: free skb fraglist before freeing the skb Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 82/97] kbuild: fix false positive warning/error about missing libelf Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 84/97] net/mlx5e: RX, Fix wrong early return in receive queue poll Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 85/97] net/mlx5: Typo fix in del_sw_hw_rule Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 86/97] net/mlx5e: Remove the false indication of software timestamping support Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 91/97] gpio: mvebu: only fail on missing clk if pwm is actually to be used Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 92/97] Input: synaptics - enable SMBus for HP EliteBook 840 G4 Sasha Levin
2018-12-26 22:35 ` [PATCH AUTOSEL 4.19 96/97] serial/sunsu: fix refcount leak Sasha Levin
2018-12-26 22:35   ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181226223557.149329-2-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=jbrunet@baylibre.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.