Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea7722f authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 90ef713b

arch/arm/mach-integrator/integrator_cp.c

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static struct map_desc intcp_io_desc[] __initdata = { 
 { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_DBG_BASE),   INTEGRATOR_DBG_BASE,   SZ_4K,  MT_DEVICE },

 { IO_ADDRESS(INTEGRATOR_GPIO_BASE),  INTEGRATOR_GPIO_BASE,  SZ_4K,  MT_DEVICE },

 { 0xfc900000, 0xc9000000, SZ_4K, MT_DEVICE },

 { 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE },

 { 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE },

};

include/asm-arm/arch-integrator/platform.h

+4 −0
Original line number Diff line number Diff line
@@ -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