diff options
author | Archit Taneja <archit@ti.com> | 2010-12-02 06:27:08 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2011-01-10 04:09:54 -0500 |
commit | d50cd0373ad380fcc7f6fb4e020be4239174756d (patch) | |
tree | ae48f77efe230af0e92ef96030b3a5f6d7f6343c /drivers/video/omap2/dss/dss_features.h | |
parent | 8dad2ab6727f4dd9fdef06b890d736d7c6d1a725 (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>
Diffstat (limited to 'drivers/video/omap2/dss/dss_features.h')
-rw-r--r-- | drivers/video/omap2/dss/dss_features.h | 7 |
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 806db43bab17..b9c70be92588 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/drivers/video/omap2/dss/dss_features.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef __OMAP2_DSS_FEATURES_H | 20 | #ifndef __OMAP2_DSS_FEATURES_H |
21 | #define __OMAP2_DSS_FEATURES_H | 21 | #define __OMAP2_DSS_FEATURES_H |
22 | 22 | ||
23 | #define MAX_DSS_MANAGERS 2 | 23 | #define MAX_DSS_MANAGERS 3 |
24 | #define MAX_DSS_OVERLAYS 3 | 24 | #define MAX_DSS_OVERLAYS 3 |
25 | 25 | ||
26 | /* DSS has feature id */ | 26 | /* DSS has feature id */ |
@@ -28,6 +28,11 @@ enum dss_feat_id { | |||
28 | FEAT_GLOBAL_ALPHA = 1 << 0, | 28 | FEAT_GLOBAL_ALPHA = 1 << 0, |
29 | FEAT_GLOBAL_ALPHA_VID1 = 1 << 1, | 29 | FEAT_GLOBAL_ALPHA_VID1 = 1 << 1, |
30 | FEAT_PRE_MULT_ALPHA = 1 << 2, | 30 | FEAT_PRE_MULT_ALPHA = 1 << 2, |
31 | FEAT_LCDENABLEPOL = 1 << 3, | ||
32 | FEAT_LCDENABLESIGNAL = 1 << 4, | ||
33 | FEAT_PCKFREEENABLE = 1 << 5, | ||
34 | FEAT_FUNCGATED = 1 << 6, | ||
35 | FEAT_MGR_LCD2 = 1 << 7, | ||
31 | }; | 36 | }; |
32 | 37 | ||
33 | /* DSS register field id */ | 38 | /* DSS register field id */ |