summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2013-02-13 11:23:54 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-04-03 15:19:01 +0300
commit2eea5ae6c102a5088e39733115ff7762a4674887 (patch)
tree8005a039e38f11e9a8d0e609585752e8264cf679 /include/video
parent7286a08fb5607dbcf1a47639609d53d76b60e957 (diff)
downloadlinux-2eea5ae6c102a5088e39733115ff7762a4674887.tar.gz
linux-2eea5ae6c102a5088e39733115ff7762a4674887.tar.xz
OMAPDSS: add output->dispc_channel
The DISPC channel used for each output is currently passed in panel platform data from the board files. To simplify this, and to make the panel drivers less dependent on OMAP, this patch changes omapdss to resolve the channel independently. The channel is resolved based on the OMAP version and, in case of DSI, the DSI module id. This resolved channel is stored into a new field in output, dispc_channel. The few places where dssdev->channel was used are changed to use output->recommended_channel. After this patch, dssdev->channel is obsolete. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'include/video')
-rw-r--r--include/video/omapdss.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index fa800b7ef832..41fb434093e9 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -546,6 +546,9 @@ struct omap_dss_output {
/* display type supported by the output */
enum omap_display_type type;
+ /* DISPC channel for this output */
+ enum omap_channel dispc_channel;
+
/* output instance */
enum omap_dss_output_id id;
@@ -563,6 +566,7 @@ struct omap_dss_device {
enum omap_display_type type;
+ /* obsolete, to be removed */
enum omap_channel channel;
union {