summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c6400/include/mach
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:01 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:01 +0100
commitc378aa275e1476218a6b438056a4cd48eb1eca0f (patch)
tree48d19b078758cbab638aeb8ab2978be05232290b /arch/arm/mach-s3c6400/include/mach
parent215ed3236a17b748cf75a2c23f50028c95302a42 (diff)
parentc7c8f615c8d1b49225ed86406603e7ac24d2a6d9 (diff)
downloadtalos-op-linux-c378aa275e1476218a6b438056a4cd48eb1eca0f.tar.gz
talos-op-linux-c378aa275e1476218a6b438056a4cd48eb1eca0f.zip
Merge branch 'next-s3c64xx' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c6400/include/mach')
-rw-r--r--arch/arm/mach-s3c6400/include/mach/map.h2
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 @@
#define S3C64XX_PA_USB_HSOTG (0x7C000000)
#define S3C64XX_PA_WATCHDOG (0x7E004000)
#define S3C64XX_PA_SYSCON (0x7E00F000)
+#define S3C64XX_PA_AC97 (0x7F001000)
#define S3C64XX_PA_IIS0 (0x7F002000)
#define S3C64XX_PA_IIS1 (0x7F003000)
#define S3C64XX_PA_TIMER (0x7F006000)
#define S3C64XX_PA_IIC0 (0x7F004000)
+#define S3C64XX_PA_IISV4 (0x7F00D000)
#define S3C64XX_PA_IIC1 (0x7F00F000)
#define S3C64XX_PA_GPIO (0x7F008000)
OpenPOWER on IntegriCloud