From patchwork Tue May 22 08:53:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huang lin X-Patchwork-Id: 10417647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3A6FB60545 for ; Tue, 22 May 2018 08:54:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276E928B72 for ; Tue, 22 May 2018 08:54:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A3B728B79; Tue, 22 May 2018 08:54:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C6DD28B72 for ; Tue, 22 May 2018 08:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=RlvvIILrtt6Vl09X7DvOK7AxspcOiGlvWKJKV/UwDmU=; b=df+ fs4wxnWNJuVRFYiChdcxQA/+jAm4uRtzkNMbXlx4D7ER9rpt0XKyvfcDwtGAM/Y+W3LwSf84SrmbW s/whI4PRnnKIBu6jLoAo96+1Pn7tvdvivIaUtcWCmKxRG8mTONVi9GOLSRp4DsifthJEqlzBfQL9m qNKWWpeKBEKdtK1heDsanDcmf6UV0ZmFhTA5grd9CFqYMSLh/pwJJyImRm2aRz3vMHttP+WBhHbl/ 7SK0w0yVw5iODYrVD7Td3wg7KVuI6yCtWR38t6DhtRXYAjTZZ6tJbezXTVfEW2+dQYTyguDknrJBT PkeDtU3iM3glsQ3fTVYniZXqEB+tHaw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fL34F-0007Ay-NZ; Tue, 22 May 2018 08:54:51 +0000 Received: from mail-pg0-f65.google.com ([74.125.83.65]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fL33S-0006cf-5o; Tue, 22 May 2018 08:54:21 +0000 Received: by mail-pg0-f65.google.com with SMTP id l2-v6so7568384pgc.7; Tue, 22 May 2018 01:53:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6BegF3+jtAPCcYWXTKpt9kusqj8991dGG8q0ftKd8jg=; b=Ylk8wbn7OO/ybH7XsYCQT2CfaGOjvoAqT4iJ3pyKHybRrvVUMnJ3I8zi2kF2vFBrxd kEBl5qmzz8xbqaMR2GgR5WDLBxXZU8DCR/NkKHzGMh/Hsm+KXnXEOjAtO6Qn5o6+5LIZ HmErF8VC1+19IYtyEjByODyphv2InXLKRCTKoSNhvj58op2Uhafck8diY+gD80cROS3G uhE4pK5sTMxWrDVVg4GsN5p3No5hxYYwnB0s1Ex8ycFVsP9JYhx/olD6KH/0VKSbXbwN 6YLqI99aS9mtoXM3BlXG3F4ZTVvaGfYvAAS5d9gaXFATU4sw/uz36Y5MZM/pfdkJxXwg yoNQ== X-Gm-Message-State: ALKqPwflhkBsHca0bFfqcQFoj3I2YT9DZ60/1F8qnSDbxBXt6cHh5tEq pHCC4KDkFn1Z4pJ8c1idTOjbxw== X-Google-Smtp-Source: AB8JxZojE1lJ13c925eZTTSdcq0GHEVgq3SpFJEAiwzAAAuQ6d5009xW6wFiLsCvg+r0ifCD+V/3bw== X-Received: by 2002:a62:a21e:: with SMTP id m30-v6mr23525656pff.251.1526979231289; Tue, 22 May 2018 01:53:51 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q19-v6sm12054105pgv.78.2018.05.22.01.53.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 01:53:50 -0700 (PDT) From: Lin Huang To: seanpaul@chromium.org, airlied@linux.ie, zyw@rock-chips.com, dgreid@chromium.org, broonie@kernel.org Subject: [PATCH 1/2] drm/rockchip: cnd-dp: adjust spdif register setting Date: Tue, 22 May 2018 16:53:41 +0800 Message-Id: <1526979222-32478-1-git-send-email-hl@rock-chips.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180522_015402_223978_D074705C X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jeffy.chen@rock-chips.com, heiko@sntech.de, briannorris@chromium.org, dianders@chromium.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, daniel.vetter@intel.com, linux-arm-kernel@lists.infradead.org, Lin Huang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We use jitter bypass mode for spdif, so do not need to set jitter mode related bit in SPDIF_CTRL_ADDR register. Also, we need to enable SPDIF_ENABLE bit. Signed-off-by: Chris Zhong Signed-off-by: Lin Huang --- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-reg.c b/drivers/gpu/drm/rockchip/cdn-dp-reg.c index eb3042c..3105965 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-reg.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-reg.c @@ -792,7 +792,6 @@ int cdn_dp_config_video(struct cdn_dp_device *dp) int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio) { - u32 val; int ret; ret = cdn_dp_reg_write(dp, AUDIO_PACK_CONTROL, 0); @@ -801,11 +800,7 @@ int cdn_dp_audio_stop(struct cdn_dp_device *dp, struct audio_info *audio) return ret; } - val = SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS; - val |= SPDIF_FIFO_MID_RANGE(0xe0); - val |= SPDIF_JITTER_THRSH(0xe0); - val |= SPDIF_JITTER_AVG_WIN(7); - writel(val, dp->regs + SPDIF_CTRL_ADDR); + writel(0, dp->regs + SPDIF_CTRL_ADDR); /* clearn the audio config and reset */ writel(0, dp->regs + AUDIO_SRC_CNTL); @@ -929,12 +924,6 @@ static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp) { u32 val; - val = SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS; - val |= SPDIF_FIFO_MID_RANGE(0xe0); - val |= SPDIF_JITTER_THRSH(0xe0); - val |= SPDIF_JITTER_AVG_WIN(7); - writel(val, dp->regs + SPDIF_CTRL_ADDR); - writel(SYNC_WR_TO_CH_ZERO, dp->regs + FIFO_CNTL); val = MAX_NUM_CH(2) | AUDIO_TYPE_LPCM | CFG_SUB_PCKT_NUM(4); @@ -942,9 +931,6 @@ static void cdn_dp_audio_config_spdif(struct cdn_dp_device *dp) writel(SMPL2PKT_EN, dp->regs + SMPL2PKT_CNTL); val = SPDIF_ENABLE | SPDIF_AVG_SEL | SPDIF_JITTER_BYPASS; - val |= SPDIF_FIFO_MID_RANGE(0xe0); - val |= SPDIF_JITTER_THRSH(0xe0); - val |= SPDIF_JITTER_AVG_WIN(7); writel(val, dp->regs + SPDIF_CTRL_ADDR); clk_prepare_enable(dp->spdif_clk);