omap_hsmmc: implement driver check for card detection

[karo-tx-uboot.git] / board / ti / omap5_evm / evm.c

diff --git a/board/ti/omap5_evm/evm.c b/board/ti/omap5_evm/evm.c
index 88dac80225e4c62fb4f9a8d4d9e73f319e005085..45d4704772f8cf4c25e86e0f79aaa84d34b3c622 100644 (file)
--- a/board/ti/omap5_evm/evm.c
+++ b/board/ti/omap5_evm/evm.c
@@ -23,7 +23,7 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-#include <twl6030.h>
+#include <twl6035.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 
@@ -63,8 +63,8 @@ int board_eth_init(bd_t *bis)
  */
 int misc_init_r(void)
 {
-#ifdef CONFIG_TWL6030_POWER
-       twl6030_init_battery_charging();
+#ifdef CONFIG_TWL6035_POWER
+       twl6035_init_settings();
 #endif
        return 0;
 }
@@ -94,8 +94,8 @@ void set_muxconf_regs_non_essential(void)
 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
 int board_mmc_init(bd_t *bis)
 {
-       omap_mmc_init(0, 0, 0);
-       omap_mmc_init(1, 0, 0);
+       omap_mmc_init(0, 0, 0, -1);
+       omap_mmc_init(1, 0, 0, -1);
        return 0;
 }
 #endif