projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
include
/
fsl_esdhc.h
diff --git
a/include/fsl_esdhc.h
b/include/fsl_esdhc.h
index 0e265584bd3680621efc94553592209d7802de3e..67d6057b5ff4637a0c6fdcd372cfc6c09c98a71a 100644
(file)
--- a/
include/fsl_esdhc.h
+++ b/
include/fsl_esdhc.h
@@
-63,7
+63,9
@@
#define IRQSTAT_CC (0x00000001)
#define CMD_ERR (IRQSTAT_CIE | IRQSTAT_CEBE | IRQSTAT_CCE)
#define IRQSTAT_CC (0x00000001)
#define CMD_ERR (IRQSTAT_CIE | IRQSTAT_CEBE | IRQSTAT_CCE)
-#define DATA_ERR (IRQSTAT_DEBE | IRQSTAT_DCE | IRQSTAT_DTOE)
+#define DATA_ERR (IRQSTAT_DEBE | IRQSTAT_DCE | IRQSTAT_DTOE | \
+ IRQSTAT_DMAE)
+#define DATA_COMPLETE (IRQSTAT_TC | IRQSTAT_DINT)
#define IRQSTATEN 0x0002e034
#define IRQSTATEN_DMAE (0x10000000)
#define IRQSTATEN 0x0002e034
#define IRQSTATEN_DMAE (0x10000000)
@@
-167,7
+169,8
@@
struct fsl_esdhc_cfg {
u32 esdhc_base;
struct fsl_esdhc_cfg {
u32 esdhc_base;
- u32 no_snoop;
+ u32 sdhc_clk;
+ u8 max_bus_width;
};
/* Select the correct accessors depending on endianess */
};
/* Select the correct accessors depending on endianess */