Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-s3c2410 / regs-s3c2443-clock.h

diff --git a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
index e696554f9c21b6c610ec60d0a9a920a4f6ee7505..c1414658d1c5d757624faff55ee7431cb9369589 100644 (file)
--- a/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
+++ b/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
@@ -1,4 +1,4 @@
-/* linux/include/asm-arm/arch-s3c2410/regs-clock.h
+/* linux/include/asm-arm/arch-s3c2410/regs-s3c2443-clock.h
  *
  * Copyright (c) 2007 Simtec Electronics
  *     Ben Dooks <ben@simtec.co.uk>
@@ -38,6 +38,8 @@
 #define S3C2443_PWRCFG                 S3C2443_CLKREG(0x60)
 #define S3C2443_RSTCON                 S3C2443_CLKREG(0x64)
 
+#define S3C2443_SWRST_RESET            (0x533c2443)
+
 #define S3C2443_PLLCON_OFF             (1<<24)
 
 #define S3C2443_CLKSRC_I2S_EXT         (1<<14)
@@ -127,6 +129,7 @@
 #define S3C2443_PCLKCON_IIC            (1<<4)
 #define S3C2443_PCLKCON_SDI            (1<<5)
 #define S3C2443_PCLKCON_ADC            (1<<7)
+#define S3C2443_PCLKCON_AC97           (1<<8)
 #define S3C2443_PCLKCON_IIS            (1<<9)
 #define S3C2443_PCLKCON_PWMT           (1<<10)
 #define S3C2443_PCLKCON_WDT            (1<<11)