From patchwork Wed Nov 8 18:26:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10048973 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 751FC6032D for ; Wed, 8 Nov 2017 18:51:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67948297A0 for ; Wed, 8 Nov 2017 18:51:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B2562A74E; Wed, 8 Nov 2017 18:51:30 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 A28B1297A0 for ; Wed, 8 Nov 2017 18:51:29 +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:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=3lzno4DKyPE/yfpR2eB9QUKtRDgd2Tx4LCNCiDkH9Gg=; b=beR qUR9asq+GWfxKIsV9x445ZOvzyq5UsHEDl67KGMvD5HzM9nJXHMgUvMLffpShgN8sRv5eExRjgngo Rtfy16WdTuhS28skYyUMevVRaSA3XK9Zvs6cZ7zgYkJ1KpWKSagfyDDK4xjnWTdqyo3UghvD7x7LN zZaBvSJZOWaeJU1wXga5iGADiEj3xKtE0SZyv5UlbIDzn3HIVDbhlYxrIjo/o3BoJ3Oaqh/nKbqwT KU3ED6DEkmDXLmDjaLmsghuc/SNN310cs6LqLoDw6Xd+P9z4xZ4cAiyfY7+ubZIlYk4qzXiHPaFPJ llKVf2KOfr+cqfOQHlZMWkRFYe/pe0g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eCVRb-0007uc-N3; Wed, 08 Nov 2017 18:51:23 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCVEP-0001M8-UD for linux-arm-kernel@bombadil.infradead.org; Wed, 08 Nov 2017 18:37:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=UGX+ohwOwXXzfV7U2yDEbVOo9riPET4HJbkz91+rl44=; b=TL7PhCK4QjqP+tKicsIiYpHtHG z8Bf5kiyA0Pk0uI6SvzIgqJKoRsmFct3Or3YDK1DAhXSdIn92hZyuqQilTNCavF3JIIqtLP9sA0s4 jhXRkhb5bFESJQwcO8zXPj1PiargrYz8pJAwjHMsM+YBSP8W+URa1tV2fATpdtaHykbPjVr01AeEV IfwWpRYettAOgg6g5Z+30aeonIGJlIY8JppPv0ciak2aAdo1k4OZRWSeS+SFszj2wJVe6b/ZA+XVa DBSv+y3gIQN+SH17s6xDB1B7O3hCYsz4x/40woDMvuEpPFFVRHDzU4SmcaoJm2D77T5QE83EMnZMD Eb/GBbLA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eCV4Z-0001Zp-TA for linux-arm-kernel@lists.infradead.org; Wed, 08 Nov 2017 18:27:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=UGX+ohwOwXXzfV7U2yDEbVOo9riPET4HJbkz91+rl44=; b=hVWmeV8LPebK G/avfgmZ3Bb7eL9L32flXZlDZ7sDWxDWSJsmHqCwJWhI/egS7gEatS8Y77asKHPLcVQV7ZJtTHLSE z++gaIBySCNePM2FukkIhnVvbFnSc+ot2EVcqLl5mZCi9pM4y/2nRaaYy4p7HlHu1ijuf7hjhxgq1 ntH/M=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eCV3L-0003Ro-Pd; Wed, 08 Nov 2017 18:26:19 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1eCV3L-0006hn-9S; Wed, 08 Nov 2017 18:26:19 +0000 From: Mark Brown To: Maxime Ripard Subject: Applied "ASoC: sun8i-codec: Invert Master / Slave condition" to the asoc tree In-Reply-To: <20171108154710.16407-2-maxime.ripard@free-electrons.com> Message-Id: Date: Wed, 08 Nov 2017 18:26:19 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171108_182735_965628_B4A0EE65 X-CRM114-Status: GOOD ( 18.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , alsa-devel@alsa-project.org, lgirdwood@gmail.com, stable@vger.kernel.org, codekipper@gmail.com, Chen-Yu Tsai , broonie@kernel.org, Mylene Josserand , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: sun8i-codec: Invert Master / Slave condition has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 560bfe774f058e97596f30ff71cffdac52b72914 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 8 Nov 2017 16:47:08 +0100 Subject: [PATCH] ASoC: sun8i-codec: Invert Master / Slave condition The current code had the condition backward when checking if the codec should be running in slave or master mode. Fix it, and make the comment a bit more readable. Fixes: 36c684936fae ("ASoC: Add sun8i digital audio codec") Signed-off-by: Maxime Ripard Reviewed-by: Chen-Yu Tsai Signed-off-by: Mark Brown Cc: --- sound/soc/sunxi/sun8i-codec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index abfb710df7cb..038107baf414 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -170,11 +170,11 @@ static int sun8i_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) /* clock masters */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: /* DAI Slave */ - value = 0x0; /* Codec Master */ + case SND_SOC_DAIFMT_CBS_CFS: /* Codec slave, DAI master */ + value = 0x1; break; - case SND_SOC_DAIFMT_CBM_CFM: /* DAI Master */ - value = 0x1; /* Codec Slave */ + case SND_SOC_DAIFMT_CBM_CFM: /* Codec Master, DAI slave */ + value = 0x0; break; default: return -EINVAL;