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

Commit d6279d4a authored by Sathya Prakash M R's avatar Sathya Prakash M R Committed by Tomi Valkeinen
Browse files

OMAPDSS: Add DSS features for AM43xx 



Add DSS features for AM43xx.

Signed-off-by: default avatarSathya Prakash M R <sathyap@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 80823ca1

arch/arm/mach-omap2/display.c

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ static enum omapdss_version __init omap_display_get_version(void) 
		return OMAPDSS_VER_OMAP4;

	else if (soc_is_omap54xx())

		return OMAPDSS_VER_OMAP5;

	else if (soc_is_am43xx())

		return OMAPDSS_VER_AM43xx;

	else

		return OMAPDSS_VER_UNKNOWN;

}

drivers/video/fbdev/omap2/dss/dispc.c

+1 −0
Original line number Diff line number Diff line
@@ -3656,6 +3656,7 @@ static int __init dispc_init_features(struct platform_device *pdev) 
	case OMAPDSS_VER_OMAP34xx_ES3:

	case OMAPDSS_VER_OMAP3630:

	case OMAPDSS_VER_AM35xx:

	case OMAPDSS_VER_AM43xx:

		src = &omap34xx_rev3_0_dispc_feats;

		break;

drivers/video/fbdev/omap2/dss/dpi.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel) 
	case OMAPDSS_VER_OMAP34xx_ES3:

	case OMAPDSS_VER_OMAP3630:

	case OMAPDSS_VER_AM35xx:

	case OMAPDSS_VER_AM43xx:

		return NULL;



	case OMAPDSS_VER_OMAP4430_ES1:
@@ -595,6 +596,7 @@ static enum omap_channel dpi_get_channel(void) 
	case OMAPDSS_VER_OMAP34xx_ES3:

	case OMAPDSS_VER_OMAP3630:

	case OMAPDSS_VER_AM35xx:

	case OMAPDSS_VER_AM43xx:

		return OMAP_DSS_CHANNEL_LCD;



	case OMAPDSS_VER_OMAP4430_ES1:

drivers/video/fbdev/omap2/dss/dsi.c

+1 −0
Original line number Diff line number Diff line
@@ -5132,6 +5132,7 @@ static enum omap_channel dsi_get_channel(int module_id) 
{

	switch (omapdss_get_version()) {

	case OMAPDSS_VER_OMAP24xx:

	case OMAPDSS_VER_AM43xx:

		DSSWARN("DSI not supported\n");

		return OMAP_DSS_CHANNEL_LCD;

drivers/video/fbdev/omap2/dss/dss.c

+11 −0
Original line number Diff line number Diff line
@@ -728,6 +728,13 @@ static const struct dss_features omap54xx_dss_feats __initconst = { 
	.dpi_select_source	=	&dss_dpi_select_source_omap5,

};



static const struct dss_features am43xx_dss_feats __initconst = {

	.fck_div_max		=	0,

	.dss_fck_multiplier	=	0,

	.parent_clk_name	=	NULL,

	.dpi_select_source	=	&dss_dpi_select_source_omap2_omap3,

};



static int __init dss_init_features(struct platform_device *pdev)

{

	const struct dss_features *src;
@@ -764,6 +771,10 @@ static int __init dss_init_features(struct platform_device *pdev) 
		src = &omap54xx_dss_feats;

		break;



	case OMAPDSS_VER_AM43xx:

		src = &am43xx_dss_feats;

		break;



	default:

		return -ENODEV;

	}