OSDN Git Service

pinctrl: meson: fix pull enable register calculation
authorJerome Brunet <jbrunet@baylibre.com>
Tue, 13 Nov 2018 10:55:36 +0000 (11:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jan 2019 08:50:54 +0000 (09:50 +0100)
commitcd9ff62bad88456448016ad5d542457147f75798
tree6e850d719875fe4138bd79e437b3d08d7356b49b
parent0dc2ffac869ca57047ffa21bec679b5e0403d383
pinctrl: meson: fix pull enable register calculation

[ 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