diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:53:46 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:53:46 -0500 |
| commit | 54b89177ac533dc7439491afd26baf59464b425c (patch) | |
| tree | 1eb307706810bb22d81ecf93b3570946f92605b1 | |
| parent | a0c814afcfc2c840698372bd402b669b659ee1c5 (diff) | |
| parent | af1519408a0d40f312e8f103504cd292cc49d927 (diff) | |
ARM: Merge next-samsung-s5p6440-iodec
Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10
| -rw-r--r-- | arch/arm/mach-s5p6440/include/mach/map.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/include/mach/map.h b/arch/arm/mach-s5p6440/include/mach/map.h index b3703293cc3..dc922d6e11f 100644 --- a/arch/arm/mach-s5p6440/include/mach/map.h +++ b/arch/arm/mach-s5p6440/include/mach/map.h | |||
| @@ -15,6 +15,11 @@ | |||
| 15 | 15 | ||
| 16 | #include <plat/map-base.h> | 16 | #include <plat/map-base.h> |
| 17 | 17 | ||
| 18 | /* Chip ID */ | ||
| 19 | #define S5P6440_PA_CHIPID (0xE0000000) | ||
| 20 | #define S5P_PA_CHIPID S5P6440_PA_CHIPID | ||
| 21 | #define S5P_VA_CHIPID S3C_ADDR(0x00700000) | ||
| 22 | |||
| 18 | /* SYSCON */ | 23 | /* SYSCON */ |
| 19 | #define S5P6440_PA_SYSCON (0xE0100000) | 24 | #define S5P6440_PA_SYSCON (0xE0100000) |
| 20 | #define S5P_PA_SYSCON S5P6440_PA_SYSCON | 25 | #define S5P_PA_SYSCON S5P6440_PA_SYSCON |