From patchwork Sun Mar 1 02:43:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yakir Yang X-Patchwork-Id: 5906741 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0D9769F37F for ; Sun, 1 Mar 2015 02:45:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31101202E6 for ; Sun, 1 Mar 2015 02:45:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47751202E5 for ; Sun, 1 Mar 2015 02:45:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRtsm-0006MA-Dd; Sun, 01 Mar 2015 02:45:28 +0000 Received: from regular1.263xmail.com ([211.150.99.134]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRtsj-0005g3-R8 for linux-rockchip@lists.infradead.org; Sun, 01 Mar 2015 02:45:26 +0000 Received: from ykk?rock-chips.com (unknown [192.168.167.105]) by regular1.263xmail.com (Postfix) with SMTP id 1BE6B6E4F; Sun, 1 Mar 2015 10:45:03 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id AAD571F05A; Sun, 1 Mar 2015 10:44:58 +0800 (CST) X-RL-SENDER: ykk@rock-chips.com X-FST-TO: djkurtz@chromium.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <923c8dbb38b01e25d8a4ee51d9402e53> X-ATTACHMENT-NUM: 0 X-SENDER: ykk@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 19074RN70KU; Sun, 01 Mar 2015 10:45:00 +0800 (CST) From: Yakir Yang To: djkurtz@chromium.org, dianders@chromium.org, linux-rockchip@lists.infradead.org Subject: [PATCH v4 07/15] drm: bridge/dw_hdmi: set ncts_atomic_write & cts_manual Date: Sat, 28 Feb 2015 21:43:04 -0500 Message-Id: <1425177784-2077-1-git-send-email-ykk@rock-chips.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> References: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150228_184526_278809_CF16587B X-CRM114-Status: UNSURE ( 7.82 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Fabio Estevam , mmind00@googlemail.com, marcheu@chromium.org, David Airlie , Greg Kroah-Hartman , Yakir Yang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Philipp Zabel , Andy Yan , Russell King , mark.yao@rock-chips.com X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Kurtz The ncts_atomic_write & cts_manual bits are present when design id equal to 0x20. After setting ncts_atomic_write, new N and CTS values are only used when aud_n1 register is updated. After setting cts_manual, new CTS value can set by AUD_CTS registers. Signed-off-by: Yakir Yang --- Changes in v4: - Combine N3 registers setting Changes in v3: - Set ncts_atomic_write & cts_manual Changes in v2: None drivers/gpu/drm/bridge/dw_hdmi.c | 10 +++++++++- drivers/gpu/drm/bridge/dw_hdmi.h | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c index 12d8b7e..001e5ab 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.c +++ b/drivers/gpu/drm/bridge/dw_hdmi.c @@ -199,8 +199,15 @@ static void hdmi_mask_writeb(struct dw_hdmi *hdmi, u8 data, unsigned int reg, static void hdmi_set_clock_regenerator(struct dw_hdmi *hdmi, unsigned int n, unsigned int cts) { + u8 n3 = 0; u8 cts3 = 0; + /* First set NCTS_ATOMIC_WRITE (if present) */ + if (hdmi->id.design == 0x20) { + n3 = HDMI_AUD_N3_NCTS_ATOMIC_WRITE; + hdmi_writeb(hdmi, n3, HDMI_AUD_N3); + } + /* set CTS_MANUAL (if present) */ if (hdmi->id.design == 0x20) cts3 = HDMI_AUD_CTS3_CTS_MANUAL; @@ -214,7 +221,8 @@ static void hdmi_set_clock_regenerator(struct dw_hdmi *hdmi, hdmi_writeb(hdmi, cts & 0xff, HDMI_AUD_CTS1); /* write N values; N1 must be written last */ - hdmi_writeb(hdmi, (n >> 16) & 0xf, HDMI_AUD_N3); + n3 |= (n >> 16) & HDMI_AUD_N3_AUDN19_16_MASK; + hdmi_writeb(hdmi, n3, HDMI_AUD_N3); hdmi_writeb(hdmi, (n >> 8) & 0xff, HDMI_AUD_N2); hdmi_writeb(hdmi, n & 0xff, HDMI_AUD_N1); } diff --git a/drivers/gpu/drm/bridge/dw_hdmi.h b/drivers/gpu/drm/bridge/dw_hdmi.h index c7ac538..8e5ad50 100644 --- a/drivers/gpu/drm/bridge/dw_hdmi.h +++ b/drivers/gpu/drm/bridge/dw_hdmi.h @@ -907,6 +907,10 @@ enum { HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL = 0x08, HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_MASK = 0x04, +/* AUD_N3 field values */ + HDMI_AUD_N3_NCTS_ATOMIC_WRITE = 0x80, + HDMI_AUD_N3_AUDN19_16_MASK = 0x0f, + /* AUD_CTS3 field values */ HDMI_AUD_CTS3_N_SHIFT_OFFSET = 5, HDMI_AUD_CTS3_N_SHIFT_MASK = 0xe0,