[U-Boot] [PATCH] imx6: mx6qarm2: updated
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 --- 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..9724c16 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 = 0;
- return 0; + return ret; }
int board_mmc_init(bd_t *bis)
On 17.01.2012 12:18, Stefano Babic wrote:
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
Thanks
Dirk
Hi Stefano,
On Tue, Jan 17, 2012 at 9:18 AM, Stefano Babic sbabic@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@denx.de CC: Jason Liu jason.hui@linaro.org
I think the subject of the patch could be improved.
Writing only "updated" in the subject is too vague.
Regards,
Fabio Estevam
On 17/01/2012 13:03, Fabio Estevam wrote:
Hi Stefano,
On Tue, Jan 17, 2012 at 9:18 AM, Stefano Babic sbabic@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@denx.de CC: Jason Liu jason.hui@linaro.org
I think the subject of the patch could be improved.
...one part was lost editing the commit message - I will send V2.
Stefano
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
--- 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..9724c16 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 = 0;
- return 0; + return ret; }
int board_mmc_init(bd_t *bis)
On Tue, Jan 17, 2012 at 9:15 PM, Stefano Babic sbabic@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@denx.de CC: Jason Liu jason.hui@linaro.org Acked-by: Dirk Behme dirk.behme@de.bosch.com
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..9724c16 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 = 0;
^^^^^^1 Apparently, this is wrong for the else statement, since there is no CD for the SD4 on the board, so, we have to tell MMC system that the card is always there, otherwise, we can't use the MMC plug-in that slot. After change to new prototype, we also need convert the ret value for the SD4, and return 1 not 0 to MMC.
- return 0;
- return ret;
}
int board_mmc_init(bd_t *bis)
1.7.5.4
On 18/01/2012 04:08, Jason Hui wrote:
-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 = 0;^^^^^^1Apparently, this is wrong for the else statement, since there is no CD for the SD4 on the board, so, we have to tell MMC system that the card is always there, otherwise, we can't use the MMC
Ok - so we have to invert the logic for the else clause.
plug-in that slot. After change to new prototype, we also need convert the ret value for the SD4, and return 1 not 0 to MMC.
Thanks - I send V3 with the required change.
Best regards, Stefano Babic
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 --- 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.
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)
On Wed, Jan 18, 2012 at 5:41 PM, Stefano Babic sbabic@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@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
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@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
participants (4)
-
Dirk Behme -
Fabio Estevam -
Jason Hui -
Stefano Babic