From 2c79b7a3bbf9713046d98d7a6a0f2eb476c32a2b Mon Sep 17 00:00:00 2001 From: Julien CORJON Date: Fri, 5 Feb 2016 16:19:31 +0100 Subject: imx: mx6quq7: fix USDHC4 declaration USDHC2 does not exist on mx6quq7 board, as USDHC4 was already been declared this is probably a typo. Signed-off-by: Julien Corjon Acked-by: Boris Brezillon --- board/seco/mx6quq7/mx6quq7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/seco/mx6quq7') diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c index ea1d4b8e49..3743a9e3da 100644 --- a/board/seco/mx6quq7/mx6quq7.c +++ b/board/seco/mx6quq7/mx6quq7.c @@ -93,7 +93,7 @@ int board_eth_init(bd_t *bis) static struct fsl_esdhc_cfg usdhc_cfg[2] = { {USDHC3_BASE_ADDR}, - {USDHC2_BASE_ADDR}, + {USDHC4_BASE_ADDR}, }; int board_mmc_init(bd_t *bis) -- cgit v1.2.1 From dd8bd015e8bb89891b1dc6caccbe67a0c603584a Mon Sep 17 00:00:00 2001 From: Julien CORJON Date: Fri, 5 Feb 2016 16:19:32 +0100 Subject: imx: mx6quq7: specify max_bus_witdh directly in usdhc_cfg Specify max_bus_width directly in usdhc_cfg static definition instead of tweaking it in the board_mmc_init() function. Signed-off-by: Julien Corjon --- board/seco/mx6quq7/mx6quq7.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'board/seco/mx6quq7') diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c index 3743a9e3da..89ae70d497 100644 --- a/board/seco/mx6quq7/mx6quq7.c +++ b/board/seco/mx6quq7/mx6quq7.c @@ -92,8 +92,8 @@ int board_eth_init(bd_t *bis) } static struct fsl_esdhc_cfg usdhc_cfg[2] = { - {USDHC3_BASE_ADDR}, - {USDHC4_BASE_ADDR}, + {USDHC3_BASE_ADDR, 0, 4}, + {USDHC4_BASE_ADDR, 0, 4}, }; int board_mmc_init(bd_t *bis) @@ -112,12 +112,10 @@ int board_mmc_init(bd_t *bis) case 0: seco_mx6_setup_usdhc_iomux(3); usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - usdhc_cfg[0].max_bus_width = 4; break; case 1: seco_mx6_setup_usdhc_iomux(4); usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK); - usdhc_cfg[1].max_bus_width = 4; break; default: -- cgit v1.2.1 From 22bd6b4f601c14d62c38bde5186c652082353b8b Mon Sep 17 00:00:00 2001 From: Julien CORJON Date: Fri, 5 Feb 2016 16:19:33 +0100 Subject: imx: mx6quq7: add sd card detection Add board_mmc_getcd function and declare CD_GPIO for SDCard. Signed-off-by: Julien Corjon --- board/seco/mx6quq7/mx6quq7.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'board/seco/mx6quq7') diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c index 89ae70d497..6be0b987ca 100644 --- a/board/seco/mx6quq7/mx6quq7.c +++ b/board/seco/mx6quq7/mx6quq7.c @@ -91,11 +91,30 @@ int board_eth_init(bd_t *bis) return ret; } +#define USDHC4_CD_GPIO IMX_GPIO_NR(2, 6) + static struct fsl_esdhc_cfg usdhc_cfg[2] = { {USDHC3_BASE_ADDR, 0, 4}, {USDHC4_BASE_ADDR, 0, 4}, }; +int board_mmc_getcd(struct mmc *mmc) +{ + struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; + int ret = 0; + + switch (cfg->esdhc_base) { + case USDHC3_BASE_ADDR: + ret = 1; /* Assume eMMC is always present */ + break; + case USDHC4_BASE_ADDR: + ret = !gpio_get_value(USDHC4_CD_GPIO); + break; + } + + return ret; +} + int board_mmc_init(bd_t *bis) { u32 index = 0; -- cgit v1.2.1