Skip to content

Commit

Permalink
OMAP: DSS2: DSI: Remove CIO LDO status check
Browse files Browse the repository at this point in the history
CIO LDO status check seems to be broken on OMAP3630+ chips, and it's
also quite unclear what LDO status actually tells and when its status
changes.

This patch removes the whole check on the grounds that if there's a
problem with the LDO, we should anyway catch the problem as we check the
CIO power state and CIO reset status.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed May 11, 2011
1 parent 0a0ee46 commit 9586136
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
8 changes: 0 additions & 8 deletions drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1952,14 +1952,6 @@ static int dsi_complexio_init(struct omap_dss_device *dssdev)
goto err;
}

if (dss_has_feature(FEAT_DSI_LDO_STATUS)) {
if (wait_for_bit_change(DSI_COMPLEXIO_CFG1, 21, 1) != 1) {
DSSERR("ComplexIO LDO power down.\n");
r = -ENODEV;
goto err;
}
}

dsi_complexio_timings();

/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/omap2/dss/dss_features.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ static struct omap_dss_features omap3430_dss_features = {
FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |
FEAT_FUNCGATED | FEAT_ROWREPEATENABLE |
FEAT_LINEBUFFERSPLIT | FEAT_RESIZECONF |
FEAT_DSI_PLL_FREQSEL | FEAT_DSI_LDO_STATUS,
FEAT_DSI_PLL_FREQSEL,

.num_mgrs = 2,
.num_ovls = 3,
Expand All @@ -273,7 +273,7 @@ static struct omap_dss_features omap3630_dss_features = {
FEAT_PRE_MULT_ALPHA | FEAT_FUNCGATED |
FEAT_ROWREPEATENABLE | FEAT_LINEBUFFERSPLIT |
FEAT_RESIZECONF | FEAT_DSI_PLL_PWR_BUG |
FEAT_DSI_PLL_FREQSEL |FEAT_DSI_LDO_STATUS,
FEAT_DSI_PLL_FREQSEL,

.num_mgrs = 2,
.num_ovls = 3,
Expand Down
5 changes: 2 additions & 3 deletions drivers/video/omap2/dss/dss_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@ enum dss_feat_id {
/* DSI-PLL power command 0x3 is not working */
FEAT_DSI_PLL_PWR_BUG = 1 << 13,
FEAT_DSI_PLL_FREQSEL = 1 << 14,
FEAT_DSI_LDO_STATUS = 1 << 15,
FEAT_DSI_DCS_CMD_CONFIG_VC = 1 << 16,
FEAT_DSI_VC_OCP_WIDTH = 1 << 17,
FEAT_DSI_DCS_CMD_CONFIG_VC = 1 << 15,
FEAT_DSI_VC_OCP_WIDTH = 1 << 16,
};

/* DSS register field id */
Expand Down

0 comments on commit 9586136

Please sign in to comment.