From 1f7ed4113239331723cdb6f16d4e48e151547130 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 14 Apr 2011 11:42:22 +0300 Subject: [PATCH] --- yaml --- r: 251033 b: refs/heads/master c: 95861368e3eb2180dc9f00e916a4ba6f5e1fe4ce h: refs/heads/master i: 251031: 130bc8baabe1322bad19591268ae9c607c2d481a v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dsi.c | 8 -------- trunk/drivers/video/omap2/dss/dss_features.c | 4 ++-- trunk/drivers/video/omap2/dss/dss_features.h | 5 ++--- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 205491ff7490..7ef9912cbf63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a0ee46b1ae05862cb05ec43caffc01c5259c4cc +refs/heads/master: 95861368e3eb2180dc9f00e916a4ba6f5e1fe4ce diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c index d05f8997e02b..4223164f6507 100644 --- a/trunk/drivers/video/omap2/dss/dsi.c +++ b/trunk/drivers/video/omap2/dss/dsi.c @@ -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(); /* diff --git a/trunk/drivers/video/omap2/dss/dss_features.c b/trunk/drivers/video/omap2/dss/dss_features.c index 5a81c652e604..7da798acee93 100644 --- a/trunk/drivers/video/omap2/dss/dss_features.c +++ b/trunk/drivers/video/omap2/dss/dss_features.c @@ -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, @@ -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, diff --git a/trunk/drivers/video/omap2/dss/dss_features.h b/trunk/drivers/video/omap2/dss/dss_features.h index d03f558d181b..1093e8daaa66 100644 --- a/trunk/drivers/video/omap2/dss/dss_features.h +++ b/trunk/drivers/video/omap2/dss/dss_features.h @@ -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 */