diff options
author | Archit Taneja <archit@ti.com> | 2012-06-29 02:43:32 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-29 03:15:51 -0400 |
commit | 07fb51c6bda74210b57a06e6dc901a6b0f04c09a (patch) | |
tree | aa61f3857d164a1d7d33d66b36af1161f94be63b /drivers/video/omap2/displays/panel-generic-dpi.c | |
parent | 783babf33f47c8d42e73900575dd9beea98fca40 (diff) |
OMAPDSS: Remove omap_panel_config enum from omap_dss_device
omap_panel_config contains fields which are finally written to DISPC_POL_FREQo
registers. These are now held by omap_video_timings and are set when the manager
timings are applied.
Remove the omap_panel_config enum, and remove all it's references from panel or
interface drivers.
Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/displays/panel-generic-dpi.c')
-rw-r--r-- | drivers/video/omap2/displays/panel-generic-dpi.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c index 6cdd97c64330..bc5af2500eb9 100644 --- a/drivers/video/omap2/displays/panel-generic-dpi.c +++ b/drivers/video/omap2/displays/panel-generic-dpi.c | |||
@@ -40,8 +40,6 @@ | |||
40 | struct panel_config { | 40 | struct panel_config { |
41 | struct omap_video_timings timings; | 41 | struct omap_video_timings timings; |
42 | 42 | ||
43 | enum omap_panel_config config; | ||
44 | |||
45 | int power_on_delay; | 43 | int power_on_delay; |
46 | int power_off_delay; | 44 | int power_off_delay; |
47 | 45 | ||
@@ -76,8 +74,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
76 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, | 74 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, |
77 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 75 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
78 | }, | 76 | }, |
79 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
80 | OMAP_DSS_LCD_IEO, | ||
81 | .power_on_delay = 50, | 77 | .power_on_delay = 50, |
82 | .power_off_delay = 100, | 78 | .power_off_delay = 100, |
83 | .name = "sharp_lq", | 79 | .name = "sharp_lq", |
@@ -105,7 +101,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
105 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 101 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
106 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 102 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
107 | }, | 103 | }, |
108 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
109 | .power_on_delay = 50, | 104 | .power_on_delay = 50, |
110 | .power_off_delay = 100, | 105 | .power_off_delay = 100, |
111 | .name = "sharp_ls", | 106 | .name = "sharp_ls", |
@@ -133,9 +128,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
133 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 128 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
134 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE, | 129 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE, |
135 | }, | 130 | }, |
136 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
137 | OMAP_DSS_LCD_IPC | | ||
138 | OMAP_DSS_LCD_ONOFF, | ||
139 | .power_on_delay = 0, | 131 | .power_on_delay = 0, |
140 | .power_off_delay = 0, | 132 | .power_off_delay = 0, |
141 | .name = "toppoly_tdo35s", | 133 | .name = "toppoly_tdo35s", |
@@ -163,7 +155,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
163 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 155 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
164 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 156 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
165 | }, | 157 | }, |
166 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
167 | .power_on_delay = 0, | 158 | .power_on_delay = 0, |
168 | .power_off_delay = 0, | 159 | .power_off_delay = 0, |
169 | .name = "samsung_lte430wq_f0c", | 160 | .name = "samsung_lte430wq_f0c", |
@@ -191,7 +182,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
191 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 182 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
192 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 183 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
193 | }, | 184 | }, |
194 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
195 | .power_on_delay = 0, | 185 | .power_on_delay = 0, |
196 | .power_off_delay = 0, | 186 | .power_off_delay = 0, |
197 | .name = "seiko_70wvw1tz3", | 187 | .name = "seiko_70wvw1tz3", |
@@ -219,8 +209,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
219 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, | 209 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, |
220 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 210 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
221 | }, | 211 | }, |
222 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
223 | OMAP_DSS_LCD_IEO, | ||
224 | .power_on_delay = 0, | 212 | .power_on_delay = 0, |
225 | .power_off_delay = 0, | 213 | .power_off_delay = 0, |
226 | .name = "powertip_ph480272t", | 214 | .name = "powertip_ph480272t", |
@@ -248,7 +236,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
248 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 236 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
249 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 237 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
250 | }, | 238 | }, |
251 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
252 | .power_on_delay = 0, | 239 | .power_on_delay = 0, |
253 | .power_off_delay = 0, | 240 | .power_off_delay = 0, |
254 | .name = "innolux_at070tn83", | 241 | .name = "innolux_at070tn83", |
@@ -276,7 +263,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
276 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 263 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
277 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 264 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
278 | }, | 265 | }, |
279 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
280 | .name = "nec_nl2432dr22-11b", | 266 | .name = "nec_nl2432dr22-11b", |
281 | }, | 267 | }, |
282 | 268 | ||
@@ -327,8 +313,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
327 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 313 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
328 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 314 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
329 | }, | 315 | }, |
330 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
331 | |||
332 | .name = "apollon", | 316 | .name = "apollon", |
333 | }, | 317 | }, |
334 | /* FocalTech ETM070003DH6 */ | 318 | /* FocalTech ETM070003DH6 */ |
@@ -353,7 +337,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
353 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 337 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
354 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 338 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
355 | }, | 339 | }, |
356 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS, | ||
357 | .name = "focaltech_etm070003dh6", | 340 | .name = "focaltech_etm070003dh6", |
358 | }, | 341 | }, |
359 | 342 | ||
@@ -379,8 +362,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
379 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 362 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
380 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 363 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
381 | }, | 364 | }, |
382 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
383 | OMAP_DSS_LCD_IPC, | ||
384 | .power_on_delay = 0, | 365 | .power_on_delay = 0, |
385 | .power_off_delay = 0, | 366 | .power_off_delay = 0, |
386 | .name = "microtips_umsh_8173md", | 367 | .name = "microtips_umsh_8173md", |
@@ -433,9 +414,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
433 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, | 414 | .de_level = OMAPDSS_SIG_ACTIVE_LOW, |
434 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 415 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
435 | }, | 416 | }, |
436 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
437 | OMAP_DSS_LCD_IEO, | ||
438 | |||
439 | .name = "innolux_at080tn52", | 417 | .name = "innolux_at080tn52", |
440 | }, | 418 | }, |
441 | 419 | ||
@@ -508,8 +486,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
508 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 486 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
509 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 487 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
510 | }, | 488 | }, |
511 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
512 | OMAP_DSS_LCD_IPC, | ||
513 | .name = "primeview_pd050vl1", | 489 | .name = "primeview_pd050vl1", |
514 | }, | 490 | }, |
515 | 491 | ||
@@ -535,8 +511,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
535 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 511 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
536 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 512 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
537 | }, | 513 | }, |
538 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
539 | OMAP_DSS_LCD_IPC, | ||
540 | .name = "primeview_pm070wl4", | 514 | .name = "primeview_pm070wl4", |
541 | }, | 515 | }, |
542 | 516 | ||
@@ -562,8 +536,6 @@ static struct panel_config generic_dpi_panels[] = { | |||
562 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, | 536 | .de_level = OMAPDSS_SIG_ACTIVE_HIGH, |
563 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, | 537 | .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES, |
564 | }, | 538 | }, |
565 | .config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS | | ||
566 | OMAP_DSS_LCD_IPC, | ||
567 | .name = "primeview_pd104slf", | 539 | .name = "primeview_pd104slf", |
568 | }, | 540 | }, |
569 | }; | 541 | }; |
@@ -653,7 +625,6 @@ static int generic_dpi_panel_probe(struct omap_dss_device *dssdev) | |||
653 | if (!panel_config) | 625 | if (!panel_config) |
654 | return -EINVAL; | 626 | return -EINVAL; |
655 | 627 | ||
656 | dssdev->panel.config = panel_config->config; | ||
657 | dssdev->panel.timings = panel_config->timings; | 628 | dssdev->panel.timings = panel_config->timings; |
658 | 629 | ||
659 | drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); | 630 | drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL); |