diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/arm/mach-s3c6400/include/mach/map.h | |
parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-s3c6400/include/mach/map.h')
-rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index 5057d9948d35..fc8b223bad4f 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
@@ -38,18 +38,21 @@ | |||
38 | #define S3C_VA_UART2 S3C_VA_UARTx(2) | 38 | #define S3C_VA_UART2 S3C_VA_UARTx(2) |
39 | #define S3C_VA_UART3 S3C_VA_UARTx(3) | 39 | #define S3C_VA_UART3 S3C_VA_UARTx(3) |
40 | 40 | ||
41 | #define S3C64XX_PA_NAND (0x70200000) | ||
41 | #define S3C64XX_PA_FB (0x77100000) | 42 | #define S3C64XX_PA_FB (0x77100000) |
42 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) | 43 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) |
43 | #define S3C64XX_PA_WATCHDOG (0x7E004000) | 44 | #define S3C64XX_PA_WATCHDOG (0x7E004000) |
44 | #define S3C64XX_PA_SYSCON (0x7E00F000) | 45 | #define S3C64XX_PA_SYSCON (0x7E00F000) |
46 | #define S3C64XX_PA_AC97 (0x7F001000) | ||
45 | #define S3C64XX_PA_IIS0 (0x7F002000) | 47 | #define S3C64XX_PA_IIS0 (0x7F002000) |
46 | #define S3C64XX_PA_IIS1 (0x7F003000) | 48 | #define S3C64XX_PA_IIS1 (0x7F003000) |
47 | #define S3C64XX_PA_TIMER (0x7F006000) | 49 | #define S3C64XX_PA_TIMER (0x7F006000) |
48 | #define S3C64XX_PA_IIC0 (0x7F004000) | 50 | #define S3C64XX_PA_IIC0 (0x7F004000) |
51 | #define S3C64XX_PA_IISV4 (0x7F00D000) | ||
49 | #define S3C64XX_PA_IIC1 (0x7F00F000) | 52 | #define S3C64XX_PA_IIC1 (0x7F00F000) |
50 | 53 | ||
51 | #define S3C64XX_PA_GPIO (0x7F008000) | 54 | #define S3C64XX_PA_GPIO (0x7F008000) |
52 | #define S3C64XX_VA_GPIO S3C_ADDR(0x00500000) | 55 | #define S3C64XX_VA_GPIO S3C_ADDR_CPU(0x00000000) |
53 | #define S3C64XX_SZ_GPIO SZ_4K | 56 | #define S3C64XX_SZ_GPIO SZ_4K |
54 | 57 | ||
55 | #define S3C64XX_PA_SDRAM (0x50000000) | 58 | #define S3C64XX_PA_SDRAM (0x50000000) |
@@ -57,7 +60,7 @@ | |||
57 | #define S3C64XX_PA_VIC1 (0x71300000) | 60 | #define S3C64XX_PA_VIC1 (0x71300000) |
58 | 61 | ||
59 | #define S3C64XX_PA_MODEM (0x74108000) | 62 | #define S3C64XX_PA_MODEM (0x74108000) |
60 | #define S3C64XX_VA_MODEM S3C_ADDR(0x00600000) | 63 | #define S3C64XX_VA_MODEM S3C_ADDR_CPU(0x00100000) |
61 | 64 | ||
62 | #define S3C64XX_PA_USBHOST (0x74300000) | 65 | #define S3C64XX_PA_USBHOST (0x74300000) |
63 | 66 | ||
@@ -72,6 +75,7 @@ | |||
72 | #define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2 | 75 | #define S3C_PA_HSMMC2 S3C64XX_PA_HSMMC2 |
73 | #define S3C_PA_IIC S3C64XX_PA_IIC0 | 76 | #define S3C_PA_IIC S3C64XX_PA_IIC0 |
74 | #define S3C_PA_IIC1 S3C64XX_PA_IIC1 | 77 | #define S3C_PA_IIC1 S3C64XX_PA_IIC1 |
78 | #define S3C_PA_NAND S3C64XX_PA_NAND | ||
75 | #define S3C_PA_FB S3C64XX_PA_FB | 79 | #define S3C_PA_FB S3C64XX_PA_FB |
76 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST | 80 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST |
77 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG | 81 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG |