diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-04-24 21:24:21 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-06-03 03:11:17 -0400 |
commit | 1ec93b9b176b3c4e065c326ccf40458fcc01e6c0 (patch) | |
tree | e84e8d92db81ffc3c6d5baccc5949bfb9b7bf3a8 | |
parent | 51f1f1cb24b870db44edcab56ffd89ecf8ce09e8 (diff) |
mfd: rdc321x: Fix off-by-one for ngpio setting
The valid gpio is GPIO0 ~ GPIO58, so ngpio should be 59.
This patch also renames RDC321X_MAX_GPIO to RDC321X_NUM_GPIO because it
actually means the number of available GPIOs.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/rdc321x-southbridge.c | 2 | ||||
-rw-r--r-- | include/linux/mfd/rdc321x.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c index c79569750be9..6575585f1d1f 100644 --- a/drivers/mfd/rdc321x-southbridge.c +++ b/drivers/mfd/rdc321x-southbridge.c | |||
@@ -38,7 +38,7 @@ static struct resource rdc321x_wdt_resource[] = { | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | static struct rdc321x_gpio_pdata rdc321x_gpio_pdata = { | 40 | static struct rdc321x_gpio_pdata rdc321x_gpio_pdata = { |
41 | .max_gpios = RDC321X_MAX_GPIO, | 41 | .max_gpios = RDC321X_NUM_GPIO, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static struct resource rdc321x_gpio_resources[] = { | 44 | static struct resource rdc321x_gpio_resources[] = { |
diff --git a/include/linux/mfd/rdc321x.h b/include/linux/mfd/rdc321x.h index 4bdf19c8eedf..442743a8f915 100644 --- a/include/linux/mfd/rdc321x.h +++ b/include/linux/mfd/rdc321x.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define RDC321X_GPIO_CTRL_REG2 0x84 | 12 | #define RDC321X_GPIO_CTRL_REG2 0x84 |
13 | #define RDC321X_GPIO_DATA_REG2 0x88 | 13 | #define RDC321X_GPIO_DATA_REG2 0x88 |
14 | 14 | ||
15 | #define RDC321X_MAX_GPIO 58 | 15 | #define RDC321X_NUM_GPIO 59 |
16 | 16 | ||
17 | struct rdc321x_gpio_pdata { | 17 | struct rdc321x_gpio_pdata { |
18 | struct pci_dev *sb_pdev; | 18 | struct pci_dev *sb_pdev; |