colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Browse Source 
Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	include/configs/trats.h
	include/configs/trats2.h
	include/mmc.h
This commit is contained in:
Albert ARIBAUD
2014-04-08 09:25:08 +02:00
parent c71645ad2b 04d2f0a9f3
commit 519fdde9e6
97 changed files with 8943 additions and 10922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/sdhci.h
View File

@@ -252,6 +252,8 @@ struct sdhci_host {
void (*set_control_reg)(struct sdhci_host *host);
void (*set_clock)(int dev_index, unsigned int div);
uint voltages;
struct mmc_config cfg;
};
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS