summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-04-21 14:26:22 +0800
committerYe Li <ye.li@nxp.com>2016-04-22 10:23:06 +0800
commit47efe2fda62297ab1da8594828cd7bd928ecbda7 (patch)
tree72e2875e620b35bf43d1aef0a804519d19a78e8e
parent4ef1d44da87f7b863b234d7c10a4b37e01abb8e6 (diff)
downloadu-boot-imx-47efe2fda62297ab1da8594828cd7bd928ecbda7.zip
u-boot-imx-47efe2fda62297ab1da8594828cd7bd928ecbda7.tar.gz
u-boot-imx-47efe2fda62297ab1da8594828cd7bd928ecbda7.tar.bz2
MLK-12694 mx6ullarm2: Remove the CD detection of SD2
Since the CD pin of SD2 is DNP on the mx6ull arm2 board, this will cause SD2 access problem even the card is inserted. Hard code the CD result to 1 to assume the card is always on. The SD driver will return other errors if the card does not exist. Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c b/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
index af49bcf..1a0d0ec 100644
--- a/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
+++ b/board/freescale/mx6ull_ddr3_arm2/mx6ull_ddr3_arm2.c
@@ -407,7 +407,6 @@ static struct fsl_esdhc_cfg usdhc_cfg[2] = {
#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 19)
#define USDHC1_PWR_GPIO IMX_GPIO_NR(1, 9)
#define USDHC1_VSELECT IMX_GPIO_NR(1, 5)
-#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 19)
#define USDHC2_PWR_GPIO IMX_GPIO_NR(4, 10)
int mmc_get_env_devno(void)
@@ -448,7 +447,7 @@ int board_mmc_getcd(struct mmc *mmc)
break;
#if !defined(CONFIG_SYS_USE_NAND) && !defined(CONFIG_MX6ULL_DDR3_ARM2_QSPIB_REWORK)
case USDHC2_BASE_ADDR:
- ret = !gpio_get_value(USDHC2_CD_GPIO);
+ ret = 1;
break;
#endif
}
@@ -486,7 +485,6 @@ int board_mmc_init(bd_t *bis)
case 1:
imx_iomux_v3_setup_multiple_pads(
usdhc2_pads, ARRAY_SIZE(usdhc2_pads));
- gpio_direction_input(USDHC2_CD_GPIO);
gpio_direction_output(USDHC2_PWR_GPIO, 1);
usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
break;