Extra omap code in linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-rx51.c

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 3a0daac6c8396740e10eca560514989c902596a6..768f507a569fb822e9d59cc7da6d43581d1eb298 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -16,7 +16,6 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -24,6 +23,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/mcspi.h>
+#include <mach/gpio.h>
 #include <mach/mux.h>
 #include <mach/board.h>
 #include <mach/common.h>
@@ -31,6 +31,7 @@
 #include <mach/dma.h>
 #include <mach/gpmc.h>
 #include <mach/usb.h>
+#include <mach/board-rx51.h>
 
 static struct omap_uart_config rx51_uart_config = {
        .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
@@ -62,12 +63,14 @@ static struct omap_board_config_kernel rx51_config[] = {
 
 static void __init rx51_init_irq(void)
 {
-       omap2_init_common_hw(NULL);
+       omap2_init_common_hw(rx51_get_sdram_timings());
        omap_init_irq();
        omap_gpio_init();
 }
 
+extern void __init rx51_flash_init(void);
 extern void __init rx51_peripherals_init(void);
+extern void __init rx51_video_init(void);
 
 static void __init rx51_init(void)
 {
@@ -75,7 +78,9 @@ static void __init rx51_init(void)
        omap_board_config_size = ARRAY_SIZE(rx51_config);
        omap_serial_init();
        usb_musb_init();
+       rx51_flash_init();
        rx51_peripherals_init();
+       rx51_video_init();
 }
 
 static void __init rx51_map_io(void)