sunxi: gpio: Remove bank-specific size macros

Since the beginning, all banks have had space for 32 pins, even when
not all pins were implemented. Let's use a single constant for the GPIO
bank size here, like the GPIO driver is already doing.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index 59e3915c379542391dd9afcd95481a84fe632721..f3ab1aea0efd3a2cd8c68c23711b2f689ec531d1 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -93,20 +93,10 @@ struct sunxi_gpio_reg {
 #define GPIO_PULL_OFFSET(pin)  ((((pin) & 0x1f) & 0xf) << 1)
 
 /* GPIO bank sizes */
-#define SUNXI_GPIO_A_NR                32
-#define SUNXI_GPIO_B_NR                32
-#define SUNXI_GPIO_C_NR                32
-#define SUNXI_GPIO_D_NR                32
-#define SUNXI_GPIO_E_NR                32
-#define SUNXI_GPIO_F_NR                32
-#define SUNXI_GPIO_G_NR                32
-#define SUNXI_GPIO_H_NR                32
-#define SUNXI_GPIO_I_NR                32
-#define SUNXI_GPIO_L_NR                32
-#define SUNXI_GPIO_M_NR                32
+#define SUNXI_GPIOS_PER_BANK   32
 
 #define SUNXI_GPIO_NEXT(__gpio) \
-       ((__gpio##_START) + (__gpio##_NR) + 0)
+       ((__gpio##_START) + SUNXI_GPIOS_PER_BANK)
 
 enum sunxi_gpio_number {
        SUNXI_GPIO_A_START = 0,

diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index bf7d82fbf50373f87771575a480e0310b48468ea..cdbc40d48fd89cdd60377f4d61ed654ea49500f7 100644 (file)
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -19,8 +19,6 @@
 #include <dm/device-internal.h>
 #include <dt-bindings/gpio/gpio.h>
 
-#define SUNXI_GPIOS_PER_BANK   SUNXI_GPIO_A_NR
-
 struct sunxi_gpio_plat {
        struct sunxi_gpio *regs;
        const char *bank_name;  /* Name of bank, e.g. "B" */