diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:24:01 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:24:01 -0400 |
| commit | c378aa275e1476218a6b438056a4cd48eb1eca0f (patch) | |
| tree | 48d19b078758cbab638aeb8ab2978be05232290b /arch/arm/mach-s3c6400/include | |
| parent | 215ed3236a17b748cf75a2c23f50028c95302a42 (diff) | |
| parent | c7c8f615c8d1b49225ed86406603e7ac24d2a6d9 (diff) | |
Merge branch 'next-s3c64xx' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6400/include')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index e02e6c38a396..16c46305792e 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
| @@ -42,10 +42,12 @@ | |||
| 42 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) | 42 | #define S3C64XX_PA_USB_HSOTG (0x7C000000) |
| 43 | #define S3C64XX_PA_WATCHDOG (0x7E004000) | 43 | #define S3C64XX_PA_WATCHDOG (0x7E004000) |
| 44 | #define S3C64XX_PA_SYSCON (0x7E00F000) | 44 | #define S3C64XX_PA_SYSCON (0x7E00F000) |
| 45 | #define S3C64XX_PA_AC97 (0x7F001000) | ||
| 45 | #define S3C64XX_PA_IIS0 (0x7F002000) | 46 | #define S3C64XX_PA_IIS0 (0x7F002000) |
| 46 | #define S3C64XX_PA_IIS1 (0x7F003000) | 47 | #define S3C64XX_PA_IIS1 (0x7F003000) |
| 47 | #define S3C64XX_PA_TIMER (0x7F006000) | 48 | #define S3C64XX_PA_TIMER (0x7F006000) |
| 48 | #define S3C64XX_PA_IIC0 (0x7F004000) | 49 | #define S3C64XX_PA_IIC0 (0x7F004000) |
| 50 | #define S3C64XX_PA_IISV4 (0x7F00D000) | ||
| 49 | #define S3C64XX_PA_IIC1 (0x7F00F000) | 51 | #define S3C64XX_PA_IIC1 (0x7F00F000) |
| 50 | 52 | ||
| 51 | #define S3C64XX_PA_GPIO (0x7F008000) | 53 | #define S3C64XX_PA_GPIO (0x7F008000) |