1 files changed, 14 insertions, 5 deletions

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index fc824361430d..668e278433c2 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -41,8 +41,6 @@
 
 extern int omap_gpio_init(void);
 
-static int __initdata h3_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
-
 static struct mtd_partition h3_partitions[] = {
         /* bootloader (U-Boot, etc) in first sector */
         {
@@ -168,9 +166,20 @@ static struct omap_mmc_config h3_mmc_config __initdata = {
         },
 };
 
+static struct omap_uart_config h3_uart_config __initdata = {
+        .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
+};
+
+static struct omap_lcd_config h3_lcd_config __initdata = {
+        .panel_name     = "h3",
+        .ctrl_name      = "internal",
+};
+
 static struct omap_board_config_kernel h3_config[] = {
-        { OMAP_TAG_USB,  &h3_usb_config },
-        { OMAP_TAG_MMC,  &h3_mmc_config },
+        { OMAP_TAG_USB,         &h3_usb_config },
+        { OMAP_TAG_MMC,         &h3_mmc_config },
+        { OMAP_TAG_UART,        &h3_uart_config },
+        { OMAP_TAG_LCD,         &h3_lcd_config },
 };
 
 static void __init h3_init(void)
@@ -180,6 +189,7 @@ static void __init h3_init(void)
         (void) platform_add_devices(devices, ARRAY_SIZE(devices));
         omap_board_config = h3_config;
         omap_board_config_size = ARRAY_SIZE(h3_config);
+        omap_serial_init();
 }
 
 static void __init h3_init_smc91x(void)
@@ -201,7 +211,6 @@ void h3_init_irq(void)
 static void __init h3_map_io(void)
 {
         omap_map_common_io();
-        omap_serial_init(h3_serial_ports);
 }
 
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")