diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 3645285a3e2b..99790eb646e8 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <plat/usb.h> | 37 | #include <plat/usb.h> |
38 | #include <video/omapdss.h> | 38 | #include <video/omapdss.h> |
39 | #include <video/omap-panel-generic-dpi.h> | 39 | #include <video/omap-panel-generic-dpi.h> |
40 | #include <video/omap-panel-dvi.h> | 40 | #include <video/omap-panel-tfp410.h> |
41 | 41 | ||
42 | #include "am35xx-emac.h" | 42 | #include "am35xx-emac.h" |
43 | #include "mux.h" | 43 | #include "mux.h" |
@@ -207,31 +207,14 @@ static struct omap_dss_device am3517_evm_tv_device = { | |||
207 | .platform_disable = am3517_evm_panel_disable_tv, | 207 | .platform_disable = am3517_evm_panel_disable_tv, |
208 | }; | 208 | }; |
209 | 209 | ||
210 | static int am3517_evm_panel_enable_dvi(struct omap_dss_device *dssdev) | 210 | static struct tfp410_platform_data dvi_panel = { |
211 | { | 211 | .power_down_gpio = -1, |
212 | if (lcd_enabled) { | ||
213 | printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); | ||
214 | return -EINVAL; | ||
215 | } | ||
216 | dvi_enabled = 1; | ||
217 | |||
218 | return 0; | ||
219 | } | ||
220 | |||
221 | static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev) | ||
222 | { | ||
223 | dvi_enabled = 0; | ||
224 | } | ||
225 | |||
226 | static struct panel_dvi_platform_data dvi_panel = { | ||
227 | .platform_enable = am3517_evm_panel_enable_dvi, | ||
228 | .platform_disable = am3517_evm_panel_disable_dvi, | ||
229 | }; | 212 | }; |
230 | 213 | ||
231 | static struct omap_dss_device am3517_evm_dvi_device = { | 214 | static struct omap_dss_device am3517_evm_dvi_device = { |
232 | .type = OMAP_DISPLAY_TYPE_DPI, | 215 | .type = OMAP_DISPLAY_TYPE_DPI, |
233 | .name = "dvi", | 216 | .name = "dvi", |
234 | .driver_name = "dvi", | 217 | .driver_name = "tfp410", |
235 | .data = &dvi_panel, | 218 | .data = &dvi_panel, |
236 | .phy.dpi.data_lines = 24, | 219 | .phy.dpi.data_lines = 24, |
237 | }; | 220 | }; |