diff options
| author |   Jerome Brunet <jbrunet@baylibre.com> | 2018-11-13 11:55:36 +0100 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2018-11-19 15:40:55 +0100 |
| commit | 614b1868a125a0ba24be08f3a7fa832ddcde6bca (patch) | |
| tree | 3686194fe3de91d5f7d526e28a16ca3cfcc07646 /drivers/pinctrl/meson | |
| parent | pinctrl: sdm660: Set tile property for pingroups (diff) | |
| download | linux-dev-614b1868a125a0ba24be08f3a7fa832ddcde6bca.tar.xz linux-dev-614b1868a125a0ba24be08f3a7fa832ddcde6bca.zip | |
pinctrl: meson: fix pull enable register calculation
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>
Diffstat (limited to 'drivers/pinctrl/meson')
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, ®, &bit); + meson_calc_reg_and_bit(bank, pin, REG_PULLEN, ®, + &bit); ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0); if (ret) |