dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini
2016-08-05 09:15:55 -04:00
parent d03a030859 89f69e5173
commit a60d94b204
29 changed files with 135 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/dwmmc.h
View File

@@ -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 */

6
include/mmc.h
View File

@@ -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

13
include/sdhci.h
View File

@@ -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