]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pinctrl: mvebu: armada-38x: fix incorrect total number of GPIOs
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 9 Jun 2015 16:47:00 +0000 (18:47 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 4 Jul 2015 03:02:27 +0000 (23:02 -0400)
[ Upstream commit 27e7cd016558bf787b128fd882cdd90409ae4036 ]

The pinctrl_gpio_range[] array described a first bank of 32 GPIOs and
a second one of 27 GPIOs. However, since there is a total of 60 MPP
pins that can be muxed as GPIOs, the second bank really has 28 GPIOs.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: <stable@vger.kernel.org> # v3.15+
Fixes: ca6d9a084b56f ("pinctrl: mvebu: add pin-muxing driver for the Marvell Armada 380/385")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/pinctrl/mvebu/pinctrl-armada-38x.c

index 1ee8d698eb96d212b208fb2bb76c3f20bc1c323c..adb6c238f059e08841a42eb5f09f37b9e139d11c 100644 (file)
@@ -400,7 +400,7 @@ static struct mvebu_mpp_ctrl armada_38x_mpp_controls[] = {
 
 static struct pinctrl_gpio_range armada_38x_mpp_gpio_ranges[] = {
        MPP_GPIO_RANGE(0,   0,  0, 32),
-       MPP_GPIO_RANGE(1,  32, 32, 27),
+       MPP_GPIO_RANGE(1,  32, 32, 28),
 };
 
 static int armada_38x_pinctrl_probe(struct platform_device *pdev)