[U-Boot] [PATCH] imx: mx6quq7: add sd card detection

Julien Corjon corjon.j at ecagroup.com
Fri Feb 5 13:41:29 CET 2016


Add board_mmc_getcd function and declare CD_GPIO for
SDCard.

Signed-off-by: Julien Corjon <corjon.j at ecagroup.com>
---
 board/seco/mx6quq7/mx6quq7.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index ea1d4b8..d70c6bc 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},
-	{USDHC2_BASE_ADDR},
+	{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;
@@ -112,14 +131,12 @@ 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);
+			gpio_direction_input(USDHC4_CD_GPIO);
 			usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
-			usdhc_cfg[1].max_bus_width = 4;
 			break;
-
 		default:
 			printf("Warning: %d exceed maximum number of SD ports %d\n",
 			       index + 1, CONFIG_SYS_FSL_USDHC_NUM);
-- 
2.5.0



More information about the U-Boot mailing list