From: Stefano Babic <sbabic@denx.de>
Date: Tue, 17 Jan 2012 11:15:00 +0000 (+0100)
Subject: imx6: mx6qarm2: updated board_mmc_getcd() to the new prototype
X-Git-Tag: v2012.04-rc1~218
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b125e7bdd819024d1fb59b54349202190fcadd37;p=u-boot

imx6: mx6qarm2: updated board_mmc_getcd() to the new prototype

Commit 314284b1567f1ce29c19060641e7f213146f7ab8 has
changed board_mmc_getcd() function prototype, while
mx6qarm2 has still the old one.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Jason Liu <jason.hui@linaro.org>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
Acked-by: Jason Liu <jason.hui@linaro.org>
Tested-by: Jason Liu <jason.hui@linaro.org>
---

diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 98942454a0..1367b88028 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -120,17 +120,18 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
 	{USDHC4_BASE_ADDR, 1},
 };
 
-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;
 
 	if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
 		gpio_direction_input(171); /*GPIO6_11*/
-		*cd = gpio_get_value(171);
+		ret = !gpio_get_value(171);
 	} else /* Don't have the CD GPIO pin on board */
-		*cd = 0;
+		ret = 1;
 
-	return 0;
+	return ret;
 }
 
 int board_mmc_init(bd_t *bis)