diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:05:47 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:05:47 +0100 |
| commit | 6d7ba2cef52d6daf119269f06c471c8882e59b84 (patch) | |
| tree | 94251571a5c2f6fdff10968ad6d76a2eb3ecc763 /include | |
| parent | d0b8feef8b50335a58ffde7df3e6748adfaa7025 (diff) | |
| parent | 8eee2bd7f484c4933c4e3112c3c3db886ac945ca (diff) | |
| download | talos-obmc-uboot-6d7ba2cef52d6daf119269f06c471c8882e59b84.tar.gz talos-obmc-uboot-6d7ba2cef52d6daf119269f06c471c8882e59b84.zip | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
fsl_esdhc: fix PIO mode transfers
mmc: tegra2: Implement card-detect hook.
mmc: fsl_esdhc: Implement card-detect hook.
mmc: Implement card detection.
mmc: Change board_mmc_getcd() function prototype.
drivers/mmc/mv_sdhci.c: Fix build warning
ftsdc010: improve performance and capability
mmc: add host_caps checking avoid switch card improperly
i.mx: fsl_esdhc: add the i.mx6q support
Diffstat (limited to 'include')
| -rw-r--r-- | include/mmc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/mmc.h b/include/mmc.h index 015a7f36ae..8744604ead 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -302,6 +302,7 @@ struct mmc { struct mmc_cmd *cmd, struct mmc_data *data); void (*set_ios)(struct mmc *mmc); int (*init)(struct mmc *mmc); + int (*getcd)(struct mmc *mmc); uint b_max; }; @@ -314,8 +315,9 @@ struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); int get_mmc_num(void); -int board_mmc_getcd(u8 *cd, struct mmc *mmc); +int board_mmc_getcd(struct mmc *mmc); int mmc_switch_part(int dev_num, unsigned int part_num); +int mmc_getcd(struct mmc *mmc); #ifdef CONFIG_GENERIC_MMC int atmel_mci_init(void *regs); |
