summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@com.rmk.(none)>2005-06-16 18:01:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-06-16 18:01:11 +0100
commitfea7722fd7b45c6957caed84251d95269319fe16 (patch)
tree125bf0a248ecf97e6cda409486d82d73b94344dc /include/asm-arm
parent90ef713b6368dcfe7a74bcc0026b998b4c44d5bc (diff)
downloadlinux-3.10-fea7722fd7b45c6957caed84251d95269319fe16.tar.gz
linux-3.10-fea7722fd7b45c6957caed84251d95269319fe16.tar.bz2
linux-3.10-fea7722fd7b45c6957caed84251d95269319fe16.zip
[PATCH] ARM: 2713/1: Fix the GPIO base for Integrator/CP
Patch from Catalin Marinas The GPIO base for Integrator/CP is different from the Integrator/AP. This patch sets the correct value for INTEGRATOR_GPIO_BASE. Signed-off-by: Catalin Marinas Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-integrator/platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-integrator/platform.h b/include/asm-arm/arch-integrator/platform.h
index bd364f5a99b..96ad3d2a66d 100644
--- a/include/asm-arm/arch-integrator/platform.h
+++ b/include/asm-arm/arch-integrator/platform.h
@@ -293,7 +293,11 @@
#define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET)
+#if defined(CONFIG_ARCH_INTEGRATOR_AP)
#define INTEGRATOR_GPIO_BASE 0x1B000000 /* GPIO */
+#elif defined(CONFIG_ARCH_INTEGRATOR_CP)
+#define INTEGRATOR_GPIO_BASE 0xC9000000 /* GPIO */
+#endif
/* ------------------------------------------------------------------------
* KMI keyboard/mouse definitions