diff options
author | Bryan Wu <bryan.wu@canonical.com> | 2010-11-17 08:34:34 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2011-01-10 04:09:53 -0500 |
commit | 89747c9141cd750a610974d93f71492922b8cbd7 (patch) | |
tree | a11d30f7ff631081fdadf903c4fbf400f24a6ef1 /arch/arm/mach-omap2/board-omap3stalker.c | |
parent | a9a62b6a886545960488cae3b97acb482361b802 (diff) |
OMAP: use generic DPI panel driver in board files
Still keep sharp_ls_panel, since the sharp_ls_panel driver contains blacklight
control driver code which will be moved out later. Then we can use generic DPI
driver for sharp_ls_panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Archit Taneja <archit@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 9df9d9367608..2a2dad447e86 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <plat/nand.h> | 40 | #include <plat/nand.h> |
41 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
42 | #include <plat/display.h> | 42 | #include <plat/display.h> |
43 | #include <plat/panel-generic-dpi.h> | ||
43 | 44 | ||
44 | #include <plat/mcspi.h> | 45 | #include <plat/mcspi.h> |
45 | #include <linux/input/matrix_keypad.h> | 46 | #include <linux/input/matrix_keypad.h> |
@@ -160,13 +161,18 @@ static void omap3_stalker_disable_lcd(struct omap_dss_device *dssdev) | |||
160 | lcd_enabled = 0; | 161 | lcd_enabled = 0; |
161 | } | 162 | } |
162 | 163 | ||
164 | static struct panel_generic_dpi_data lcd_panel = { | ||
165 | .name = "generic", | ||
166 | .platform_enable = omap3_stalker_enable_lcd, | ||
167 | .platform_disable = omap3_stalker_disable_lcd, | ||
168 | }; | ||
169 | |||
163 | static struct omap_dss_device omap3_stalker_lcd_device = { | 170 | static struct omap_dss_device omap3_stalker_lcd_device = { |
164 | .name = "lcd", | 171 | .name = "lcd", |
165 | .driver_name = "generic_panel", | 172 | .driver_name = "generic_dpi_panel", |
173 | .data = &lcd_panel, | ||
166 | .phy.dpi.data_lines = 24, | 174 | .phy.dpi.data_lines = 24, |
167 | .type = OMAP_DISPLAY_TYPE_DPI, | 175 | .type = OMAP_DISPLAY_TYPE_DPI, |
168 | .platform_enable = omap3_stalker_enable_lcd, | ||
169 | .platform_disable = omap3_stalker_disable_lcd, | ||
170 | }; | 176 | }; |
171 | 177 | ||
172 | static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev) | 178 | static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev) |
@@ -208,13 +214,18 @@ static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev) | |||
208 | dvi_enabled = 0; | 214 | dvi_enabled = 0; |
209 | } | 215 | } |
210 | 216 | ||
217 | static struct panel_generic_dpi_data dvi_panel = { | ||
218 | .name = "generic", | ||
219 | .platform_enable = omap3_stalker_enable_dvi, | ||
220 | .platform_disable = omap3_stalker_disable_dvi, | ||
221 | }; | ||
222 | |||
211 | static struct omap_dss_device omap3_stalker_dvi_device = { | 223 | static struct omap_dss_device omap3_stalker_dvi_device = { |
212 | .name = "dvi", | 224 | .name = "dvi", |
213 | .driver_name = "generic_panel", | ||
214 | .type = OMAP_DISPLAY_TYPE_DPI, | 225 | .type = OMAP_DISPLAY_TYPE_DPI, |
226 | .driver_name = "generic_dpi_panel", | ||
227 | .data = &dvi_panel, | ||
215 | .phy.dpi.data_lines = 24, | 228 | .phy.dpi.data_lines = 24, |
216 | .platform_enable = omap3_stalker_enable_dvi, | ||
217 | .platform_disable = omap3_stalker_disable_dvi, | ||
218 | }; | 229 | }; |
219 | 230 | ||
220 | static struct omap_dss_device *omap3_stalker_dss_devices[] = { | 231 | static struct omap_dss_device *omap3_stalker_dss_devices[] = { |