diff options
| author | Tom Rini <trini@ti.com> | 2013-09-20 14:06:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-09-20 14:06:10 -0400 |
| commit | d0b961684eb5757211e9463f5f24c3175e453798 (patch) | |
| tree | 8983f37db54071f95c39be404e48b7116b808fda /include | |
| parent | 03c1bb242548e4e9d267d784861ccd69a1887aa0 (diff) | |
| parent | 2c011847c129491084a19c753a039a3441b7dce4 (diff) | |
| download | u-boot-imx-d0b961684eb5757211e9463f5f24c3175e453798.zip u-boot-imx-d0b961684eb5757211e9463f5f24c3175e453798.tar.gz u-boot-imx-d0b961684eb5757211e9463f5f24c3175e453798.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/mmc.h | 4 | ||||
| -rw-r--r-- | include/sdhci.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 6aa2398..0d40fab 100644 --- a/include/common.h +++ b/include/common.h @@ -1015,10 +1015,10 @@ static inline phys_addr_t map_to_sysmem(void *ptr) * of a function scoped static buffer. It can not be used to create a cache * line aligned global buffer. */ -#define PAD_COUNT(s, pad) ((s - 1) / pad + 1) +#define PAD_COUNT(s, pad) (((s) - 1) / (pad) + 1) #define PAD_SIZE(s, pad) (PAD_COUNT(s, pad) * pad) #define ALLOC_ALIGN_BUFFER_PAD(type, name, size, align, pad) \ - char __##name[ROUND(PAD_SIZE(size * sizeof(type), pad), align) \ + char __##name[ROUND(PAD_SIZE((size) * sizeof(type), pad), align) \ + (align - 1)]; \ \ type *name = (type *) ALIGN((uintptr_t)__##name, align) diff --git a/include/mmc.h b/include/mmc.h index 228d771..214b9ed 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -335,7 +335,11 @@ int mmc_start_init(struct mmc *mmc); void mmc_set_preinit(struct mmc *mmc, int preinit); #ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC_SPI #define mmc_host_is_spi(mmc) ((mmc)->host_caps & MMC_MODE_SPI) +#else +#define mmc_host_is_spi(mmc) 0 +#endif struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode); #else int mmc_legacy_init(int verbose); diff --git a/include/sdhci.h b/include/sdhci.h index b18b873..74d06ae 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -192,6 +192,8 @@ #define SDHCI_SPEC_200 1 #define SDHCI_SPEC_300 2 +#define SDHCI_GET_VERSION(x) (x->version & SDHCI_SPEC_VER_MASK) + /* * End of controller registers. */ @@ -210,6 +212,7 @@ #define SDHCI_QUIRK_NO_CD (1 << 5) #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6) #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1 << 7) +#define SDHCI_QUIRK_USE_WIDE8 (1 << 8) /* to make gcc happy */ struct sdhci_host; |