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 /drivers/mmc/sh_mmcif.c | |
parent | d0b8feef8b50335a58ffde7df3e6748adfaa7025 (diff) | |
parent | 8eee2bd7f484c4933c4e3112c3c3db886ac945ca (diff) | |
download | u-boot-imx-6d7ba2cef52d6daf119269f06c471c8882e59b84.zip u-boot-imx-6d7ba2cef52d6daf119269f06c471c8882e59b84.tar.gz u-boot-imx-6d7ba2cef52d6daf119269f06c471c8882e59b84.tar.bz2 |
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 'drivers/mmc/sh_mmcif.c')
-rw-r--r-- | drivers/mmc/sh_mmcif.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/sh_mmcif.c b/drivers/mmc/sh_mmcif.c index 567e2cb..2835e24 100644 --- a/drivers/mmc/sh_mmcif.c +++ b/drivers/mmc/sh_mmcif.c @@ -598,6 +598,7 @@ int mmcif_mmc_init(void) mmc->send_cmd = sh_mmcif_request; mmc->set_ios = sh_mmcif_set_ios; mmc->init = sh_mmcif_init; + mmc->getcd = NULL; host->regs = (struct sh_mmcif_regs *)CONFIG_SH_MMCIF_ADDR; host->clk = CONFIG_SH_MMCIF_CLK; mmc->priv = host; |