Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
+16
-7
-1
arch/arm/mach-integrator/integrator_cp.c
-1
arch/arm/mach-integrator/integrator_cp.c
···
83
83
{ IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K, MT_DEVICE },
84
84
{ IO_ADDRESS(INTEGRATOR_DBG_BASE), INTEGRATOR_DBG_BASE, SZ_4K, MT_DEVICE },
85
85
{ IO_ADDRESS(INTEGRATOR_GPIO_BASE), INTEGRATOR_GPIO_BASE, SZ_4K, MT_DEVICE },
86
-
{ 0xfc900000, 0xc9000000, SZ_4K, MT_DEVICE },
87
86
{ 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE },
88
87
{ 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE },
89
88
};
+1
-1
arch/arm/mach-versatile/core.c
+1
-1
arch/arm/mach-versatile/core.c
+4
include/asm-arm/arch-integrator/platform.h
+4
include/asm-arm/arch-integrator/platform.h
···
293
293
#define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET)
294
294
295
295
296
+
#if defined(CONFIG_ARCH_INTEGRATOR_AP)
296
297
#define INTEGRATOR_GPIO_BASE 0x1B000000 /* GPIO */
298
+
#elif defined(CONFIG_ARCH_INTEGRATOR_CP)
299
+
#define INTEGRATOR_GPIO_BASE 0xC9000000 /* GPIO */
300
+
#endif
297
301
298
302
/* ------------------------------------------------------------------------
299
303
* KMI keyboard/mouse definitions
+11
-5
include/asm-arm/arch-versatile/platform.h
+11
-5
include/asm-arm/arch-versatile/platform.h
···
498
498
/*
499
499
* IB2 Versatile/AB expansion board definitions
500
500
*/
501
-
#define VERSATILE_IB2_CAMERA_BANK 0x24000000
502
-
#define VERSATILE_IB2_KBD_DATAREG 0x25000000
503
-
#define VERSATILE_IB2_IER 0x26000000 /* for VICINTSOURCE27 */
504
-
#define VERSATILE_IB2_CTRL 0x27000000
505
-
#define VERSATILE_IB2_STAT 0x27000004
501
+
#define VERSATILE_IB2_CAMERA_BANK VERSATILE_IB2_BASE
502
+
#define VERSATILE_IB2_KBD_DATAREG (VERSATILE_IB2_BASE + 0x01000000)
503
+
504
+
/* VICINTSOURCE27 */
505
+
#define VERSATILE_IB2_INT_BASE (VERSATILE_IB2_BASE + 0x02000000)
506
+
#define VERSATILE_IB2_IER (VERSATILE_IB2_INT_BASE + 0)
507
+
#define VERSATILE_IB2_ISR (VERSATILE_IB2_INT_BASE + 4)
508
+
509
+
#define VERSATILE_IB2_CTL_BASE (VERSATILE_IB2_BASE + 0x03000000)
510
+
#define VERSATILE_IB2_CTRL (VERSATILE_IB2_CTL_BASE + 0)
511
+
#define VERSATILE_IB2_STAT (VERSATILE_IB2_CTL_BASE + 4)
506
512
#endif
507
513
508
514
#endif