[U-Boot] [PATCH V3] imx6: mx6qarm2: updated board_mmc_getcd() to the new prototype

[Jason Hui]

On Wed, Jan 18, 2012 at 5:41 PM, Stefano Babic <sbabic at denx.de> wrote:
> Commit 314284b1567f1ce29c19060641e7f213146f7ab8 has
> changed board_mmc_getcd() function prototype, while
> mx6qarm2 has still the old one.
>
> Signed-off-by: Stefano Babic <sbabic at denx.de>
> CC: Jason Liu <jason.hui at linaro.org>
> Acked-by: Dirk Behme <dirk.behme at de.bosch.com>

Acked-by: Jason Liu <jason.hui at linaro.org>

> ---
> Changes since V1:
> - update subject (Fabio Estevam)
>
> Changes since V2:
> - board_mmc_getcd() must return 1 in the else clause (Jason Liu)
>
> Note: not tested on real board, the patch fixes building.

I have tested it on the real board, it works fine:)

Tested-by: Jason Liu <jason.hui at linaro.org>

>
>  board/freescale/mx6qarm2/mx6qarm2.c |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)
>
> 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)
> --
> 1.7.5.4
>