Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6-omap-h63xx.git] / include / asm-arm / plat-s3c24xx / regs-spi.h

diff --git a/include/asm-arm/plat-s3c24xx/regs-spi.h b/include/asm-arm/plat-s3c24xx/regs-spi.h
index 4a499a138256e797207bf3c9c36e7d0bd50c3123..ea565b007d0496e9c59d6b70e7185c672c8317c2 100644 (file)
--- a/include/asm-arm/plat-s3c24xx/regs-spi.h
+++ b/include/asm-arm/plat-s3c24xx/regs-spi.h
@@ -17,6 +17,21 @@
 
 #define S3C2410_SPCON  (0x00)
 
+#define S3C2412_SPCON_RXFIFO_RB2       (0<<14)
+#define S3C2412_SPCON_RXFIFO_RB4       (1<<14)
+#define S3C2412_SPCON_RXFIFO_RB12      (2<<14)
+#define S3C2412_SPCON_RXFIFO_RB14      (3<<14)
+#define S3C2412_SPCON_TXFIFO_RB2       (0<<12)
+#define S3C2412_SPCON_TXFIFO_RB4       (1<<12)
+#define S3C2412_SPCON_TXFIFO_RB12      (2<<12)
+#define S3C2412_SPCON_TXFIFO_RB14      (3<<12)
+#define S3C2412_SPCON_RXFIFO_RESET     (1<<11) /* RxFIFO reset */
+#define S3C2412_SPCON_TXFIFO_RESET     (1<<10) /* TxFIFO reset */
+#define S3C2412_SPCON_RXFIFO_EN                (1<<9)  /* RxFIFO Enable */
+#define S3C2412_SPCON_TXFIFO_EN                (1<<8)  /* TxFIFO Enable */
+
+#define S3C2412_SPCON_DIRC_RX    (1<<7)
+
 #define S3C2410_SPCON_SMOD_DMA   (2<<5)        /* DMA mode */
 #define S3C2410_SPCON_SMOD_INT   (1<<5)        /* interrupt mode */
 #define S3C2410_SPCON_SMOD_POLL   (0<<5)       /* polling mode */
@@ -34,10 +49,19 @@
 
 #define S3C2410_SPSTA   (0x04)
 
+#define S3C2412_SPSTA_RXFIFO_AE                (1<<11)
+#define S3C2412_SPSTA_TXFIFO_AE                (1<<10)
+#define S3C2412_SPSTA_RXFIFO_ERROR     (1<<9)
+#define S3C2412_SPSTA_TXFIFO_ERROR     (1<<8)
+#define S3C2412_SPSTA_RXFIFO_FIFO      (1<<7)
+#define S3C2412_SPSTA_RXFIFO_EMPTY     (1<<6)
+#define S3C2412_SPSTA_TXFIFO_NFULL     (1<<5)
+#define S3C2412_SPSTA_TXFIFO_EMPTY     (1<<4)
+
 #define S3C2410_SPSTA_DCOL       (1<<2)        /* Data Collision Error */
 #define S3C2410_SPSTA_MULD       (1<<1)        /* Multi Master Error */
 #define S3C2410_SPSTA_READY      (1<<0)        /* Data Tx/Rx ready */
-
+#define S3C2412_SPSTA_READY_ORG          (1<<3)
 
 #define S3C2410_SPPIN   (0x08)
 
@@ -46,9 +70,13 @@
 #define S3C2400_SPPIN_nCS        (1<<1)        /* SPI Card Select */
 #define S3C2410_SPPIN_KEEP       (1<<0)        /* Master Out keep */
 
-
 #define S3C2410_SPPRE   (0x0C)
 #define S3C2410_SPTDAT  (0x10)
 #define S3C2410_SPRDAT  (0x14)
 
+#define S3C2412_TXFIFO  (0x18)
+#define S3C2412_RXFIFO  (0x18)
+#define S3C2412_SPFIC   (0x24)
+
+
 #endif /* __ASM_ARCH_REGS_SPI_H */