diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2012-01-02 01:15:36 +0000 |
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2012-01-08 21:28:27 -0600 |
| commit | 314284b1567f1ce29c19060641e7f213146f7ab8 (patch) | |
| tree | 116155fe43126dbd7a94cff179e16b084c9f1e04 /board/freescale/mx51evk | |
| parent | bfe6f6235fdfa130ad8c5a8898ef4d3a37bcad8c (diff) | |
| download | u-boot-imx-314284b1567f1ce29c19060641e7f213146f7ab8.zip u-boot-imx-314284b1567f1ce29c19060641e7f213146f7ab8.tar.gz u-boot-imx-314284b1567f1ce29c19060641e7f213146f7ab8.tar.bz2 | |
mmc: Change board_mmc_getcd() function prototype.
The new API no longer uses the extra cd parameter that was used to store
the card presence state. Instead, this information is returned via the
function's return value. board_mmc_getcd() returns -1 to indicate that
no card-detection mechanism is implemented; 0 indicates that no card is
present and 1 is returned if it was detected that a card is present.
The rationale for this change can be found in the following email
thread:
http://lists.denx.de/pipermail/u-boot/2011-November/110180.html
In summary, the old API was not consistent with the rest of the MMC API
which always passes a struct mmc as the first parameter. Furthermore the
cd parameter was used to mean "card absence" in some implementations and
"card presence" in others.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Tested-by: Jason Liu <jason.hui@linaro.org>
Diffstat (limited to 'board/freescale/mx51evk')
| -rw-r--r-- | board/freescale/mx51evk/mx51evk.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index e43aaf7..8d1f6a3 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -321,19 +321,20 @@ static void power_init(void) } #ifdef CONFIG_FSL_ESDHC -int board_mmc_getcd(u8 *cd, struct mmc *mmc) +int board_mmc_getcd(struct mmc *mmc) { struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; + int ret; mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT1); mxc_request_iomux(MX51_PIN_GPIO1_6, IOMUX_CONFIG_ALT0); if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR) - *cd = gpio_get_value(0); + ret = !gpio_get_value(0); else - *cd = gpio_get_value(6); + ret = !gpio_get_value(6); - return 0; + return ret; } int board_mmc_init(bd_t *bis) |