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

Commit 043cf3fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents c081474c 95220a2e

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 },

};

arch/arm/mach-versatile/core.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb) 
		val |= SYS_CLCD_MODE_5551;

		break;

	case 6:

		val |= SYS_CLCD_MODE_565_BLSB;

		val |= SYS_CLCD_MODE_565_RLSB;

		break;

	case 8:

		val |= SYS_CLCD_MODE_888;

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

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

+11 −5
Original line number Diff line number Diff line
@@ -498,11 +498,17 @@ 
/*

 * IB2 Versatile/AB expansion board definitions

 */

#define VERSATILE_IB2_CAMERA_BANK	0x24000000

#define VERSATILE_IB2_KBD_DATAREG	0x25000000

#define VERSATILE_IB2_IER		0x26000000	/* for VICINTSOURCE27 */

#define VERSATILE_IB2_CTRL		0x27000000

#define VERSATILE_IB2_STAT		0x27000004

#define VERSATILE_IB2_CAMERA_BANK	VERSATILE_IB2_BASE

#define VERSATILE_IB2_KBD_DATAREG	(VERSATILE_IB2_BASE + 0x01000000)



/* VICINTSOURCE27 */

#define VERSATILE_IB2_INT_BASE		(VERSATILE_IB2_BASE + 0x02000000)

#define VERSATILE_IB2_IER		(VERSATILE_IB2_INT_BASE + 0)

#define VERSATILE_IB2_ISR		(VERSATILE_IB2_INT_BASE + 4)



#define VERSATILE_IB2_CTL_BASE		(VERSATILE_IB2_BASE + 0x03000000)

#define VERSATILE_IB2_CTRL		(VERSATILE_IB2_CTL_BASE + 0)

#define VERSATILE_IB2_STAT		(VERSATILE_IB2_CTL_BASE + 4)

#endif



#endif