diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:38:30 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 06:38:30 -0400 |
| commit | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (patch) | |
| tree | ed60f11843face3b8b2016d9adea36a8d709bb6b /arch/arm/mach-s5pc100/include/mach/map.h | |
| parent | ea5a4e209ddca984bbb5803b30d5e013e631f9ac (diff) | |
| parent | 99c56e0ce1c11221948c7da127b0bbe1641cbe41 (diff) | |
ARM: Merge for-2635-4/s5p-devs
Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 6428f4898202..67049e4bd2ef 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h | |||
| @@ -55,6 +55,16 @@ | |||
| 55 | 55 | ||
| 56 | #define S5PC100_PA_FB (0xEE000000) | 56 | #define S5PC100_PA_FB (0xEE000000) |
| 57 | 57 | ||
| 58 | #define S5PC100_PA_AC97 0xF2300000 | ||
| 59 | |||
| 60 | /* PCM */ | ||
| 61 | #define S5PC100_PA_PCM0 0xF2400000 | ||
| 62 | #define S5PC100_PA_PCM1 0xF2500000 | ||
| 63 | |||
| 64 | /* KEYPAD */ | ||
| 65 | #define S5PC100_PA_KEYPAD (0xF3100000) | ||
| 66 | >>>>>>> for-2635-4/s5p-devs:arch/arm/mach-s5pc100/include/mach/map.h | ||
| 67 | |||
| 58 | #define S5PC100_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000)) | 68 | #define S5PC100_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000)) |
| 59 | 69 | ||
| 60 | #define S5PC100_PA_SDRAM (0x20000000) | 70 | #define S5PC100_PA_SDRAM (0x20000000) |