summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-3430sdp.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-11 12:01:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-01-11 12:01:14 +0900
commite9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch)
treedce036fd737b4edb7e107e21e4af12fabec29bbd /arch/arm/mach-omap2/board-3430sdp.c
parente54be894eae10eca9892e965cc9532f5d5a11767 (diff)
parent18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff)
downloadtalos-op-linux-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.tar.gz
talos-op-linux-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.zip
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
Diffstat (limited to 'arch/arm/mach-omap2/board-3430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-3430sdp.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 3b39ef1a680a..d4e41ef86aa5 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -38,6 +38,7 @@
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/gpmc-smc91x.h>
@@ -270,13 +271,18 @@ static struct omap_dss_device sdp3430_lcd_device = {
.platform_disable = sdp3430_panel_disable_lcd,
};
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = sdp3430_panel_enable_dvi,
+ .platform_disable = sdp3430_panel_disable_dvi,
+};
+
static struct omap_dss_device sdp3430_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
.type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = sdp3430_panel_enable_dvi,
- .platform_disable = sdp3430_panel_disable_dvi,
};
static struct omap_dss_device sdp3430_tv_device = {
OpenPOWER on IntegriCloud