Merge branch 'late/clksrc' into late/cleanup

[linux.git] / arch / arm / mach-omap2 / board-omap3pandora.c

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 1004d2aaa68f5e29847eeb1691f7e3d909a162d7..28133d5b4fed19ca1976bae99dce66a328e46e5d 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -44,6 +44,7 @@
 
 #include "common.h"
 #include <video/omapdss.h>
+#include <video/omap-panel-data.h>
 #include <linux/platform_data/mtd-nand-omap2.h>
 
 #include "mux.h"
@@ -230,12 +231,16 @@ static struct twl4030_keypad_data pandora_kp_data = {
        .rep            = 1,
 };
 
+static struct panel_tpo_td043_data lcd_data = {
+       .nreset_gpio            = 157,
+};
+
 static struct omap_dss_device pandora_lcd_device = {
        .name                   = "lcd",
        .driver_name            = "tpo_td043mtea1_panel",
        .type                   = OMAP_DISPLAY_TYPE_DPI,
        .phy.dpi.data_lines     = 24,
-       .reset_gpio             = 157,
+       .data                   = &lcd_data,
 };
 
 static struct omap_dss_device pandora_tv_device = {