]>
Commit | Line | Data |
---|---|---|
7e0d956d GKH |
1 | From f24d311f92b516a8aadef5056424ccabb4068e7b Mon Sep 17 00:00:00 2001 |
2 | From: Neil Armstrong <narmstrong@baylibre.com> | |
3 | Date: Tue, 6 Dec 2016 15:08:16 +0100 | |
4 | Subject: pinctrl: meson: fix gpio request disabling other modes | |
5 | ||
6 | From: Neil Armstrong <narmstrong@baylibre.com> | |
7 | ||
8 | commit f24d311f92b516a8aadef5056424ccabb4068e7b upstream. | |
9 | ||
10 | The pinctrl_gpio_request is called with the "full" gpio number, already | |
11 | containing the base, then meson_pmx_request_gpio is then called with the | |
12 | final pin number. | |
13 | Remove the base addition when calling meson_pmx_disable_other_groups. | |
14 | ||
15 | Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") | |
16 | CC: Beniamino Galvani <b.galvani@gmail.com> | |
17 | Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> | |
18 | Acked-by: Kevin Hilman <khilman@baylibre.com> | |
19 | Acked-by: Beniamino Galvani <b.galvani@gmail.com> | |
20 | Signed-off-by: Linus Walleij <linus.walleij@linaro.org> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | drivers/pinctrl/meson/pinctrl-meson.c | 2 +- | |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
26 | ||
27 | --- a/drivers/pinctrl/meson/pinctrl-meson.c | |
28 | +++ b/drivers/pinctrl/meson/pinctrl-meson.c | |
29 | @@ -246,7 +246,7 @@ static int meson_pmx_request_gpio(struct | |
30 | { | |
31 | struct meson_pinctrl *pc = pinctrl_dev_get_drvdata(pcdev); | |
32 | ||
33 | - meson_pmx_disable_other_groups(pc, range->pin_base + offset, -1); | |
34 | + meson_pmx_disable_other_groups(pc, offset, -1); | |
35 | ||
36 | return 0; | |
37 | } |