From patchwork Fri Dec 15 15:11:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 122109 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp594105qgn; Fri, 15 Dec 2017 07:11:11 -0800 (PST) X-Google-Smtp-Source: ACJfBou+NbLiHlwfcohrpxN2mcwwSmqeLll+on3I36mjJimFmgPMHeUeUYvj4OdNzqX2Ojh53lWg X-Received: by 10.223.184.173 with SMTP id i42mr10358037wrf.31.1513350671474; Fri, 15 Dec 2017 07:11:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513350671; cv=none; d=google.com; s=arc-20160816; b=Z6V8BBmY3A1unGRIoL45PjwGq8WGV2u/TGu+BzQ+db/ZGJ7wreB8Hi9pear3e3Ft02 y+TwNQdCejVYDv9REhi7dHP4k39T/sLAUViVvu1gb7qBdvM/mESmehLhh1J30PSMcM5K G+XNijAx2yyflCbDQ4HfmLKuIqt8Gg+MCE8962nJB8mYDc85yBXpMa4nOKgPlmfBfa1O K1zTRYY7FYIwZ1Px0I8fuDLr0xz4vPxx4xdsvsQMqP9ZlYvzQdNMZl4Oxy6oO3O5RfgK g8qqX6ioymU8r0qQWO4CktyCC8SFSSeP2cP65GJFNUmz6He/XrBR5g6ktjjbxyQKuqFM GOGA== 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:arc-authentication-results; bh=m6ZLFv6mvrmRhb6xADQ9p9dFxnvCJRmyy0FDhzdU19U=; b=kayMVn8PQ258RM/zQvwTAhgXItfi1cpSm7UzMt6JdrbUahDIox4PnaRatLcQJ3cEia EYtz2dmOEwv44/og8wpiOknaUDs4E4+KlU18UCF41ZxlTelFP/llFDjyoLufu0ORo5i7 soj0Wp8032k647YgwyJxpn1/x0Yc/U1h7nA0pS1CcGUn6A+0FbVfOURkHzmJGo9Cp5Zs O8jUAfNNYtThY4JOE/KMLW4XgqJ1VQH+KKgvGKzpkZelIzixeRQCJW0ouXOPjp7RtWEi luRB6L+yn0iRDC50WMrOsYHPhVe6crzU8nI6Ib9NyDYDu63HQ0K9nrRKwb0W7qM/ExnV bP3A== 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=Da3T6HUz; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id d2si5339475wrf.65.2017.12.15.07.11.11; Fri, 15 Dec 2017 07:11:11 -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=Da3T6HUz; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6D0BC267BBF; Fri, 15 Dec 2017 16:11:08 +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 0FA49267BC0; Fri, 15 Dec 2017 16:11:07 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 93E92266D45 for ; Fri, 15 Dec 2017 16:11:03 +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=TI9amURn3JMGVlJE0oCvWKTrXH4u3lV1vp5E5bNB9mI=; b=Da3T6HUzYH0M w1VLQFVR1zlAYPKfSX+4wzX5NCYSj25W2O7VO59Ln36kMtMI7CSqWjGjaTUOmKpQQQX0toXIdx6Ej 2ZO9y1r9wT3BDb9OU2K0hHsYxw5uvZNmxdd5Ao7+WX1vLon/6YhzkbpnLOVrbMd4mSkIkIw4Zmqdk a3l5Y=; Received: from [195.11.164.221] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ePrdd-0005Q5-3G; Fri, 15 Dec 2017 15:11:01 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 6BEE544006B; Fri, 15 Dec 2017 15:11:00 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87y3m4d1p7.wl%kuninori.morimoto.gx@renesas.com> Message-Id: <20171215151100.6BEE544006B@finisterre.ee.mobilebroadband> Date: Fri, 15 Dec 2017 15:11:00 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Simon Subject: [alsa-devel] Applied "ASoC: soc-core: care Codec <-> Codec case by non_legacy_dai_naming" 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: soc-core: care Codec <-> Codec case by non_legacy_dai_naming 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 cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 15 Dec 2017 05:10:47 +0000 Subject: [PATCH] ASoC: soc-core: care Codec <-> Codec case by non_legacy_dai_naming CPU/Codec categorize will be removed soon. Then, it need to know DAI is Codec somehow. This patch uses component driver's "non_legacy_dai_naming" which is used by Codec for it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.15.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 90f1122d91c4..b9ca939fd05c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1945,7 +1945,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, } /* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */ - if (cpu_dai->codec) { + /* the component which has non_legacy_dai_naming is Codec */ + if (cpu_dai->codec || + cpu_dai->component->driver->non_legacy_dai_naming) { unsigned int inv_dai_fmt; inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;