diff options
| author | Tom Rini <trini@ti.com> | 2014-03-28 08:24:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-28 08:24:01 -0400 |
| commit | 82b9547387389cc4147596cb45609bf29d3fdbdb (patch) | |
| tree | 76e2566eaa67e09e7c2262bdc2354d81b8523ecd /arch/arm | |
| parent | 81b196bed881e3f38d7b1eabe1b60d9b86c7bb7b (diff) | |
| parent | eea4e6fe82fef9975e0153644935b89882890450 (diff) | |
| download | talos-obmc-uboot-82b9547387389cc4147596cb45609bf29d3fdbdb.tar.gz talos-obmc-uboot-82b9547387389cc4147596cb45609bf29d3fdbdb.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-davinci/sdmmc_defs.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/tegra_mmc.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-davinci/sdmmc_defs.h b/arch/arm/include/asm/arch-davinci/sdmmc_defs.h index 3e9e6065c7..9aa3f4ab27 100644 --- a/arch/arm/include/asm/arch-davinci/sdmmc_defs.h +++ b/arch/arm/include/asm/arch-davinci/sdmmc_defs.h @@ -151,6 +151,7 @@ struct davinci_mmc { uint host_caps; /* Host capabilities */ uint voltages; /* Host supported voltages */ uint version; /* MMC Controller version */ + struct mmc_config cfg; }; enum { diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index b6896afd96..310bbd7df9 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -11,6 +11,9 @@ #include <fdtdec.h> +/* for mmc_config definition */ +#include <mmc.h> + #define MAX_HOSTS 4 /* Max number of 'hosts'/controllers */ #ifndef __ASSEMBLY__ @@ -138,6 +141,7 @@ struct mmc_host { struct fdt_gpio_state wp_gpio; /* Write Protect GPIO */ unsigned int version; /* SDHCI spec. version */ unsigned int clock; /* Current clock (MHz) */ + struct mmc_config cfg; /* mmc configuration */ }; void pad_init_mmc(struct mmc_host *host); |
