From patchwork Tue Nov 20 16:28:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151607 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp805542ljp; Tue, 20 Nov 2018 08:28:09 -0800 (PST) X-Google-Smtp-Source: AJdET5fYsbVQXxH9LiSuMyAluYGBYjJKOgBEO6+AdmucRdXcyKMMTqJNpvaBwFprFiosgLWHr3wP X-Received: by 2002:a1c:ef08:: with SMTP id n8mr2924810wmh.114.1542731289565; Tue, 20 Nov 2018 08:28:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542731289; cv=none; d=google.com; s=arc-20160816; b=iPsCgxiPhPcqyjgDbdNFDT5m5VR64PpnJOY5wFSy2Me3l7LLO/AoAqNzh+hIbyRTAO X9+ML5Fzrlr+PJA5hy40OeHKEvzz34Nim2qu9LfmdI6hlky3tkWEA+C9TpikSFQpSXXM S7ai5WnyUChndq3wXGml7J0JngYqi5LI732thVz1EaezSx1fmuiBE0g4d5ndJzi4Q9Mg iY3H8R5FjgS5a+igqviDtN5usJ29843jWfPrExqzm8fqjTV/Nm6J/pn26XSsEOBSCtvk qpsbq5Hyl24dmqPGJAH2Mece8p6SAX4m+blKyWv0sX1MY1D42I+8sqQdmC0f1QegH1iU YBOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=K5pDx/tOLWNkMT8IkFjkQdfGCsr2RIngUDrTidxOnk4=; b=ozU4PboZTz71+944r3WalMbyiB96d1tIG9nMGVJdmuWyZJmDhnQ5tAVSN9VJPRkkyV v4QtgwoudHlBH7CBCX75fXv1bTBDKnZctGzPrRRrC3qRwXOsWmSr39pUZmDZrda1l1xZ G8vSqJ8Dumny07f9EoRaOT3zsUeJ9wFf723FGbddECNXDsHdBCar3be7bhf16zRfCC7l yXxOg+m0g8VgqwsWJYEPXwhRsHp0CZcHuJa9K0hzUCDbsd8oZ85L2vshECn9oiLDch6w MngAYGD96c13OEOA5zRo/MOfeUWtiXWjrfSqP/6inS8LWlnf0SXF2iqf+DTXUzsDwAY7 cb9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dwuBsX0j; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id p3si14553458wrf.163.2018.11.20.08.28.09; Tue, 20 Nov 2018 08:28:09 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=dwuBsX0j; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A1C46267865; Tue, 20 Nov 2018 17:28:07 +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 3F5892678DD; Tue, 20 Nov 2018 17:28:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id EF46526784F for ; Tue, 20 Nov 2018 17:28:02 +0100 (CET) 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=LbG+1NQqKEvFyeYNAHsKRp7hlrMmedikLqAR1DeMg68=; b=dwuBsX0jw6As H494Ey4vJDgr5iYIOsvW3GQpub35hN+GIMLgMgBorZQCc7BOY6lp3cEPrzNmh/oeKj/R327l1IGe7 K8LTl0cTQ7YfYWdUdICROyJs5xv22GUbv9Oq/2C/L9bQVI5HdBrr53GMUHBKqUMdVkAP7e1qM1xeo TPVNE=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gP8sb-0001m5-IT; Tue, 20 Nov 2018 16:28:01 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 3C2601124DC2; Tue, 20 Nov 2018 16:28:01 +0000 (GMT) From: Mark Brown To: Peter Ujfalusi In-Reply-To: <20181120124253.27775-1-peter.ujfalusi@ti.com> Message-Id: <20181120162801.3C2601124DC2@debutante.sirena.org.uk> Date: Tue, 20 Nov 2018 16:28:01 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Liam Girdwood Subject: [alsa-devel] Applied "ASoC: tlv320aic3x: Add support for CBM_CFS and CBS_CFM clocking modes" to the asoc tree 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: tlv320aic3x: Add support for CBM_CFS and CBS_CFM clocking modes 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 4647598cde0e55d5c6d6a3c4223953611a472289 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 20 Nov 2018 14:42:53 +0200 Subject: [PATCH] ASoC: tlv320aic3x: Add support for CBM_CFS and CBS_CFM clocking modes The codec can support any variation of bclk/fs master/slave configuration. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic3x.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 6a271e6e6b8f..6aa0edf8c5ef 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1260,6 +1260,16 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, aic3x->master = 0; iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER); break; + case SND_SOC_DAIFMT_CBM_CFS: + aic3x->master = 1; + iface_areg |= BIT_CLK_MASTER; + iface_areg &= ~WORD_CLK_MASTER; + break; + case SND_SOC_DAIFMT_CBS_CFM: + aic3x->master = 1; + iface_areg |= WORD_CLK_MASTER; + iface_areg &= ~BIT_CLK_MASTER; + break; default: return -EINVAL; }