From patchwork Wed Nov 19 18:11:04 2014 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: 5340191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0FF6C9F2ED for ; Wed, 19 Nov 2014 18:13:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40DA620219 for ; Wed, 19 Nov 2014 18:13:56 +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 75B742010B for ; Wed, 19 Nov 2014 18:13:55 +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 1Xr9jE-00041b-5C; Wed, 19 Nov 2014 18:11:44 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xr9jA-0003wN-Tf for linux-arm-kernel@lists.infradead.org; Wed, 19 Nov 2014 18:11:41 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFA0050ZT6TV310@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2014 03:11:17 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-ba-546cdd45dfe5 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2D.E3.09430.54DDC645; Thu, 20 Nov 2014 03:11:17 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NFA00BBJT6JM360@mmp2.samsung.com>; Thu, 20 Nov 2014 03:11:17 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Subject: [PATCH] ASoC: samsung: Fix IISMOD setting in i2s_set_sysclk() Date: Wed, 19 Nov 2014 19:11:04 +0100 Message-id: <1416420664-20952-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFJMWRmVeSWpSXmKPExsVy+t9jQV3XuzkhBg+v81pcuXiIyWLqwyds FpseX2O1mHF+H5PF75vf2SwOv2lntbi44guTA7vHhs9NbB6bVnWyeWxeUu/Rt2UVo8fnTXIB rFFcNimpOZllqUX6dglcGZ+v7GEuuM5R8X5fF1sD4wT2LkYODgkBE4mlTzi6GDmBTDGJC/fW s3UxcnEICUxnlJj49hg7hNPBJLF/yTJWkCo2AUOJ3qN9jCC2CFDH7TmdzCBFzAI3GCWaFq1l AUkIC7hJPL70H6yIRUBVYur3H2wgNi9Q/MuMj8wQmxUk5kyymcDIvYCRYRWjaGpBckFxUnqu kV5xYm5xaV66XnJ+7iZGcIg8k97BuKrB4hCjAAejEg/vi7fZIUKsiWXFlbmHGCU4mJVEeLMP 5YQI8aYkVlalFuXHF5XmpBYfYpTmYFES5z3Yah0oJJCeWJKanZpakFoEk2Xi4JRqYAy7XvE8 civHyW2Hny9W9Ckui1/A7/kqcdfJ49k26b3CBzcJbO1dlscnd3quGGsLe+65eZuPi2mLv2Q7 7/B/xq4rdgwZ89z61jxccnje8S/WksGWLSlseYHToo/vikpaF9pZ7WPT//GMwplqiY2/Q9PK vj/f/e18b8K7e6c/Tciouugu/anj7gclluKMREMt5qLiRACJQZ+LDQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141119_101141_094106_29AA6E6D X-CRM114-Status: UNSURE ( 9.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, Padmavathi Venna , sbkim73@samsung.com, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org 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 when clk_id is SAMSUNG_I2S_CDCLK and dir is SND_SOC_CLOCK_OUT. It's due to an incorrect mask used for the AND operation and breaks the I2S interface operation when we attempt to use the CDCLK output clock. It fixes commit a5a56871f804edac93a53b5e871c0e9818fb9033 ("ASoC: samsung: add support for exynos7 I2S controller") and restores sound support for Odroid X2/U3. Cc: Padmavathi Venna Signed-off-by: Sylwester Nawrocki --- sound/soc/samsung/i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 947352d..8db8c66 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;