minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 13:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stefano Babic 2012-01-17 12:15:00 +01:00 committed by Albert ARIBAUD
parent db917fbfed
commit b125e7bdd8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
board/freescale/mx6qarm2/mx6qarm2.c
View File

@ -120,17 +120,18 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = {
{USDHC4_BASE_ADDR, 1}, {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; struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
int ret;
if (cfg->esdhc_base == USDHC3_BASE_ADDR) { if (cfg->esdhc_base == USDHC3_BASE_ADDR) {
gpio_direction_input(171); /*GPIO6_11*/ 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 */ } 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) int board_mmc_init(bd_t *bis)