leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4

Browse Source 
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>
This commit is contained in:
Archit Taneja 2010-12-02 11:27:13 +00:00 committed by Tomi Valkeinen
parent 2a205f34b8
commit 6ced40bfc0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/omap2/dss/dispc.c
View File

@ -1922,6 +1922,9 @@ void dispc_enable_channel(enum omap_channel channel, bool enable)
void dispc_lcd_enable_signal_polarity(bool act_high) void dispc_lcd_enable_signal_polarity(bool act_high)
{ {
if (!dss_has_feature(FEAT_LCDENABLEPOL))
return;
enable_clocks(1); enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, act_high ? 1 : 0, 29, 29); REG_FLD_MOD(DISPC_CONTROL, act_high ? 1 : 0, 29, 29);
enable_clocks(0); enable_clocks(0);
@ -1929,6 +1932,9 @@ void dispc_lcd_enable_signal_polarity(bool act_high)
void dispc_lcd_enable_signal(bool enable) void dispc_lcd_enable_signal(bool enable)
{ {
if (!dss_has_feature(FEAT_LCDENABLESIGNAL))
return;
enable_clocks(1); enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 28, 28); REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 28, 28);
enable_clocks(0); enable_clocks(0);
@ -1936,6 +1942,9 @@ void dispc_lcd_enable_signal(bool enable)
void dispc_pck_free_enable(bool enable) void dispc_pck_free_enable(bool enable)
{ {
if (!dss_has_feature(FEAT_PCKFREEENABLE))
return;
enable_clocks(1); enable_clocks(1);
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27); REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 27, 27);
enable_clocks(0); enable_clocks(0);
@ -3246,7 +3255,8 @@ static void _omap_dispc_initial_config(void)
dispc_write_reg(DISPC_SYSCONFIG, l); dispc_write_reg(DISPC_SYSCONFIG, l);
/* FUNCGATED */ /* 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 */ /* L3 firewall setting: enable access to OCM RAM */
/* XXX this should be somewhere in plat-omap */ /* XXX this should be somewhere in plat-omap */