Skip to content

Commit

Permalink
OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4
Browse files Browse the repository at this point in the history
DISPC_CONFIG bits LCDENABLEPOL, LCDENABLESIGNAL, PCKFREEENABLE and FUNCGATED
have been removed from OMAP4, use dss_features to handle them correctly.

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
  • Loading branch information
Archit Taneja authored and Tomi Valkeinen committed Jan 10, 2011
1 parent 2a205f3 commit 6ced40b
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion drivers/video/omap2/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1922,20 +1922,29 @@ void dispc_enable_channel(enum omap_channel channel, bool enable)

void dispc_lcd_enable_signal_polarity(bool act_high)
{
if (!dss_has_feature(FEAT_LCDENABLEPOL))
return;

enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, act_high ? 1 : 0, 29, 29);
enable_clocks(0);
}

void dispc_lcd_enable_signal(bool enable)
{
if (!dss_has_feature(FEAT_LCDENABLESIGNAL))
return;

enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 28, 28);
enable_clocks(0);
}

void dispc_pck_free_enable(bool enable)
{
if (!dss_has_feature(FEAT_PCKFREEENABLE))
return;

enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27);
enable_clocks(0);
Expand Down Expand Up @@ -3246,7 +3255,8 @@ static void _omap_dispc_initial_config(void)
dispc_write_reg(DISPC_SYSCONFIG, l);

/* FUNCGATED */
REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);
if (dss_has_feature(FEAT_FUNCGATED))
REG_FLD_MOD(DISPC_CONFIG, 1, 9, 9);

/* L3 firewall setting: enable access to OCM RAM */
/* XXX this should be somewhere in plat-omap */
Expand Down

0 comments on commit 6ced40b

Please sign in to comment.