Merge branch 'master' of git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / board / timll / devkit8000 / devkit8000.c

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index bcbee73..a61cc14 100644 (file)
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -17,6 +17,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <dm.h>
+#include <ns16550.h>
 #include <twl4030.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
@@ -43,6 +45,17 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
        0
 };
 
+static const struct ns16550_platdata devkit8000_serial = {
+       OMAP34XX_UART3,
+       2,
+       V_NS16550_CLK
+};
+
+U_BOOT_DEVICE(devkit8000_uart) = {
+       "serial_omap",
+       &devkit8000_serial
+};
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -101,7 +114,7 @@ int misc_init_r(void)
        }
 #endif
 
-       dieid_num_r();
+       omap_die_id_display();
 
        return 0;
 }
@@ -124,6 +137,13 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
+#if defined(CONFIG_GENERIC_MMC)
+void board_mmc_power_init(void)
+{
+       twl4030_power_mmc_init(0);
+}
+#endif
+
 #if defined(CONFIG_DRIVER_DM9000) & !defined(CONFIG_SPL_BUILD)
 /*
  * Routine: board_eth_init