From patchwork Mon Feb 5 17:42:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 10201029 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 4F097601A1 for ; Mon, 5 Feb 2018 17:42:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BB6F28700 for ; Mon, 5 Feb 2018 17:42:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FCB328714; Mon, 5 Feb 2018 17:42:39 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3359286AA for ; Mon, 5 Feb 2018 17:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753330AbeBERmh (ORCPT ); Mon, 5 Feb 2018 12:42:37 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:47567 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752738AbeBERmc (ORCPT ); Mon, 5 Feb 2018 12:42:32 -0500 Received: from epcas1p2.samsung.com (unknown [182.195.41.46]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20180205174231epoutp016fc94d25bf6edb914a43cdb25f33ce21~Qftpynap92427124271epoutp01E; Mon, 5 Feb 2018 17:42:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20180205174231epoutp016fc94d25bf6edb914a43cdb25f33ce21~Qftpynap92427124271epoutp01E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517852551; bh=oigSmYUzU3PUG2NFchkhd0yAKXltXo/VgI8TJghkMkM=; h=From:To:Cc:Subject:Date:References:From; b=OTTJGf9hH5klmffpGHc7e9ZeE4cnRxsrMjNr6EeYrgFPUOm6cbwzv8EQdiMjftUMl /AeKXW75CksmOB+yUpNvWWMKizTWTd79V9QCRzKF/hcIGVQX1InXdmWILoOpGt8y2n cD3OdPy/Lc0JHlxIvYN0bBLKCfpfkaIFXAjNfAKY= Received: from epsmges1p2.samsung.com (unknown [182.195.42.54]) by epcas1p3.samsung.com (KnoxPortal) with ESMTP id 20180205174230epcas1p36178eec44b4ec5d585dbc91af6275f39~QftpVFsYM0047900479epcas1p3U; Mon, 5 Feb 2018 17:42:30 +0000 (GMT) Received: from epcas1p1.samsung.com ( [182.195.41.45]) by epsmges1p2.samsung.com (Symantec Messaging Gateway) with SMTP id 4E.40.04136.687987A5; Tue, 6 Feb 2018 02:42:30 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20180205174229epcas1p1e15e6f8ef5248ee28fa2e649faa8a866~QftoYhxnr0917609176epcas1p1O; Mon, 5 Feb 2018 17:42:29 +0000 (GMT) X-AuditID: b6c32a36-c91ff70000001028-81-5a7897860957 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id DE.E3.03826.587987A5; Tue, 6 Feb 2018 02:42:29 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P3O00GKDUIJ0L40@mmp2.samsung.com>; Tue, 06 Feb 2018 02:42:29 +0900 (KST) From: Sylwester Nawrocki To: inki.dae@samsung.com Cc: jy0922.shim@samsung.com, sw0312.kim@samsung.com, linux-samsung-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH] drm: exynos: Use proper macro definition for HDMI_I2S_PIN_SEL_1 Date: Mon, 05 Feb 2018 18:42:12 +0100 Message-id: <20180205174212.10791-1-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRmVeSWpSXmKPExsWy7bCmrm7b9IoogwdT5Cw2zljPanHl63s2 i0n3J7BYvLh3kcVi0+NrrBYzzu9jslh75C67xeE37UDu5JdsDpwe97uPM3lsXlLv0bdlFaPH 501yASxRXDYpqTmZZalF+nYJXBntW/exFzTyVWxvOM3SwNjJ08XIySEhYCIx98Yv5i5GLg4h gR2MEm+efWCFcL4zSmztnsECU3Xr3C4WiMQGRomjD5qgWn4xSnw6vp0VpIpNwFCi92gfI4gt IiAhMfPVRSaQImaBFiaJB3OvMIMkhAWCJK41HwIbyyKgKjF/Yz9QMwcHr4C1xKIeMYht8hLv F9xnhLB/skrsuRcDYbtIrDzSwgxhC0u8Or6FHaRVQkBa4tJRW5BVEgL9jBIn1jQzQjgzGCXu tE9ggmiwljh8/CLYocwCfBLvvvawQjTzSnS0CUGUeEi0z7oFtddRYuXKq2DlQgKxEktPPmec wCi5gJFhFaNYakFxbnpqsWGBkV5xYm5xaV66XnJ+7iZGcBRqme1gXHTO5xCjAAejEg+vQEZF lBBrYllxZe4hRgkOZiURXqfr5VFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeQMCXKKEBNITS1Kz U1MLUotgskwcnFINjPwxOyxE/J++M9hidehGhvzjv9cuzA++toc7pyDjBs+bI93n1C82nRQJ X3Ha5Hzlm3Kuros54t9n+yS3M9ZtTo2+lOy8qfSNxiV+hWeN3295zO+qkDvuxb342vdi/zhe G7lLW/7ccFqUerUq9SK36NegE79zp3sukymezavKHBTx6OPvHf0N05RYijMSDbWYi4oTAUuq NBq+AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t9jQd3W6RVRBk/uK1hsnLGe1eLK1/ds FpPuT2CxeHHvIovFpsfXWC1mnN/HZLH2yF12i8Nv2oHcyS/ZHDg97ncfZ/LYvKTeo2/LKkaP z5vkAliiuGxSUnMyy1KL9O0SuDLat+5jL2jkq9jecJqlgbGTp4uRk0NCwETi1rldLF2MXBxC AusYJRr/L2KGcH4xSvQ92skIUsUmYCjRe7QPzBYRkJCY+eoiE0gRs0ALk0T7kzlsIAlhgQCJ w1dns4PYLAKqEvM39rN2MXJw8ApYSyzqEYPYJi/xfsF9xgmMXAsYGVYxSqYWFOem5xYbFRjm pZbrFSfmFpfmpesl5+duYgSGx7bDWn07GO8viT/EKMDBqMTDm5FVESXEmlhWXJl7iFGCg1lJ hNfpenmUEG9KYmVValF+fFFpTmrxIUZpDhYlcd7beccihQTSE0tSs1NTC1KLYLJMHJxSDYwz flpUHMjv9dzw5r7qqrc5LQIfHdq2tm3ZMG1aQ/taXa1XjJ28Kjwiz++cWuf6YmPg/M8pLKaP a0z4GQ98d+NUviNlePnNBP9amdsm2bWNb+zm+q6o9eHINZaJ3xs51fKQ0MxdawueTLs9g7d8 TfH2DNmHIfp3Z+512Zhxk3vzqrwPkkZdc18osRRnJBpqMRcVJwIAZn4iHwsCAAA= X-CMS-MailID: 20180205174229epcas1p1e15e6f8ef5248ee28fa2e649faa8a866 X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20180205174229epcas1p1e15e6f8ef5248ee28fa2e649faa8a866 X-RootMTR: 20180205174229epcas1p1e15e6f8ef5248ee28fa2e649faa8a866 References: Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bit field [2:0] of HDMI_I2S_PIN_SEL_1 corresponds to SDATA_0, not SDATA_2. This patch removes redefinition of HDMI_I2S_SEL_DATA2 constant and adds missing HDMI_I2S_SEL_DATA0. There is no functional change. Signed-off-by: Sylwester Nawrocki --- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 +++++-- drivers/gpu/drm/exynos/regs-hdmi.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index a4b75a46f946..abd84cbcf1c2 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1068,10 +1068,13 @@ static void hdmi_audio_config(struct hdmi_context *hdata) /* Configuration I2S input ports. Configure I2S_PIN_SEL_0~4 */ hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_0, HDMI_I2S_SEL_SCLK(5) | HDMI_I2S_SEL_LRCK(6)); - hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_1, HDMI_I2S_SEL_SDATA1(1) - | HDMI_I2S_SEL_SDATA2(4)); + + hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_1, HDMI_I2S_SEL_SDATA1(3) + | HDMI_I2S_SEL_SDATA0(4)); + hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_2, HDMI_I2S_SEL_SDATA3(1) | HDMI_I2S_SEL_SDATA2(2)); + hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_3, HDMI_I2S_SEL_DSD(0)); /* I2S_CON_1 & 2 */ diff --git a/drivers/gpu/drm/exynos/regs-hdmi.h b/drivers/gpu/drm/exynos/regs-hdmi.h index 04be0f7e8193..4420c203ac85 100644 --- a/drivers/gpu/drm/exynos/regs-hdmi.h +++ b/drivers/gpu/drm/exynos/regs-hdmi.h @@ -464,7 +464,7 @@ /* I2S_PIN_SEL_1 */ #define HDMI_I2S_SEL_SDATA1(x) (((x) & 0x7) << 4) -#define HDMI_I2S_SEL_SDATA2(x) ((x) & 0x7) +#define HDMI_I2S_SEL_SDATA0(x) ((x) & 0x7) /* I2S_PIN_SEL_2 */ #define HDMI_I2S_SEL_SDATA3(x) (((x) & 0x7) << 4)