[ARM] Dove: add support for GPIOs 64-71

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>

diff --git a/arch/arm/mach-dove/include/mach/dove.h b/arch/arm/mach-dove/include/mach/dove.h
index f6a08397f046b70bc48f60edd466b1ec1867bfa9..148f4f0ee3e5e7ae7003dfbdf7bc49fabaafdb0c 100644 (file)
--- a/arch/arm/mach-dove/include/mach/dove.h
+++ b/arch/arm/mach-dove/include/mach/dove.h
@@ -131,6 +131,7 @@
 #define DOVE_RESET_SAMPLE_LO   (DOVE_MPP_VIRT_BASE | 0x014)
 #define DOVE_RESET_SAMPLE_HI   (DOVE_MPP_VIRT_BASE | 0x018)
 #define DOVE_GPIO_VIRT_BASE    (DOVE_SB_REGS_VIRT_BASE | 0xd0400)
+#define DOVE_GPIO2_VIRT_BASE    (DOVE_SB_REGS_VIRT_BASE | 0xe8400)
 #define DOVE_MPP_GENERAL_VIRT_BASE     (DOVE_SB_REGS_VIRT_BASE | 0xe803c)
 #define  DOVE_AU1_SPDIFO_GPIO_EN       (1 << 1)
 #define  DOVE_NAND_GPIO_EN             (1 << 0)

diff --git a/arch/arm/mach-dove/include/mach/gpio.h b/arch/arm/mach-dove/include/mach/gpio.h
index 0ee70ff39e1105dfb096fbfe1551fdfb18b6663f..340bb7af529d13f3d7461edfa4b2975a67f3e7f6 100644 (file)
--- a/arch/arm/mach-dove/include/mach/gpio.h
+++ b/arch/arm/mach-dove/include/mach/gpio.h
@@ -14,12 +14,14 @@
 #include <plat/gpio.h>
 #include <asm-generic/gpio.h>          /* cansleep wrappers */
 
-#define GPIO_MAX       64
+#define GPIO_MAX       72
 
 #define GPIO_BASE_LO           (DOVE_GPIO_VIRT_BASE + 0x00)
 #define GPIO_BASE_HI           (DOVE_GPIO_VIRT_BASE + 0x20)
 
-#define GPIO_BASE(pin)         ((pin < 32) ? GPIO_BASE_LO : GPIO_BASE_HI)
+#define GPIO_BASE(pin)         ((pin < 32) ? GPIO_BASE_LO :            \
+                                ((pin < 64) ? GPIO_BASE_HI :           \
+                                 DOVE_GPIO2_VIRT_BASE))
 
 #define GPIO_OUT(pin)          (GPIO_BASE(pin) + 0x00)
 #define GPIO_IO_CONF(pin)      (GPIO_BASE(pin) + 0x04)