OMAP3: DSS2: Split OMAP3 has feature for 3430 & 3630

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>

diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c
index 867f68de125f6ed6221f7a276c46f3a23936f6b5..854deba4e0d8dc8ddb010714c40cd8279fd01b28 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.c
+++ b/drivers/video/omap2/dss/dss_features.c
@@ -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),
 
@@ -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)
 {
@@ -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;
 }

diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h
index cb231eaa9b31c890361974e799378285b6f0edaa..aeb2eea454fc9fbfeba4529dd605dfa351b8219e 100644 (file)
--- a/drivers/video/omap2/dss/dss_features.h
+++ b/drivers/video/omap2/dss/dss_features.h
@@ -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 */