From patchwork Fri Feb 6 09:22:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Urs_F=C3=A4ssler?= X-Patchwork-Id: 5789071 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70340BF440 for ; Fri, 6 Feb 2015 09:28:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8699D201CD for ; Fri, 6 Feb 2015 09:28:12 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1D5162010C for ; Fri, 6 Feb 2015 09:28:11 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 49624265275; Fri, 6 Feb 2015 10:28:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 59243264F22; Fri, 6 Feb 2015 10:26:01 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9A3A5260594; Fri, 6 Feb 2015 10:22:28 +0100 (CET) Received: from bytesatwork.ch (bytesatwork.ch [91.135.72.15]) by alsa0.perex.cz (Postfix) with ESMTP id A0BF7260584 for ; Fri, 6 Feb 2015 10:22:21 +0100 (CET) Received: from [192.168.2.20] (unknown [95.143.48.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: urs) by bytesatwork.ch (Postfix) with ESMTPSA id 911B918001A7; Fri, 6 Feb 2015 10:15:01 +0100 (CET) Message-ID: <54D487BF.2050602@bytesatwork.ch> Date: Fri, 06 Feb 2015 10:22:07 +0100 From: =?UTF-8?B?VXJzIEbDpHNzbGVy?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 MIME-Version: 1.0 To: perex@perex.cz, tiwai@suse.de References: <1423212723-15307-1-git-send-email-urs.fassler@bytesatwork.ch> In-Reply-To: <1423212723-15307-1-git-send-email-urs.fassler@bytesatwork.ch> X-Mailman-Approved-At: Fri, 06 Feb 2015 10:25:55 +0100 Cc: urs.fassler@bytesatwork.ch, alsa-devel@alsa-project.org, lgirdwood@gmail.com, jsarha@ti.com, linux-kernel@vger.kernel.org, peter.ujfalusi@ti.com, broonie@kernel.org, misael.lopez@ti.com Subject: [alsa-devel] [PATCH 1/2] davinci-mcasp: use bclk_master flag to decide if the SOC is clock master X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Urs Fässler --- sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 30b94d4..396cdec 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -541,7 +541,7 @@ static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id, { struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai); - if (dir == SND_SOC_CLOCK_OUT) { + if (mcasp->bclk_master) { mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE); mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE); mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AHCLKX);