diff options
| author | Grazvydas Ignotas <notasas@gmail.com> | 2012-03-15 14:00:23 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-04-23 03:48:07 -0400 |
| commit | 4b6430fc98cfe051eab69f4696a608bba14ebd6c (patch) | |
| tree | 3af96f2ef29fba9c7942228f6b29971044edfa7a | |
| parent | f3fb3bbc7f71d573be40213af4a90751a81b2379 (diff) | |
OMAPDSS: provide default get_timings function for panels
With this we can eliminate some duplicate code in panel drivers.
Also lgphilips-lb035q02, nec-nl8048hl11-01b, picodlp and
tpo-td043mtea1 gain support of reading timings over sysfs.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | drivers/video/omap2/displays/panel-acx565akm.c | 7 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-generic-dpi.c | 7 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-n8x0.c | 8 | ||||
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 8 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/display.c | 7 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 7 | ||||
| -rw-r--r-- | include/video/omapdss.h | 2 |
8 files changed, 11 insertions, 37 deletions
diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c index d26f37ac69d8..c98f2c16f744 100644 --- a/drivers/video/omap2/displays/panel-acx565akm.c +++ b/drivers/video/omap2/displays/panel-acx565akm.c | |||
| @@ -738,12 +738,6 @@ static void acx_panel_set_timings(struct omap_dss_device *dssdev, | |||
| 738 | } | 738 | } |
| 739 | } | 739 | } |
| 740 | 740 | ||
| 741 | static void acx_panel_get_timings(struct omap_dss_device *dssdev, | ||
| 742 | struct omap_video_timings *timings) | ||
| 743 | { | ||
| 744 | *timings = dssdev->panel.timings; | ||
| 745 | } | ||
| 746 | |||
| 747 | static int acx_panel_check_timings(struct omap_dss_device *dssdev, | 741 | static int acx_panel_check_timings(struct omap_dss_device *dssdev, |
| 748 | struct omap_video_timings *timings) | 742 | struct omap_video_timings *timings) |
| 749 | { | 743 | { |
| @@ -761,7 +755,6 @@ static struct omap_dss_driver acx_panel_driver = { | |||
| 761 | .resume = acx_panel_resume, | 755 | .resume = acx_panel_resume, |
| 762 | 756 | ||
| 763 | .set_timings = acx_panel_set_timings, | 757 | .set_timings = acx_panel_set_timings, |
| 764 | .get_timings = acx_panel_get_timings, | ||
| 765 | .check_timings = acx_panel_check_timings, | 758 | .check_timings = acx_panel_check_timings, |
| 766 | 759 | ||
| 767 | .get_recommended_bpp = acx_get_recommended_bpp, | 760 | .get_recommended_bpp = acx_get_recommended_bpp, |
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c index 30fe4dfeb227..e2b21c511fcf 100644 --- a/drivers/video/omap2/displays/panel-generic-dpi.c +++ b/drivers/video/omap2/displays/panel-generic-dpi.c | |||
| @@ -549,12 +549,6 @@ static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev, | |||
| 549 | dpi_set_timings(dssdev, timings); | 549 | dpi_set_timings(dssdev, timings); |
| 550 | } | 550 | } |
| 551 | 551 | ||
| 552 | static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev, | ||
| 553 | struct omap_video_timings *timings) | ||
| 554 | { | ||
| 555 | *timings = dssdev->panel.timings; | ||
| 556 | } | ||
| 557 | |||
| 558 | static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev, | 552 | static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev, |
| 559 | struct omap_video_timings *timings) | 553 | struct omap_video_timings *timings) |
| 560 | { | 554 | { |
| @@ -571,7 +565,6 @@ static struct omap_dss_driver dpi_driver = { | |||
| 571 | .resume = generic_dpi_panel_resume, | 565 | .resume = generic_dpi_panel_resume, |
| 572 | 566 | ||
| 573 | .set_timings = generic_dpi_panel_set_timings, | 567 | .set_timings = generic_dpi_panel_set_timings, |
| 574 | .get_timings = generic_dpi_panel_get_timings, | ||
| 575 | .check_timings = generic_dpi_panel_check_timings, | 568 | .check_timings = generic_dpi_panel_check_timings, |
| 576 | 569 | ||
| 577 | .driver = { | 570 | .driver = { |
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c index dc9408dc93d1..4a34cdc1371b 100644 --- a/drivers/video/omap2/displays/panel-n8x0.c +++ b/drivers/video/omap2/displays/panel-n8x0.c | |||
| @@ -610,12 +610,6 @@ static int n8x0_panel_resume(struct omap_dss_device *dssdev) | |||
| 610 | return 0; | 610 | return 0; |
| 611 | } | 611 | } |
| 612 | 612 | ||
| 613 | static void n8x0_panel_get_timings(struct omap_dss_device *dssdev, | ||
| 614 | struct omap_video_timings *timings) | ||
| 615 | { | ||
| 616 | *timings = dssdev->panel.timings; | ||
| 617 | } | ||
| 618 | |||
| 619 | static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev, | 613 | static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev, |
| 620 | u16 *xres, u16 *yres) | 614 | u16 *xres, u16 *yres) |
| 621 | { | 615 | { |
| @@ -678,8 +672,6 @@ static struct omap_dss_driver n8x0_panel_driver = { | |||
| 678 | .get_resolution = n8x0_panel_get_resolution, | 672 | .get_resolution = n8x0_panel_get_resolution, |
| 679 | .get_recommended_bpp = omapdss_default_get_recommended_bpp, | 673 | .get_recommended_bpp = omapdss_default_get_recommended_bpp, |
| 680 | 674 | ||
| 681 | .get_timings = n8x0_panel_get_timings, | ||
| 682 | |||
| 683 | .driver = { | 675 | .driver = { |
| 684 | .name = "n8x0_panel", | 676 | .name = "n8x0_panel", |
| 685 | .owner = THIS_MODULE, | 677 | .owner = THIS_MODULE, |
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 72d63076ab19..3053399faf9a 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
| @@ -507,12 +507,6 @@ static const struct backlight_ops taal_bl_ops = { | |||
| 507 | .update_status = taal_bl_update_status, | 507 | .update_status = taal_bl_update_status, |
| 508 | }; | 508 | }; |
| 509 | 509 | ||
| 510 | static void taal_get_timings(struct omap_dss_device *dssdev, | ||
| 511 | struct omap_video_timings *timings) | ||
| 512 | { | ||
| 513 | *timings = dssdev->panel.timings; | ||
| 514 | } | ||
| 515 | |||
| 516 | static void taal_get_resolution(struct omap_dss_device *dssdev, | 510 | static void taal_get_resolution(struct omap_dss_device *dssdev, |
| 517 | u16 *xres, u16 *yres) | 511 | u16 *xres, u16 *yres) |
| 518 | { | 512 | { |
| @@ -1807,8 +1801,6 @@ static struct omap_dss_driver taal_driver = { | |||
| 1807 | .run_test = taal_run_test, | 1801 | .run_test = taal_run_test, |
| 1808 | .memory_read = taal_memory_read, | 1802 | .memory_read = taal_memory_read, |
| 1809 | 1803 | ||
| 1810 | .get_timings = taal_get_timings, | ||
| 1811 | |||
| 1812 | .driver = { | 1804 | .driver = { |
| 1813 | .name = "taal", | 1805 | .name = "taal", |
| 1814 | .owner = THIS_MODULE, | 1806 | .owner = THIS_MODULE, |
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 5ad8cc798235..64cb8aa49b26 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c | |||
| @@ -391,6 +391,8 @@ int omap_dss_register_driver(struct omap_dss_driver *dssdriver) | |||
| 391 | if (dssdriver->get_recommended_bpp == NULL) | 391 | if (dssdriver->get_recommended_bpp == NULL) |
| 392 | dssdriver->get_recommended_bpp = | 392 | dssdriver->get_recommended_bpp = |
| 393 | omapdss_default_get_recommended_bpp; | 393 | omapdss_default_get_recommended_bpp; |
| 394 | if (dssdriver->get_timings == NULL) | ||
| 395 | dssdriver->get_timings = omapdss_default_get_timings; | ||
| 394 | 396 | ||
| 395 | return driver_register(&dssdriver->driver); | 397 | return driver_register(&dssdriver->driver); |
| 396 | } | 398 | } |
diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c index 4424c198dbcd..e688d10f061a 100644 --- a/drivers/video/omap2/dss/display.c +++ b/drivers/video/omap2/dss/display.c | |||
| @@ -308,6 +308,13 @@ int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev) | |||
| 308 | } | 308 | } |
| 309 | EXPORT_SYMBOL(omapdss_default_get_recommended_bpp); | 309 | EXPORT_SYMBOL(omapdss_default_get_recommended_bpp); |
| 310 | 310 | ||
| 311 | void omapdss_default_get_timings(struct omap_dss_device *dssdev, | ||
| 312 | struct omap_video_timings *timings) | ||
| 313 | { | ||
| 314 | *timings = dssdev->panel.timings; | ||
| 315 | } | ||
| 316 | EXPORT_SYMBOL(omapdss_default_get_timings); | ||
| 317 | |||
| 311 | /* Checks if replication logic should be used. Only use for active matrix, | 318 | /* Checks if replication logic should be used. Only use for active matrix, |
| 312 | * when overlay is in RGB12U or RGB16 mode, and LCD interface is | 319 | * when overlay is in RGB12U or RGB16 mode, and LCD interface is |
| 313 | * 18bpp or 24bpp */ | 320 | * 18bpp or 24bpp */ |
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index abfbd4ac3e22..13a20da8ea91 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c | |||
| @@ -579,12 +579,6 @@ static int venc_panel_resume(struct omap_dss_device *dssdev) | |||
| 579 | return venc_panel_enable(dssdev); | 579 | return venc_panel_enable(dssdev); |
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | static void venc_get_timings(struct omap_dss_device *dssdev, | ||
| 583 | struct omap_video_timings *timings) | ||
| 584 | { | ||
| 585 | *timings = dssdev->panel.timings; | ||
| 586 | } | ||
| 587 | |||
| 588 | static void venc_set_timings(struct omap_dss_device *dssdev, | 582 | static void venc_set_timings(struct omap_dss_device *dssdev, |
| 589 | struct omap_video_timings *timings) | 583 | struct omap_video_timings *timings) |
| 590 | { | 584 | { |
| @@ -663,7 +657,6 @@ static struct omap_dss_driver venc_driver = { | |||
| 663 | .get_resolution = omapdss_default_get_resolution, | 657 | .get_resolution = omapdss_default_get_resolution, |
| 664 | .get_recommended_bpp = omapdss_default_get_recommended_bpp, | 658 | .get_recommended_bpp = omapdss_default_get_recommended_bpp, |
| 665 | 659 | ||
| 666 | .get_timings = venc_get_timings, | ||
| 667 | .set_timings = venc_set_timings, | 660 | .set_timings = venc_set_timings, |
