summaryrefslogtreecommitdiff
path: root/board/efikamx
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-01-02 01:15:36 +0000
committerAndy Fleming <afleming@freescale.com>2012-01-08 21:28:27 -0600
commit314284b1567f1ce29c19060641e7f213146f7ab8 (patch)
tree116155fe43126dbd7a94cff179e16b084c9f1e04 /board/efikamx
parentbfe6f6235fdfa130ad8c5a8898ef4d3a37bcad8c (diff)
downloadu-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/efikamx')
-rw-r--r--board/efikamx/efikamx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index 1f6c457..e88b2ed 100644
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -314,17 +314,18 @@ static inline uint32_t efika_mmc_cd(void)
return MX51_PIN_EIM_CS2;
}
-int board_mmc_getcd(u8 *absent, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
{
struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
uint32_t cd = efika_mmc_cd();
+ int ret;
if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
- *absent = gpio_get_value(IOMUX_TO_GPIO(cd));
+ ret = !gpio_get_value(IOMUX_TO_GPIO(cd));
else
- *absent = gpio_get_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_8));
+ ret = !gpio_get_value(IOMUX_TO_GPIO(MX51_PIN_GPIO1_8));
- return 0;
+ return ret;
}
int board_mmc_init(bd_t *bis)