diff options
| author | Tom Rini | 2016-08-05 09:15:55 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-08-05 20:55:27 -0400 |
| commit | a60d94b204412732409e70cb15236bd96d4da7d9 (patch) | |
| tree | 4eb4d5b6b0783a6b244625109a724185c1b64a78 /include | |
| parent | d03a0308599bb658598848e86aadb0d140f65e0c (diff) | |
| parent | 89f69e51734f5d704ef84503d24907bfde2f5577 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/dwmmc.h | 2 | ||||
| -rw-r--r-- | include/mmc.h | 6 | ||||
| -rw-r--r-- | include/sdhci.h | 13 |
3 files changed, 4 insertions, 17 deletions
diff --git a/include/dwmmc.h b/include/dwmmc.h index d18ec8463b6..5b9602cd05c 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -105,7 +105,7 @@ /* Status Register */ #define DWMCI_BUSY (1 << 9) -#define DWMCI_FIFO_MASK 0x1ff +#define DWMCI_FIFO_MASK 0x1fff #define DWMCI_FIFO_SHIFT 17 /* FIFOTH Register */ diff --git a/include/mmc.h b/include/mmc.h index dd47f34e9de..aa6d5d1d4ff 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -66,12 +66,6 @@ #define MMC_DATA_READ 1 #define MMC_DATA_WRITE 2 -#define NO_CARD_ERR -16 /* No SD/MMC card inserted */ -#define UNUSABLE_ERR -17 /* Unusable Card */ -#define COMM_ERR -18 /* Communications Error */ -#define TIMEOUT -19 -#define SWITCH_ERR -20 /* Card reports failure to switch mode */ - #define MMC_CMD_GO_IDLE_STATE 0 #define MMC_CMD_SEND_OP_COND 1 #define MMC_CMD_ALL_SEND_CID 2 diff --git a/include/sdhci.h b/include/sdhci.h index c4d3b552d19..fcef4dc065a 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -367,19 +367,12 @@ static inline u8 sdhci_readb(struct sdhci_host *host, int reg) * See msm_sdhci.c for an example. * * @cfg: Configuration structure to fill in (generally &plat->mmc) - * @name: Device name (normally dev->name) - * @buswidth: Bus width (in bits, such as 4 or 8) - * @caps: Host capabilities (MMC_MODE_...) + * @host: SDHCI host structure * @max_clk: Maximum supported clock speed in HZ (0 for default) * @min_clk: Minimum supported clock speed in HZ (0 for default) - * @version: Host controller version (generally read from the - * SDHCI_HOST_VERSION register) - * @quirks: Quick flags (SDHCI_QUIRK_...) - * @host_caps: Additional host capabilities (0 if none) */ -int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth, - uint caps, u32 max_clk, u32 min_clk, uint version, - uint quirks, uint host_caps); +int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, + u32 max_clk, u32 min_clk); /** * sdhci_bind() - Set up a new MMC block device |