aboutsummaryrefslogtreecommitdiff
path: root/include/sdhci.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-05-20 21:20:50 +0200
committerWolfgang Denk <wd@denx.de>2012-05-20 21:20:50 +0200
commit6bc337fb13003a9a949dfb2713e308fb97faae8a (patch)
tree3ce9b22609e6c1d3e140fd2fb96af0c26efa948d /include/sdhci.h
parentf50bf50d7f6f99c5ad4666d63a7eef43d3940500 (diff)
parent7d2d58b4e63a8307f713e6b17fdb9b2413548574 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc: ARM: SAMSUNG: support sdhci controller mmc: support the sdhci instead of s5p_mmc for samsung-soc mmc: add the quirk to use the sdhci for samsung-soc mmc: sdhci: add the quirk for broken r1b response i.MX28: Lower the amount of blocks transfered in one DMA cycle mmc: fsl_esdhc: Poll until card is not busy anymore include/mmc.h: remove struct mmc_csd mmc: omap: handle controller errors properly mmc: omap: improve stat wait message mmc: omap: follow TRM procedure to power on cards mmc:fix: Set mmc width according to MMC host capabilities
Diffstat (limited to 'include/sdhci.h')
-rw-r--r--include/sdhci.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sdhci.h b/include/sdhci.h
index 800f9d9c07..9d37183243 100644
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -216,6 +216,9 @@
*/
#define SDHCI_QUIRK_32BIT_DMA_ADDR (1 << 0)
#define SDHCI_QUIRK_REG32_RW (1 << 1)
+#define SDHCI_QUIRK_BROKEN_R1B (1 << 2)
+#define SDHCI_QUIRK_NO_HISPD_BIT (1 << 3)
+#define SDHCI_QUIRK_BROKEN_VOLTAGE (1 << 4)
/* to make gcc happy */
struct sdhci_host;
@@ -240,10 +243,14 @@ struct sdhci_host {
char *name;
void *ioaddr;
unsigned int quirks;
+ unsigned int host_caps;
unsigned int version;
unsigned int clock;
struct mmc *mmc;
const struct sdhci_ops *ops;
+
+ void (*set_control_reg)(struct sdhci_host *host);
+ uint voltages;
};
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS