From patchwork Thu Nov 20 10:03:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Padmavathi Venna X-Patchwork-Id: 5347141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 88596C11AC for ; Thu, 20 Nov 2014 10:14:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AFD3C201F5 for ; Thu, 20 Nov 2014 10:14:03 +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 AD528201EF for ; Thu, 20 Nov 2014 10:14:02 +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 1XrOgx-0005ki-D2; Thu, 20 Nov 2014 10:10:23 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrOgt-0004Gi-Kf for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2014 10:10:20 +0000 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFC00L961KHU310@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2014 19:09:53 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 41.BC.18484.1FDBD645; Thu, 20 Nov 2014 19:09:53 +0900 (KST) X-AuditID: cbfee68f-f791c6d000004834-dd-546dbdf1cf82 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 80.85.20081.1FDBD645; Thu, 20 Nov 2014 19:09:53 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NFC00DLG1JK1HE0@mmp2.samsung.com>; Thu, 20 Nov 2014 19:09:52 +0900 (KST) From: Padmavathi Venna To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH] ASoC: samsung: ASoC: samsung: Fix IISMOD setting in i2s_set_sysclk() Date: Thu, 20 Nov 2014 15:33:17 +0530 Message-id: <1416477797-27332-1-git-send-email-padma.v@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRsSkWvfj3twQg61LZC2uXDzEZDH14RM2 i94FV9ksNj2+xmox4/w+JovDb9pZLS6u+MLkwO6x4XMTm8emVZ1sHpuX1Hv0bVnF6PF5k1wA axSXTUpqTmZZapG+XQJXxqsFJ5kK3nNVPD5yi62B8SlHFyMHh4SAicTbLtkuRk4gU0ziwr31 bF2MXBxCAksZJf7Nms8OkTCRWPPgEAtEYjqjxJ+JHVDOBCaJbXM6GEEmsQnoSLScdQFpEBHI ktg8fT0LiM0sUChxb+kqMFtYIFxi2vVrjCA2i4CqxNO/78EW8Ao4S+y6/Z4F4iAFiTmTbCD2 /meTuLCcA6JcQOLb5ENQJbISmw4wQ5RIShxccYNlAqPgAkaGVYyiqQXJBcVJ6UXGesWJucWl eel6yfm5mxiB4Xr637P+HYx3D1gfYhTgYFTi4eUwyw0RYk0sK67MPcRoCrRhIrOUaHI+MCry SuINjc2MLExNTI2NzC3NlMR5F0r9DBYSSE8sSc1OTS1ILYovKs1JLT7EyMTBKdXAqP9scpLx PqOTsTynGfvDvh/iMN3mnRTJYcdteWBhcqAVV4KE8teT4g+nHthi8WWOS2fDSp2lVeFFeSs7 3Q7I31P713c2M6g8+Mrqt3aT2zIiXkrNOWZ+bN23t8825HW+479wcNcnmeKDU+adt+C5Uizb U2i38Lrudn/hH5PqdmV75B2pEG2uV2Ipzkg01GIuKk4EAK/meOdSAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xoO7HvbkhBqsOiFhcuXiIyWLqwyds Fr0LrrJZbHp8jdVixvl9TBaH37SzWlxc8YXJgd1jw+cmNo9NqzrZPDYvqffo27KK0ePzJrkA 1qgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoDOU FMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYQ1jBmvFpxkKnjPVfH4yC22Bsan HF2MnBwSAiYSax4cYoGwxSQu3FvP1sXIxSEkMJ1R4s/EDhYIZwKTxLY5HYxdjBwcbAI6Ei1n XUAaRASyJDZPXw/WzCxQKHFv6SowW1ggXGLa9WuMIDaLgKrE07/v2UFsXgFniV2337OAjJEQ UJCYM8lmAiP3AkaGVYyiqQXJBcVJ6bmGesWJucWleel6yfm5mxjBEfFMagfjygaLQ4wCHIxK PLwJFrkhQqyJZcWVuYcYJTiYlUR4NXYChXhTEiurUovy44tKc1KLDzGaAi2fyCwlmpwPjNa8 knhDYxNzU2NTSxMLEzNLJXHe66uAmgTSE0tSs1NTC1KLYPqYODilGhgly0XjglQPFtjWMdQ9 v7gh79j/gGiTU96M7vcMItp8a/kipyZZN8WZ+IRvEfTm+NOS+FGjQPnCqj2VTxcWHn4b+lZ4 qfCv4vs9NSEHwzO7jrQacab8fpOgPHvxT4ciqU9yT0Q9z/uu/H7OuWY986+/72x3dlc8/eL8 02vdi8nRP8ofT1v5y1OJpTgj0VCLuag4EQAt1kuvngIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141120_021019_907012_3D85F0A7 X-CRM114-Status: UNSURE ( 8.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: sbkim73@samsung.com, kgene.kim@samsung.com, broonie@kernel.org, Sylwester Nawrocki X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, 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 In the i2s_set_sysclk() callback we are currently clearing all bits of the IISMOD register in i2s_set_sysclk. It's due to an incorrect mask used for the AND operation which is introduced in commit a5a56871f804edac93a53b5e871c0e9818fb9033 (ASoC: samsung: add support for exynos7 I2S controller) and also adds the missing break statement. Cc: Sylwester Nawrocki Signed-off-by: Sylwester Nawrocki Signed-off-by: Padmavathi Venna --- sound/soc/samsung/i2s.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 0df6547..e1ace52 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -494,7 +494,7 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, if (dir == SND_SOC_CLOCK_IN) mod |= 1 << i2s_regs->cdclkcon_off; else - mod &= 0 << i2s_regs->cdclkcon_off; + mod &= ~(1 << i2s_regs->cdclkcon_off); i2s->rfs = rfs; break; @@ -551,10 +551,11 @@ static int i2s_set_sysclk(struct snd_soc_dai *dai, } if (clk_id == 0) - mod &= 0 << i2s_regs->rclksrc_off; + mod &= ~(1 << i2s_regs->rclksrc_off); else mod |= 1 << i2s_regs->rclksrc_off; + break; default: dev_err(&i2s->pdev->dev, "We don't serve that!\n"); return -EINVAL;