From b125e7bdd819024d1fb59b54349202190fcadd37 Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Tue, 17 Jan 2012 12:15:00 +0100 Subject: 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 CC: Jason Liu Acked-by: Dirk Behme Acked-by: Jason Liu Tested-by: Jason Liu --- board/freescale/mx6qarm2/mx6qarm2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'board/freescale/mx6qarm2/mx6qarm2.c') diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index 9894245..1367b88 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) -- cgit v1.1