From patchwork Tue Apr 19 09:22:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 717451 X-Patchwork-Delegate: tomi.valkeinen@nokia.com 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 p3J9Mbe3019830 for ; Tue, 19 Apr 2011 09:22:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754300Ab1DSJWv (ORCPT ); Tue, 19 Apr 2011 05:22:51 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:58488 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751422Ab1DSJWt (ORCPT ); Tue, 19 Apr 2011 05:22:49 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTa1UZwZUFn5zTsj2+CGqYFPbbz9/2Cr/@postini.com; Tue, 19 Apr 2011 02:22:49 PDT Received: by ewy24 with SMTP id 24so2414214ewy.18 for ; Tue, 19 Apr 2011 02:22:46 -0700 (PDT) Received: by 10.14.126.3 with SMTP id a3mr1866635eei.203.1303204966305; Tue, 19 Apr 2011 02:22:46 -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.44 (version=SSLv3 cipher=OTHER); Tue, 19 Apr 2011 02:22:45 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: Tomi Valkeinen Subject: [PATCH 07/19] OMAP: DSS2: DSI: fix _dsi_print_reset_status Date: Tue, 19 Apr 2011 12:22:10 +0300 Message-Id: <1303204942-25450-8-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-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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:55 +0000 (UTC) The bits for TXCLKESCx reset have changed for OMAP3630 and OMAP4. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/dsi.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 61d9f3c..a6b6ca6 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -960,6 +960,7 @@ static inline void dsi_enable_pll_clock(bool enable) static void _dsi_print_reset_status(void) { u32 l; + int b0, b1, b2; if (!dss_debug) return; @@ -977,9 +978,21 @@ static void _dsi_print_reset_status(void) l = dsi_read_reg(DSI_COMPLEXIO_CFG1); printk("CIO (%d) ", FLD_GET(l, 29, 29)); + if (dss_has_feature(FEAT_DSI_REVERSE_TXCLKESC)) { + b0 = 28; + b1 = 27; + b2 = 26; + } else { + b0 = 24; + b1 = 25; + b2 = 26; + } + l = dsi_read_reg(DSI_DSIPHY_CFG5); - printk("PHY (%x, %d, %d, %d)\n", - FLD_GET(l, 28, 26), + printk("PHY (%x%x%x, %d, %d, %d)\n", + FLD_GET(l, b0, b0), + FLD_GET(l, b1, b1), + FLD_GET(l, b2, b2), FLD_GET(l, 29, 29), FLD_GET(l, 30, 30), FLD_GET(l, 31, 31));