diff options
author | Nikita Kiryanov <nikita@compulab.co.il> | 2012-12-03 02:19:44 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-03-08 21:41:13 (GMT) |
commit | e874d5b001e9d7ea0fc7596ef0fe6dd520ed8ec6 (patch) | |
tree | 986ee326891b81627b807faaa381dff0fea1a8d2 /arch | |
parent | cc22b0c0122cee0ab59dcc3c06c52835b38e8791 (diff) | |
download | u-boot-e874d5b001e9d7ea0fc7596ef0fe6dd520ed8ec6.tar.xz |
omap_hsmmc: implement driver check for card detection
Implement driver check for card detection.
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 4 | ||||
-rw-r--r-- | arch/arm/include/asm/omap_mmc.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index ab31326..7def17e 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -56,11 +56,11 @@ int cpu_mmc_init(bd_t *bis) { int ret; - ret = omap_mmc_init(0, 0, 0); + ret = omap_mmc_init(0, 0, 0, -1); if (ret) return ret; - return omap_mmc_init(1, 0, 0); + return omap_mmc_init(1, 0, 0, -1); } #endif diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 1c8b617..793e82e 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -64,11 +64,11 @@ int board_mmc_init(bd_t *bis) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: - omap_mmc_init(0, 0, 0); + omap_mmc_init(0, 0, 0, -1); break; case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2_2: - omap_mmc_init(1, 0, 0); + omap_mmc_init(1, 0, 0, -1); break; } return 0; diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 89c587e..f9f7aae 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -98,11 +98,11 @@ int board_mmc_init(bd_t *bis) { switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: - omap_mmc_init(0, 0, 0); + omap_mmc_init(0, 0, 0, -1); break; case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2_2: - omap_mmc_init(1, 0, 0); + omap_mmc_init(1, 0, 0, -1); break; } return 0; diff --git a/arch/arm/include/asm/omap_mmc.h b/arch/arm/include/asm/omap_mmc.h index 83726ee..8d86de1 100644 --- a/arch/arm/include/asm/omap_mmc.h +++ b/arch/arm/include/asm/omap_mmc.h @@ -161,7 +161,7 @@ struct hsmmc { #define mmc_reg_out(addr, mask, val)\ writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) -int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max); +int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max, int cd_gpio); #endif /* OMAP_MMC_H_ */ |