aboutsummaryrefslogtreecommitdiff
path: root/drivers/video/omap2/dss/dss_features.h
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2010-12-02 11:27:08 +0000
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-01-19 16:20:30 -0500
commitc3926c5d04a4cd20c9592801b3081507ac773e52 (patch)
tree2f7c04bb31cc0cb17f43fffa35444ec9ad4edd2a /drivers/video/omap2/dss/dss_features.h
parentcc6815711e5a545ade45e04d288027f45cedb18c (diff)
OMAP: DSS2: Add dss_features for omap4 and overlay manager related features
Initialize a dss_features struct for omap4. Add support for LCD2 manager by introducing a new member in dss_feat_id. Signed-off-by: Archit Taneja <archit@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> (cherry picked from commit d50cd0373ad380fcc7f6fb4e020be4239174756d)
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.h')
-rw-r--r--drivers/video/omap2/dss/dss_features.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index 806db43bab1..b9c70be9258 100644
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -20,7 +20,7 @@
#ifndef __OMAP2_DSS_FEATURES_H
#define __OMAP2_DSS_FEATURES_H
-#define MAX_DSS_MANAGERS 2
+#define MAX_DSS_MANAGERS 3
#define MAX_DSS_OVERLAYS 3
/* DSS has feature id */
@@ -28,6 +28,11 @@ enum dss_feat_id {
FEAT_GLOBAL_ALPHA = 1 << 0,
FEAT_GLOBAL_ALPHA_VID1 = 1 << 1,
FEAT_PRE_MULT_ALPHA = 1 << 2,
+ FEAT_LCDENABLEPOL = 1 << 3,
+ FEAT_LCDENABLESIGNAL = 1 << 4,
+ FEAT_PCKFREEENABLE = 1 << 5,
+ FEAT_FUNCGATED = 1 << 6,
+ FEAT_MGR_LCD2 = 1 << 7,
};
/* DSS register field id */