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.9 01/35] pinctrl: meson: fix pull enable register calculation
Date: Wed, 26 Dec 2018 17:41:08 -0500 [thread overview]
Message-ID: <20181226224142.150866-1-sashal@kernel.org> (raw)
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 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,
case PIN_CONFIG_BIAS_DISABLE:
dev_dbg(pc->dev, "pin %u: disable bias\n", pin);
- meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit);
+ meson_calc_reg_and_bit(bank, pin, REG_PULLEN, ®,
+ &bit);
ret = regmap_update_bits(pc->reg_pullen, reg,
BIT(bit), 0);
if (ret)
--
2.19.1
next reply other threads:[~2018-12-26 23:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 22:41 Sasha Levin [this message]
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 02/35] powerpc: Fix COFF zImage booting on old powermacs Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 03/35] ARM: imx: update the cpu power up timing setting on i.mx6sx Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 04/35] ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 05/35] Input: restore EV_ABS ABS_RESERVED Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 06/35] checkstack.pl: fix for aarch64 Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 07/35] xfrm: Fix bucket count reported to userspace Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 08/35] netfilter: seqadj: re-load tcp header pointer after possible head reallocation Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 09/35] scsi: bnx2fc: Fix NULL dereference in error handling Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 10/35] Input: omap-keypad - fix idle configuration to not block SoC idle states Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 11/35] USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 12/35] netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 13/35] bnx2x: Clear fip MAC when fcoe offload support is disabled Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 14/35] bnx2x: Remove configured vlans as part of unload sequence Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 15/35] bnx2x: Send update-svid ramrod with retry/poll flags enabled Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 16/35] scsi: target: iscsi: cxgbit: fix csk leak Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 17/35] scsi: target: iscsi: cxgbit: add missing spin_lock_init() Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 18/35] drivers: net: xgene: Remove unnecessary forward declarations Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 19/35] w90p910_ether: remove incorrect __init annotation Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 20/35] net: hns: Incorrect offset address used for some registers Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 21/35] net: hns: All ports can not work when insmod hns ko after rmmod Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 22/35] net: hns: Some registers use wrong address according to the datasheet Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 23/35] net: hns: Fixed bug that netdev was opened twice Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 24/35] net: hns: Clean rx fbd when ae stopped Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 25/35] net: hns: Free irq when exit from abnormal branch Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 26/35] net: hns: Avoid net reset caused by pause frames storm Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 27/35] net: hns: Fix ntuple-filters status error Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 28/35] net: hns: Add mac pcs config when enable|disable mac Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 29/35] SUNRPC: Fix a race with XPRT_CONNECTING Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 30/35] x86/mtrr: Don't copy uninitialized gentry fields back to userspace Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 31/35] lan78xx: Resolve issue with changing MAC address Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 32/35] xen/netfront: tolerate frags with no data Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 33/35] vxge: ensure data0 is initialized in when fetching firmware version information Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 34/35] net: netxen: fix a missing check and an uninitialized use Sasha Levin
2018-12-26 22:41 ` [PATCH AUTOSEL 4.9 35/35] serial/sunsu: fix refcount leak 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=20181226224142.150866-1-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).