diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-01 03:13:04 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 09:16:48 -0400 |
commit | 1d7a8654e88885137ade1769c574467775fde27b (patch) | |
tree | 3812a0bf030b8e7ed6214671b1794620b859f8de /arch/arm/mach-omap2 | |
parent | ba2eac9ed32e4485b2a76e1a0922837d3ffd6149 (diff) |
OMAP: use dvi panel driver instead of generic-dpi
Multiple OMAP3/4 boards have a DVI framer output. This patch makes the
boards use the new panel-dvi driver, instead of the panel-generic-dpi
driver.
Separate drivers for fixed size panels and DVI framer gives us cleaner
driver code.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-am3517evm.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 6 |
10 files changed, 30 insertions, 35 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index bd600cfb7f80..18c4d19a439f 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <plat/dma.h> | 37 | #include <plat/dma.h> |
38 | #include <plat/gpmc.h> | 38 | #include <plat/gpmc.h> |
39 | #include <video/omapdss.h> | 39 | #include <video/omapdss.h> |
40 | #include <video/omap-panel-generic-dpi.h> | 40 | #include <video/omap-panel-dvi.h> |
41 | 41 | ||
42 | #include <plat/gpmc-smc91x.h> | 42 | #include <plat/gpmc-smc91x.h> |
43 | 43 | ||
@@ -186,8 +186,7 @@ static struct omap_dss_device sdp3430_lcd_device = { | |||
186 | .platform_disable = sdp3430_panel_disable_lcd, | 186 | .platform_disable = sdp3430_panel_disable_lcd, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static struct panel_generic_dpi_data dvi_panel = { | 189 | static struct panel_dvi_platform_data dvi_panel = { |
190 | .name = "generic", | ||
191 | .platform_enable = sdp3430_panel_enable_dvi, | 190 | .platform_enable = sdp3430_panel_enable_dvi, |
192 | .platform_disable = sdp3430_panel_disable_dvi, | 191 | .platform_disable = sdp3430_panel_disable_dvi, |
193 | }; | 192 | }; |
@@ -195,7 +194,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
195 | static struct omap_dss_device sdp3430_dvi_device = { | 194 | static struct omap_dss_device sdp3430_dvi_device = { |
196 | .name = "dvi", | 195 | .name = "dvi", |
197 | .type = OMAP_DISPLAY_TYPE_DPI, | 196 | .type = OMAP_DISPLAY_TYPE_DPI, |
198 | .driver_name = "generic_dpi_panel", | 197 | .driver_name = "dvi", |
199 | .data = &dvi_panel, | 198 | .data = &dvi_panel, |
200 | .phy.dpi.data_lines = 24, | 199 | .phy.dpi.data_lines = 24, |
201 | }; | 200 | }; |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index f3006c304150..9a68ef5bb0e4 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <plat/usb.h> | 36 | #include <plat/usb.h> |
37 | #include <video/omapdss.h> | 37 | #include <video/omapdss.h> |
38 | #include <video/omap-panel-generic-dpi.h> | 38 | #include <video/omap-panel-generic-dpi.h> |
39 | #include <video/omap-panel-dvi.h> | ||
39 | 40 | ||
40 | #include "mux.h" | 41 | #include "mux.h" |
41 | #include "control.h" | 42 | #include "control.h" |
@@ -333,8 +334,7 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev) | |||
333 | dvi_enabled = 0; | 334 | dvi_enabled = 0; |
334 | } | 335 | } |
335 | 336 | ||
336 | static struct panel_generic_dpi_data dvi_panel = { | 337 | static struct panel_dvi_platform_data dvi_panel = { |
337 | .name = "generic", | ||
338 | .platform_enable = am3517_evm_panel_enable_dvi, | 338 | .platform_enable = am3517_evm_panel_enable_dvi, |
339 | .platform_disable = am3517_evm_panel_disable_dvi, | 339 | .platform_disable = am3517_evm_panel_disable_dvi, |
340 | }; | 340 | }; |
@@ -342,7 +342,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
342 | static struct omap_dss_device am3517_evm_dvi_device = { | 342 | static struct omap_dss_device am3517_evm_dvi_device = { |
343 | .type = OMAP_DISPLAY_TYPE_DPI, | 343 | .type = OMAP_DISPLAY_TYPE_DPI, |
344 | .name = "dvi", | 344 | .name = "dvi", |
345 | .driver_name = "generic_dpi_panel", | 345 | .driver_name = "dvi", |
346 | .data = &dvi_panel, | 346 | .data = &dvi_panel, |
347 | .phy.dpi.data_lines = 24, | 347 | .phy.dpi.data_lines = 24, |
348 | }; | 348 | }; |
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 3af8aab435b5..2d112bfbb5fb 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <plat/usb.h> | 43 | #include <plat/usb.h> |
44 | #include <video/omapdss.h> | 44 | #include <video/omapdss.h> |
45 | #include <video/omap-panel-generic-dpi.h> | 45 | #include <video/omap-panel-generic-dpi.h> |
46 | #include <video/omap-panel-dvi.h> | ||
46 | #include <plat/mcspi.h> | 47 | #include <plat/mcspi.h> |
47 | 48 | ||
48 | #include <mach/hardware.h> | 49 | #include <mach/hardware.h> |
@@ -242,8 +243,7 @@ static struct omap_dss_device cm_t35_lcd_device = { | |||
242 | .phy.dpi.data_lines = 18, | 243 | .phy.dpi.data_lines = 18, |
243 | }; | 244 | }; |
244 | 245 | ||
245 | static struct panel_generic_dpi_data dvi_panel = { | 246 | static struct panel_dvi_platform_data dvi_panel = { |
246 | .name = "generic", | ||
247 | .platform_enable = cm_t35_panel_enable_dvi, | 247 | .platform_enable = cm_t35_panel_enable_dvi, |
248 | .platform_disable = cm_t35_panel_disable_dvi, | 248 | .platform_disable = cm_t35_panel_disable_dvi, |
249 | }; | 249 | }; |
@@ -251,7 +251,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
251 | static struct omap_dss_device cm_t35_dvi_device = { | 251 | static struct omap_dss_device cm_t35_dvi_device = { |
252 | .name = "dvi", | 252 | .name = "dvi", |
253 | .type = OMAP_DISPLAY_TYPE_DPI, | 253 | .type = OMAP_DISPLAY_TYPE_DPI, |
254 | .driver_name = "generic_dpi_panel", | 254 | .driver_name = "dvi", |
255 | .data = &dvi_panel, | 255 | .data = &dvi_panel, |
256 | .phy.dpi.data_lines = 24, | 256 | .phy.dpi.data_lines = 24, |
257 | }; | 257 | }; |
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index da5057ee80ce..44da20765192 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <plat/usb.h> | 47 | #include <plat/usb.h> |
48 | #include <video/omapdss.h> | 48 | #include <video/omapdss.h> |
49 | #include <video/omap-panel-generic-dpi.h> | 49 | #include <video/omap-panel-generic-dpi.h> |
50 | #include <video/omap-panel-dvi.h> | ||
50 | 51 | ||
51 | #include <plat/mcspi.h> | 52 | #include <plat/mcspi.h> |
52 | #include <linux/input/matrix_keypad.h> | 53 | #include <linux/input/matrix_keypad.h> |
@@ -152,8 +153,7 @@ static struct omap_dss_device devkit8000_lcd_device = { | |||
152 | .phy.dpi.data_lines = 24, | 153 | .phy.dpi.data_lines = 24, |
153 | }; | 154 | }; |
154 | 155 | ||
155 | static struct panel_generic_dpi_data dvi_panel = { | 156 | static struct panel_dvi_platform_data dvi_panel = { |
156 | .name = "generic", | ||
157 | .platform_enable = devkit8000_panel_enable_dvi, | 157 | .platform_enable = devkit8000_panel_enable_dvi, |
158 | .platform_disable = devkit8000_panel_disable_dvi, | 158 | .platform_disable = devkit8000_panel_disable_dvi, |
159 | }; | 159 | }; |
@@ -161,7 +161,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
161 | static struct omap_dss_device devkit8000_dvi_device = { | 161 | static struct omap_dss_device devkit8000_dvi_device = { |
162 | .name = "dvi", | 162 | .name = "dvi", |
163 | .type = OMAP_DISPLAY_TYPE_DPI, | 163 | .type = OMAP_DISPLAY_TYPE_DPI, |
164 | .driver_name = "generic_dpi_panel", | 164 | .driver_name = "dvi", |
165 | .data = &dvi_panel, | 165 | .data = &dvi_panel, |
166 | .phy.dpi.data_lines = 24, | 166 | .phy.dpi.data_lines = 24, |
167 | }; | 167 | }; |
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 35be778caf1b..9fda8d841f1e 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <plat/gpmc.h> | 32 | #include <plat/gpmc.h> |
33 | #include <plat/usb.h> | 33 | #include <plat/usb.h> |
34 | #include <video/omapdss.h> | 34 | #include <video/omapdss.h> |
35 | #include <video/omap-panel-generic-dpi.h> | 35 | #include <video/omap-panel-dvi.h> |
36 | #include <plat/onenand.h> | 36 | #include <plat/onenand.h> |
37 | 37 | ||
38 | #include "mux.h" | 38 | #include "mux.h" |
@@ -455,8 +455,7 @@ static void igep2_disable_dvi(struct omap_dss_device *dssdev) | |||
455 | gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0); | 455 | gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0); |
456 | } | 456 | } |
457 | 457 | ||
458 | static struct panel_generic_dpi_data dvi_panel = { | 458 | static struct panel_dvi_platform_data dvi_panel = { |
459 | .name = "generic", | ||
460 | .platform_enable = igep2_enable_dvi, | 459 | .platform_enable = igep2_enable_dvi, |
461 | .platform_disable = igep2_disable_dvi, | 460 | .platform_disable = igep2_disable_dvi, |
462 | }; | 461 | }; |
@@ -464,7 +463,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
464 | static struct omap_dss_device igep2_dvi_device = { | 463 | static struct omap_dss_device igep2_dvi_device = { |
465 | .type = OMAP_DISPLAY_TYPE_DPI, | 464 | .type = OMAP_DISPLAY_TYPE_DPI, |
466 | .name = "dvi", | 465 | .name = "dvi", |
467 | .driver_name = "generic_dpi_panel", | 466 | .driver_name = "dvi", |
468 | .data = &dvi_panel, | 467 | .data = &dvi_panel, |
469 | .phy.dpi.data_lines = 24, | 468 | .phy.dpi.data_lines = 24, |
470 | }; | 469 | }; |
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 3ae16b4e3f52..26bc86082737 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <plat/board.h> | 42 | #include <plat/board.h> |
43 | #include <plat/common.h> | 43 | #include <plat/common.h> |
44 | #include <video/omapdss.h> | 44 | #include <video/omapdss.h> |
45 | #include <video/omap-panel-generic-dpi.h> | 45 | #include <video/omap-panel-dvi.h> |
46 | #include <plat/gpmc.h> | 46 | #include <plat/gpmc.h> |
47 | #include <plat/nand.h> | 47 | #include <plat/nand.h> |
48 | #include <plat/usb.h> | 48 | #include <plat/usb.h> |
@@ -203,8 +203,7 @@ static void beagle_disable_dvi(struct omap_dss_device *dssdev) | |||
203 | gpio_set_value(dssdev->reset_gpio, 0); | 203 | gpio_set_value(dssdev->reset_gpio, 0); |
204 | } | 204 | } |
205 | 205 | ||
206 | static struct panel_generic_dpi_data dvi_panel = { | 206 | static struct panel_dvi_platform_data dvi_panel = { |
207 | .name = "generic", | ||
208 | .platform_enable = beagle_enable_dvi, | 207 | .platform_enable = beagle_enable_dvi, |
209 | .platform_disable = beagle_disable_dvi, | 208 | .platform_disable = beagle_disable_dvi, |
210 | }; | 209 | }; |
@@ -212,7 +211,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
212 | static struct omap_dss_device beagle_dvi_device = { | 211 | static struct omap_dss_device beagle_dvi_device = { |
213 | .type = OMAP_DISPLAY_TYPE_DPI, | 212 | .type = OMAP_DISPLAY_TYPE_DPI, |
214 | .name = "dvi", | 213 | .name = "dvi", |
215 | .driver_name = "generic_dpi_panel", | 214 | .driver_name = "dvi", |
216 | .data = &dvi_panel, | 215 | .data = &dvi_panel, |
217 | .phy.dpi.data_lines = 24, | 216 | .phy.dpi.data_lines = 24, |
218 | .reset_gpio = -EINVAL, | 217 | .reset_gpio = -EINVAL, |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c452b3f3331a..82142c5be0c9 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <plat/common.h> | 45 | #include <plat/common.h> |
46 | #include <plat/mcspi.h> | 46 | #include <plat/mcspi.h> |
47 | #include <video/omapdss.h> | 47 | #include <video/omapdss.h> |
48 | #include <video/omap-panel-generic-dpi.h> | 48 | #include <video/omap-panel-dvi.h> |
49 | 49 | ||
50 | #include "mux.h" | 50 | #include "mux.h" |
51 | #include "sdram-micron-mt46h32m32lf-6.h" | 51 | #include "sdram-micron-mt46h32m32lf-6.h" |
@@ -247,8 +247,7 @@ static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev) | |||
247 | dvi_enabled = 0; | 247 | dvi_enabled = 0; |
248 | } | 248 | } |
249 | 249 | ||
250 | static struct panel_generic_dpi_data dvi_panel = { | 250 | static struct panel_dvi_platform_data dvi_panel = { |
251 | .name = "generic", | ||
252 | .platform_enable = omap3_evm_enable_dvi, | 251 | .platform_enable = omap3_evm_enable_dvi, |
253 | .platform_disable = omap3_evm_disable_dvi, | 252 | .platform_disable = omap3_evm_disable_dvi, |
254 | }; | 253 | }; |
@@ -256,7 +255,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
256 | static struct omap_dss_device omap3_evm_dvi_device = { | 255 | static struct omap_dss_device omap3_evm_dvi_device = { |
257 | .name = "dvi", | 256 | .name = "dvi", |
258 | .type = OMAP_DISPLAY_TYPE_DPI, | 257 | .type = OMAP_DISPLAY_TYPE_DPI, |
259 | .driver_name = "generic_dpi_panel", | 258 | .driver_name = "dvi", |
260 | .data = &dvi_panel, | 259 | .data = &dvi_panel, |
261 | .phy.dpi.data_lines = 24, | 260 | .phy.dpi.data_lines = 24, |
262 | }; | 261 | }; |
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 8e104980ea26..8ab99f1d9e2c 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
42 | #include <video/omapdss.h> | 42 | #include <video/omapdss.h> |
43 | #include <video/omap-panel-generic-dpi.h> | 43 | #include <video/omap-panel-generic-dpi.h> |
44 | #include <video/omap-panel-dvi.h> | ||
44 | 45 | ||
45 | #include <plat/mcspi.h> | 46 | #include <plat/mcspi.h> |
46 | #include <linux/input/matrix_keypad.h> | 47 | #include <linux/input/matrix_keypad.h> |
@@ -179,8 +180,7 @@ static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev) | |||
179 | dvi_enabled = 0; | 180 | dvi_enabled = 0; |
180 | } | 181 | } |
181 | 182 | ||
182 | static struct panel_generic_dpi_data dvi_panel = { | 183 | static struct panel_dvi_platform_data dvi_panel = { |
183 | .name = "generic", | ||
184 | .platform_enable = omap3_stalker_enable_dvi, | 184 | .platform_enable = omap3_stalker_enable_dvi, |
185 | .platform_disable = omap3_stalker_disable_dvi, | 185 | .platform_disable = omap3_stalker_disable_dvi, |
186 | }; | 186 | }; |
@@ -188,7 +188,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
188 | static struct omap_dss_device omap3_stalker_dvi_device = { | 188 | static struct omap_dss_device omap3_stalker_dvi_device = { |
189 | .name = "dvi", | 189 | .name = "dvi", |
190 | .type = OMAP_DISPLAY_TYPE_DPI, | 190 | .type = OMAP_DISPLAY_TYPE_DPI, |
191 | .driver_name = "generic_dpi_panel", | 191 | .driver_name = "dvi", |
192 | .data = &dvi_panel, | 192 | .data = &dvi_panel, |
193 | .phy.dpi.data_lines = 24, | 193 | .phy.dpi.data_lines = 24, |
194 | }; | 194 | }; |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 9aaa96057666..c35384e7e652 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <plat/common.h> | 40 | #include <plat/common.h> |
41 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
42 | #include <plat/mmc.h> | 42 | #include <plat/mmc.h> |
43 | #include <video/omap-panel-generic-dpi.h> | 43 | #include <video/omap-panel-dvi.h> |
44 | 44 | ||
45 | #include "hsmmc.h" | 45 | #include "hsmmc.h" |
46 | #include "control.h" | 46 | #include "control.h" |
@@ -455,8 +455,7 @@ static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev) | |||
455 | } | 455 | } |
456 | 456 | ||
457 | /* Using generic display panel */ | 457 | /* Using generic display panel */ |
458 | static struct panel_generic_dpi_data omap4_dvi_panel = { | 458 | static struct panel_dvi_platform_data omap4_dvi_panel = { |
459 | .name = "generic", | ||
460 | .platform_enable = omap4_panda_enable_dvi, | 459 | .platform_enable = omap4_panda_enable_dvi, |
461 | .platform_disable = omap4_panda_disable_dvi, | 460 | .platform_disable = omap4_panda_disable_dvi, |
462 | }; | 461 | }; |
@@ -464,7 +463,7 @@ static struct panel_generic_dpi_data omap4_dvi_panel = { | |||
464 | struct omap_dss_device omap4_panda_dvi_device = { | 463 | struct omap_dss_device omap4_panda_dvi_device = { |
465 | .type = OMAP_DISPLAY_TYPE_DPI, | 464 | .type = OMAP_DISPLAY_TYPE_DPI, |
466 | .name = "dvi", | 465 | .name = "dvi", |
467 | .driver_name = "generic_dpi_panel", | 466 | .driver_name = "dvi", |
468 | .data = &omap4_dvi_panel, | 467 | .data = &omap4_dvi_panel, |
469 | .phy.dpi.data_lines = 24, | 468 | .phy.dpi.data_lines = 24, |
470 | .reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, | 469 | .reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO, |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index f949a9954d76..06064d5dad64 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <plat/common.h> | 46 | #include <plat/common.h> |
47 | #include <video/omapdss.h> | 47 | #include <video/omapdss.h> |
48 | #include <video/omap-panel-generic-dpi.h> | 48 | #include <video/omap-panel-generic-dpi.h> |
49 | #include <video/omap-panel-dvi.h> | ||
49 | #include <plat/gpmc.h> | 50 | #include <plat/gpmc.h> |
50 | #include <mach/hardware.h> | 51 | #include <mach/hardware.h> |
51 | #include <plat/nand.h> | 52 | #include <plat/nand.h> |
@@ -182,8 +183,7 @@ static void overo_panel_disable_dvi(struct omap_dss_device *dssdev) | |||
182 | dvi_enabled = 0; | 183 | dvi_enabled = 0; |
183 | } | 184 | } |
184 | 185 | ||
185 | static struct panel_generic_dpi_data dvi_panel = { | 186 | static struct panel_dvi_platform_data dvi_panel = { |
186 | .name = "generic", | ||
187 | .platform_enable = overo_panel_enable_dvi, | 187 | .platform_enable = overo_panel_enable_dvi, |
188 | .platform_disable = overo_panel_disable_dvi, | 188 | .platform_disable = overo_panel_disable_dvi, |
189 | }; | 189 | }; |
@@ -191,7 +191,7 @@ static struct panel_generic_dpi_data dvi_panel = { | |||
191 | static struct omap_dss_device overo_dvi_device = { | 191 | static struct omap_dss_device overo_dvi_device = { |
192 | .name = "dvi", | 192 | .name = "dvi", |
193 | .type = OMAP_DISPLAY_TYPE_DPI, | 193 | .type = OMAP_DISPLAY_TYPE_DPI, |
194 | .driver_name = "generic_dpi_panel", | 194 | .driver_name = "dvi", |
195 | .data = &dvi_panel, | 195 | .data = &dvi_panel, |
196 | .phy.dpi.data_lines = 24, | 196 | .phy.dpi.data_lines = 24, |
197 | }; | 197 | }; |