diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
| commit | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (patch) | |
| tree | b20b8da8b92e388847a55e7c7da9d919fe3f3abb /arch/arm/mach-s5p6442/include | |
| parent | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (diff) | |
| parent | 734552072335b00476b626b027ca4a9f57147b6f (diff) | |
ARM: Merge for-2635/s5p-audio
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s5p6442/include')
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/map.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h index a263d77f6968..7568dc0d6be0 100644 --- a/arch/arm/mach-s5p6442/include/mach/map.h +++ b/arch/arm/mach-s5p6442/include/mach/map.h | |||
| @@ -54,6 +54,14 @@ | |||
| 54 | #define S5P6442_PA_SDRAM (0x20000000) | 54 | #define S5P6442_PA_SDRAM (0x20000000) |
| 55 | #define S5P_PA_SDRAM S5P6442_PA_SDRAM | 55 | #define S5P_PA_SDRAM S5P6442_PA_SDRAM |
| 56 | 56 | ||
| 57 | /* I2S */ | ||
| 58 | #define S5P6442_PA_I2S0 0xC0B00000 | ||
| 59 | #define S5P6442_PA_I2S1 0xF2200000 | ||
| 60 | |||
| 61 | /* PCM */ | ||
| 62 | #define S5P6442_PA_PCM0 0xF2400000 | ||
| 63 | #define S5P6442_PA_PCM1 0xF2500000 | ||
| 64 | |||
| 57 | /* compatibiltiy defines. */ | 65 | /* compatibiltiy defines. */ |
| 58 | #define S3C_PA_UART S5P6442_PA_UART | 66 | #define S3C_PA_UART S5P6442_PA_UART |
| 59 | #define S3C_PA_IIC S5P6442_PA_IIC0 | 67 | #define S3C_PA_IIC S5P6442_PA_IIC0 |