Skip to content

Commit

Permalink
OMAP3: DSS2: Split OMAP3 has feature for 3430 & 3630
Browse files Browse the repository at this point in the history
Splitting the OMAP3 dss has feature separately for
omap3430 & omap3630

Signed-off-by: Samreen <samreen@ti.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Samreen authored and Tomi Valkeinen committed Jan 10, 2011
1 parent 712247a commit 8fbde10
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
20 changes: 17 additions & 3 deletions drivers/video/omap2/dss/dss_features.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static struct omap_dss_features omap2_dss_features = {
};

/* OMAP3 DSS Features */
static struct omap_dss_features omap3_dss_features = {
static struct omap_dss_features omap3430_dss_features = {
.reg_fields = omap3_dss_reg_fields,
.num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),

Expand All @@ -146,6 +146,18 @@ static struct omap_dss_features omap3_dss_features = {
.supported_color_modes = omap3_dss_supported_color_modes,
};

static struct omap_dss_features omap3630_dss_features = {
.reg_fields = omap3_dss_reg_fields,
.num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),

.has_feature = FEAT_GLOBAL_ALPHA | FEAT_PRE_MULT_ALPHA,

.num_mgrs = 2,
.num_ovls = 3,
.supported_displays = omap3_dss_supported_displays,
.supported_color_modes = omap3_dss_supported_color_modes,
};

/* Functions returning values related to a DSS feature */
int dss_feat_get_num_mgrs(void)
{
Expand Down Expand Up @@ -186,6 +198,8 @@ void dss_features_init(void)
{
if (cpu_is_omap24xx())
omap_current_dss_features = &omap2_dss_features;
else
omap_current_dss_features = &omap3_dss_features;
else if (cpu_is_omap3630())
omap_current_dss_features = &omap3630_dss_features;
else if (cpu_is_omap34xx())
omap_current_dss_features = &omap3430_dss_features;
}
1 change: 1 addition & 0 deletions drivers/video/omap2/dss/dss_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
enum dss_feat_id {
FEAT_GLOBAL_ALPHA = 1 << 0,
FEAT_GLOBAL_ALPHA_VID1 = 1 << 1,
FEAT_PRE_MULT_ALPHA = 1 << 2,
};

/* DSS register field id */
Expand Down

0 comments on commit 8fbde10

Please sign in to comment.