diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-03-11 07:57:38 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-03 08:19:02 -0400 |
| commit | f8ad984ce0372f43006f5c700310c2d6f301085d (patch) | |
| tree | dad448e6ee16b55676d621fdc200a42c714c6f50 /drivers/video | |
| parent | d9f4e46714b11503f53619e9896db0506c35351c (diff) | |
OMAPDSS: DPI: fix dpi_get_dsidev() for omap5
On OMAP5 the DISPC channels and DSI PLLs are not connected the same way.
LCD2 on OMAP5 cannot use any DSI PLL as a source clock, but LCD3 can use
DSI2's PLL.
This patch fixes dpi_get_dsidev() by adding separate case for OMAP5 to
handle the difference.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index ab6d8b0e94c7..c8c7776c8cfa 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c | |||
| @@ -63,15 +63,29 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel) | |||
| 63 | case OMAPDSS_VER_OMAP3630: | 63 | case OMAPDSS_VER_OMAP3630: |
| 64 | case OMAPDSS_VER_AM35xx: | 64 | case OMAPDSS_VER_AM35xx: |
| 65 | return NULL; | 65 | return NULL; |
| 66 | default: | ||
| 67 | break; | ||
| 68 | } | ||
| 69 | 66 | ||
| 70 | switch (channel) { | 67 | case OMAPDSS_VER_OMAP4430_ES1: |
| 71 | case OMAP_DSS_CHANNEL_LCD: | 68 | case OMAPDSS_VER_OMAP4430_ES2: |
| 72 | return dsi_get_dsidev_from_id(0); | 69 | case OMAPDSS_VER_OMAP4: |
| 73 | case OMAP_DSS_CHANNEL_LCD2: | 70 | switch (channel) { |
| 74 | return dsi_get_dsidev_from_id(1); | 71 | case OMAP_DSS_CHANNEL_LCD: |
| 72 | return dsi_get_dsidev_from_id(0); | ||
| 73 | case OMAP_DSS_CHANNEL_LCD2: | ||
| 74 | return dsi_get_dsidev_from_id(1); | ||
| 75 | default: | ||
| 76 | return NULL; | ||
| 77 | } | ||
| 78 | |||
| 79 | case OMAPDSS_VER_OMAP5: | ||
| 80 | switch (channel) { | ||
| 81 | case OMAP_DSS_CHANNEL_LCD: | ||
| 82 | return dsi_get_dsidev_from_id(0); | ||
| 83 | case OMAP_DSS_CHANNEL_LCD3: | ||
| 84 | return dsi_get_dsidev_from_id(1); | ||
| 85 | default: | ||
| 86 | return NULL; | ||
| 87 | } | ||
| 88 | |||
| 75 | default: | 89 | default: |
| 76 | return NULL; | 90 | return NULL; |
| 77 | } | 91 | } |