diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:16 +0100 |
| commit | 24769c151ef6cd068fcd6de7f13b62f92084b4c4 (patch) | |
| tree | 15032187aba72588b707bccaed30854252b10968 /include | |
| parent | e84fb175f671d2dc9a0b2253ac28b85a2f3620cd (diff) | |
| parent | de71fbe468b5531914735c88834187ae4e64202f (diff) | |
| download | u-boot-imx-24769c151ef6cd068fcd6de7f13b62f92084b4c4.zip u-boot-imx-24769c151ef6cd068fcd6de7f13b62f92084b4c4.tar.gz u-boot-imx-24769c151ef6cd068fcd6de7f13b62f92084b4c4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
tegra2: Move MMC clock initialization into MMC driver
mmc: sdhci: fix sdma bug for large file transfer
mmc: sdhci: add timeout for data transfer
mmc: sdhci: add mmc structure for host
mmc: sdhci: fix build warning
mmc: sdhci: fix cache flush
mmc: CMD7:MMC_CMD_SELECT_CARD response fix
mmc: test mmc bus width on startup
mmc: change magic number to macro define
mmc: mv_sdhci: fix 8bus width access for 88SV331xV5
mmc: retry the cmd8 to meet 74 clocks requirement in the spec
PXA: Add MMC driver using the generic MMC framework
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 16 | ||||
| -rw-r--r-- | include/sdhci.h | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/include/mmc.h b/include/mmc.h index 53aff9b..015a7f3 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -145,13 +145,15 @@ /* * EXT_CSD fields */ - -#define EXT_CSD_PART_CONF 179 /* R/W */ -#define EXT_CSD_BUS_WIDTH 183 /* R/W */ -#define EXT_CSD_HS_TIMING 185 /* R/W */ -#define EXT_CSD_CARD_TYPE 196 /* RO */ -#define EXT_CSD_REV 192 /* RO */ -#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ +#define EXT_CSD_PARTITIONING_SUPPORT 160 /* RO */ +#define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ +#define EXT_CSD_PART_CONF 179 /* R/W */ +#define EXT_CSD_BUS_WIDTH 183 /* R/W */ +#define EXT_CSD_HS_TIMING 185 /* R/W */ +#define EXT_CSD_REV 192 /* RO */ +#define EXT_CSD_CARD_TYPE 196 /* RO */ +#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ +#define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ /* * EXT_CSD field definitions diff --git a/include/sdhci.h b/include/sdhci.h index 6d52ce9..0690938 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -27,6 +27,8 @@ #define __SDHCI_HW_H #include <asm/io.h> +#include <mmc.h> + /* * Controller registers */ @@ -214,6 +216,9 @@ */ #define SDHCI_QUIRK_32BIT_DMA_ADDR (1 << 0) +/* to make gcc happy */ +struct sdhci_host; + /* * Host SDMA buffer boundary. Valid values from 4K to 512K in powers of 2. */ @@ -236,6 +241,7 @@ struct sdhci_host { unsigned int quirks; unsigned int version; unsigned int clock; + struct mmc *mmc; const struct sdhci_ops *ops; }; |