| From 840c6f99490fee8ab5a49e96e6a6379938800077 Mon Sep 17 00:00:00 2001 |
| From: Neil Armstrong <narmstrong@baylibre.com> |
| Date: Tue, 6 Dec 2016 15:08:16 +0100 |
| Subject: [PATCH] pinctrl: meson: fix gpio request disabling other modes |
| |
| commit f24d311f92b516a8aadef5056424ccabb4068e7b upstream. |
| |
| The pinctrl_gpio_request is called with the "full" gpio number, already |
| containing the base, then meson_pmx_request_gpio is then called with the |
| final pin number. |
| Remove the base addition when calling meson_pmx_disable_other_groups. |
| |
| Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") |
| CC: Beniamino Galvani <b.galvani@gmail.com> |
| Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> |
| Acked-by: Kevin Hilman <khilman@baylibre.com> |
| Acked-by: Beniamino Galvani <b.galvani@gmail.com> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c |
| index 44e69c963f5d..db879a976d5e 100644 |
| --- a/drivers/pinctrl/meson/pinctrl-meson.c |
| +++ b/drivers/pinctrl/meson/pinctrl-meson.c |
| @@ -243,7 +243,7 @@ static int meson_pmx_request_gpio(struct pinctrl_dev *pcdev, |
| { |
| struct meson_pinctrl *pc = pinctrl_dev_get_drvdata(pcdev); |
| |
| - meson_pmx_disable_other_groups(pc, range->pin_base + offset, -1); |
| + meson_pmx_disable_other_groups(pc, offset, -1); |
| |
| return 0; |
| } |
| -- |
| 2.10.1 |
| |
