Merge branch 'master' of git://git.denx.de/u-boot-spi

[u-boot] / include / atmel_mci.h

diff --git a/include/atmel_mci.h b/include/atmel_mci.h
index 0158f972a8c43bd8efd1130bb3c7a85a0247d986..31c4569c8fbf9eea2ff0731bf090358657a16f0c 100644 (file)
--- a/include/atmel_mci.h
+++ b/include/atmel_mci.h
@@ -38,7 +38,7 @@ typedef struct atmel_mci {
        u32     sdcr;   /* 0x0c */
        u32     argr;   /* 0x10 */
        u32     cmdr;   /* 0x14 */
-       u32     _18;    /* 0x18 */
+       u32     blkr;   /* 0x18 */
        u32     _1c;    /* 0x1c */
        u32     rspr;   /* 0x20 */
        u32     rspr1;  /* 0x24 */
@@ -52,34 +52,12 @@ typedef struct atmel_mci {
        u32     ier;    /* 0x44 */
        u32     idr;    /* 0x48 */
        u32     imr;    /* 0x4c */
+       u32     reserved[43];
+       u32     version;
 } atmel_mci_t;
 
 #endif /* __ASSEMBLY__ */
 
-/*
- * NOTICE: Use of registers offsets is depreciated.
- * These defines will be removed once the old driver
- * is taken out of commision.
- *
- * Atmel MultiMedia Card Interface (MCI) registers
- */
-#define MMCI_CR                                        0x0000
-#define MMCI_MR                                        0x0004
-#define MMCI_DTOR                              0x0008
-#define MMCI_SDCR                              0x000c
-#define MMCI_ARGR                              0x0010
-#define MMCI_CMDR                              0x0014
-#define MMCI_RSPR                              0x0020
-#define MMCI_RSPR1                             0x0024
-#define MMCI_RSPR2                             0x0028
-#define MMCI_RSPR3                             0x002c
-#define MMCI_RDR                               0x0030
-#define MMCI_TDR                               0x0034
-#define MMCI_SR                                        0x0040
-#define MMCI_IER                               0x0044
-#define MMCI_IDR                               0x0048
-#define MMCI_IMR                               0x004c
-
 /* Bitfields in CR */
 #define MMCI_MCIEN_OFFSET                      0
 #define MMCI_MCIEN_SIZE                                1
@@ -142,6 +120,11 @@ typedef struct atmel_mci {
 #define MMCI_TRTYP_OFFSET                      19
 #define MMCI_TRTYP_SIZE                                2
 
+/* Bitfields in BLKR */
+/* MMCI_BLKLEN_OFFSET/SIZE already defined in MR */
+#define MMCI_BCNT_OFFSET                       0
+#define MMCI_BCNT_SIZE                 16
+
 /* Bitfields in RSPRx */
 #define MMCI_RSP_OFFSET                                0
 #define MMCI_RSP_SIZE                          32
@@ -232,16 +215,4 @@ typedef struct atmel_mci {
                    << MMCI_##name##_OFFSET))           \
         | MMCI_BF(name,value))
 
-/*
- * NOTICE: Use of registers offsets is depreciated.
- * These defines will be removed once the old driver
- * is taken out of commision.
- *
- * Register access macros
- */
-#define mmci_readl(reg)                                        \
-       readl((void *)ATMEL_BASE_MMCI + MMCI_##reg)
-#define mmci_writel(reg,value)                         \
-       writel((value), (void *)ATMEL_BASE_MMCI + MMCI_##reg)
-
 #endif /* __ATMEL_MCI_H__ */