Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbde10a authored by Samreen's avatar Samreen Committed by Tomi Valkeinen
Browse files

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



Splitting the OMAP3 dss has feature separately for
omap3430 & omap3630

Signed-off-by: default avatarSamreen <samreen@ti.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 712247a6

drivers/video/omap2/dss/dss_features.c

+17 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/omap2/dss/dss_features.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */