diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 23:51:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 23:51:21 -0700 |
| commit | d211093fbad99e6c38e168f71ca2ede64a51fe58 (patch) | |
| tree | cd08522ca6fefee1f3608f84b4f3419e5af332e1 /arch/arm/mach-omap2/board-omap3evm.c | |
| parent | a9a9bb2062b9202dda0b2a84b44e305669136d1a (diff) | |
| parent | 21f787b356279798a002c68d53628755c84168de (diff) | |
| download | linux-d211093fbad99e6c38e168f71ca2ede64a51fe58.tar.gz linux-d211093fbad99e6c38e168f71ca2ede64a51fe58.tar.bz2 linux-d211093fbad99e6c38e168f71ca2ede64a51fe58.zip | |
Merge tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Clean up for omap DSS board init in preparation for adding DT support.
By Tomi Valkeinen
via Tomi Valkeinen (1) and Tony Lindgren (1)
* tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
OMAPDSS: DSI: implement generic DSI pin config
OMAPDSS: Taal: move reset gpio handling to taal driver
OMAPDSS: TFP410: rename dvi files to tfp410
OMAPDSS: TFP410: rename dvi -> tfp410
OMAP: board-files: remove custom PD GPIO handling for DVI output
OMAPDSS: panel-dvi: add PD gpio handling
Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index fd1b481c762c..ace3c675e9c2 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -46,7 +46,7 @@ #include "common.h" #include <plat/mcspi.h> #include <video/omapdss.h> -#include <video/omap-panel-dvi.h> +#include <video/omap-panel-tfp410.h> #include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" @@ -219,35 +219,14 @@ static struct omap_dss_device omap3_evm_tv_device = { .platform_disable = omap3_evm_disable_tv, }; -static int omap3_evm_enable_dvi(struct omap_dss_device *dssdev) -{ - if (lcd_enabled) { - printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); - return -EINVAL; - } - - gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 1); - - dvi_enabled = 1; - return 0; -} - -static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev) -{ - gpio_set_value_cansleep(OMAP3EVM_DVI_PANEL_EN_GPIO, 0); - - dvi_enabled = 0; -} - -static struct panel_dvi_platform_data dvi_panel = { - .platform_enable = omap3_evm_enable_dvi, - .platform_disable = omap3_evm_disable_dvi, +static struct tfp410_platform_data dvi_panel = { + .power_down_gpio = OMAP3EVM_DVI_PANEL_EN_GPIO, }; static struct omap_dss_device omap3_evm_dvi_device = { .name = "dvi", .type = OMAP_DISPLAY_TYPE_DPI, - .driver_name = "dvi", + .driver_name = "tfp410", .data = &dvi_panel, .phy.dpi.data_lines = 24, }; |