diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-11 12:01:14 +0900 |
| commit | e9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch) | |
| tree | dce036fd737b4edb7e107e21e4af12fabec29bbd /arch/arm/mach-omap2/board-am3517evm.c | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff) | |
| download | op-kernel-dev-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.zip op-kernel-dev-e9ab3207310e8acfa3a5cd8cbb44860f69270bfd.tar.gz | |
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index bc15626..10d60b7 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -35,6 +35,7 @@ #include <plat/common.h> #include <plat/usb.h> #include <plat/display.h> +#include <plat/panel-generic-dpi.h> #include "mux.h" #include "control.h" @@ -303,13 +304,18 @@ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev) lcd_enabled = 0; } +static struct panel_generic_dpi_data lcd_panel = { + .name = "sharp_lq", + .platform_enable = am3517_evm_panel_enable_lcd, + .platform_disable = am3517_evm_panel_disable_lcd, +}; + static struct omap_dss_device am3517_evm_lcd_device = { .type = OMAP_DISPLAY_TYPE_DPI, .name = "lcd", - .driver_name = "sharp_lq_panel", + .driver_name = "generic_dpi_panel", + .data = &lcd_panel, .phy.dpi.data_lines = 16, - .platform_enable = am3517_evm_panel_enable_lcd, - .platform_disable = am3517_evm_panel_disable_lcd, }; static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev) @@ -346,13 +352,18 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev) dvi_enabled = 0; } +static struct panel_generic_dpi_data dvi_panel = { + .name = "generic", + .platform_enable = am3517_evm_panel_enable_dvi, + .platform_disable = am3517_evm_panel_disable_dvi, +}; + static struct omap_dss_device am3517_evm_dvi_device = { .type = OMAP_DISPLAY_TYPE_DPI, .name = "dvi", - .driver_name = "generic_panel", + .driver_name = "generic_dpi_panel", + .data = &dvi_panel, .phy.dpi.data_lines = 24, - .platform_enable = am3517_evm_panel_enable_dvi, - .platform_disable = am3517_evm_panel_disable_dvi, }; static struct omap_dss_device *am3517_evm_dss_devices[] = { |
