Merge https://gitlab.denx.de/u-boot/custodians/u-boot-i2c

[oweals/u-boot.git] / board / seco / mx6quq7 / mx6quq7.c

diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index e7523f168b82724830fa086c648f28e287a1d7aa..c1e36b652e1c11df468a814fb8aa3c2109dd7c66 100644 (file)
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -1,24 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Freescale Semiconductor, Inc.
  * Copyright (C) 2015 ECA Sinters
  *
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
  * Modified by: Boris Brezillon <boris.brezillon@free-electrons.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
 #include <malloc.h>
 #include <mmc.h>
-#include <fsl_esdhc.h>
+#include <fsl_esdhc_imx.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <asm/arch/mxc_hdmi.h>
@@ -28,7 +27,7 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <micrel.h>
-#include <asm/imx-common/mxc_i2c.h>
+#include <asm/mach-imx/mxc_i2c.h>
 #include <i2c.h>
 
 #include "../common/mx6.h"
@@ -91,11 +90,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,12 +130,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: