diff mbox

[U-Boot,2/3] MMC: atmel_mci: add configuration register definition

Message ID 1406788772-23377-3-git-send-email-voice.shen@atmel.com
State Accepted
Delegated to: Pantelis Antoniou
Headers show

Commit Message

Bo Shen July 31, 2014, 6:39 a.m. UTC 
Add configuration register definition, this register only
exists on MCI IP version >= 0x300.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
 include/atmel_mci.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Comments

Pantelis Antoniou Aug. 1, 2014, 4:59 p.m. UTC | #1 
Hi Bo,

On Jul 31, 2014, at 9:39 AM, Bo Shen wrote:

> Add configuration register definition, this register only
> exists on MCI IP version >= 0x300.
> 
> Signed-off-by: Bo Shen <voice.shen@atmel.com>
> ---
> include/atmel_mci.h | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/include/atmel_mci.h b/include/atmel_mci.h
> index 3d2870f..de24148 100644
> --- a/include/atmel_mci.h
> +++ b/include/atmel_mci.h
> @@ -36,7 +36,9 @@ typedef struct atmel_mci {
> 	u32	ier;	/* 0x44 */
> 	u32	idr;	/* 0x48 */
> 	u32	imr;	/* 0x4c */
> -	u32	reserved[43];
> +	u32	dma;	/* 0x50 */
> +	u32	cfg;	/* 0x54 */
> +	u32	reserved[41];
> 	u32	version;
> } atmel_mci_t;
> 
> @@ -189,6 +191,16 @@ typedef struct atmel_mci {
> #define MMCI_TRTYP_MULTI_BLOCK			1
> #define MMCI_TRTYP_STREAM			2
> 
> +/* Bitfields in CFG */
> +#define MMCI_FIFOMODE_OFFSET			0
> +#define MMCI_FIFOMODE_SIZE			1
> +#define MMCI_FERRCTRL_OFFSET			4
> +#define MMCI_FERRCTRL_SIZE			1
> +#define MMCI_HSMODE_OFFSET			8
> +#define MMCI_HSMODE_SIZE			1
> +#define MMCI_LSYNC_OFFSET			12
> +#define MMCI_LSYNC_SIZE				1
> +
> /* Bit manipulation macros */
> #define MMCI_BIT(name)					\
> 	(1 << MMCI_##name##_OFFSET)
> -- 
> 1.8.5.2
> 

Applied, thanks.

-- Pantelis
diff mbox

Patch

diff --git a/include/atmel_mci.h b/include/atmel_mci.h
index 3d2870f..de24148 100644
--- a/include/atmel_mci.h
+++ b/include/atmel_mci.h
@@ -36,7 +36,9 @@  typedef struct atmel_mci {
 	u32	ier;	/* 0x44 */
 	u32	idr;	/* 0x48 */
 	u32	imr;	/* 0x4c */
-	u32	reserved[43];
+	u32	dma;	/* 0x50 */
+	u32	cfg;	/* 0x54 */
+	u32	reserved[41];
 	u32	version;
 } atmel_mci_t;
 
@@ -189,6 +191,16 @@  typedef struct atmel_mci {
 #define MMCI_TRTYP_MULTI_BLOCK			1
 #define MMCI_TRTYP_STREAM			2
 
+/* Bitfields in CFG */
+#define MMCI_FIFOMODE_OFFSET			0
+#define MMCI_FIFOMODE_SIZE			1
+#define MMCI_FERRCTRL_OFFSET			4
+#define MMCI_FERRCTRL_SIZE			1
+#define MMCI_HSMODE_OFFSET			8
+#define MMCI_HSMODE_SIZE			1
+#define MMCI_LSYNC_OFFSET			12
+#define MMCI_LSYNC_SIZE				1
+
 /* Bit manipulation macros */
 #define MMCI_BIT(name)					\
 	(1 << MMCI_##name##_OFFSET)