From patchwork Tue Apr 19 09:22:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 717331 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3J9Mbdp019830 for ; Tue, 19 Apr 2011 09:22:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753518Ab1DSJWj (ORCPT ); Tue, 19 Apr 2011 05:22:39 -0400 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:43106 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422Ab1DSJWi (ORCPT ); Tue, 19 Apr 2011 05:22:38 -0400 Received: from mail-ey0-f171.google.com ([209.85.215.171]) (using TLSv1) by na3sys009aob101.postini.com ([74.125.148.12]) with SMTP ID DSNKTa1UXAKeOISon1Ib2BBov3JyYDMvmjEo@postini.com; Tue, 19 Apr 2011 02:22:37 PDT Received: by mail-ey0-f171.google.com with SMTP id d26so2232842eyd.16 for ; Tue, 19 Apr 2011 02:22:36 -0700 (PDT) Received: by 10.213.16.131 with SMTP id o3mr4216138eba.143.1303204956439; Tue, 19 Apr 2011 02:22:36 -0700 (PDT) Received: from deskari (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id m55sm4672311eei.8.2011.04.19.02.22.34 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 02:22:35 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 02/19] OMAP: DSS2: DSI: Remove CIO LDO status check Date: Tue, 19 Apr 2011 12:22:05 +0300 Message-Id: <1303204942-25450-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> References: <1303204942-25450-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 19 Apr 2011 09:22:43 +0000 (UTC) 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 --- drivers/video/omap2/dss/dsi.c | 8 -------- drivers/video/omap2/dss/dss_features.c | 4 ++-- drivers/video/omap2/dss/dss_features.h | 5 ++--- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index d245c5c..013621e 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/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/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c index 6a1b130..5f3a7c4 100644 --- a/drivers/video/omap2/dss/dss_features.c +++ b/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/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h index d03f558..1093e8d 100644 --- a/drivers/video/omap2/dss/dss_features.h +++ b/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 */