From patchwork Fri Nov 23 14:12:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151871 Delivered-To: patch@linaro.org Received: by 2002:aa7:da0f:0:0:0:0:0 with SMTP id r15csp2201633eds; Fri, 23 Nov 2018 06:12:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/VI/SmaUfcH9lukcMKoMQFpGCcRymhJ6HROf6IxH882hoV7Z7tNInUQG43LwHzNjWgj5bRE X-Received: by 2002:a1c:8c4d:: with SMTP id o74mr13993413wmd.134.1542982377408; Fri, 23 Nov 2018 06:12:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542982377; cv=none; d=google.com; s=arc-20160816; b=qD5KKFiLRyV6/guuA3nnD/wp/6EIJ9iO5/P4+p6xlbnA6svHwEAal/6aD/vqiRYRHP iMB5fwf9BNGqzYAGivQ8VS8I3a2Ao/+mBIvgwAMNWb8rkThEK21FLTRdsOYGML9/jsBH iJjE9Bi9njbXoCETIYF3bJB81LdN9ms0vCvEgCuTjyk0G1+ZomcpP6UQT5iNsWTZpbfg LIYNLxpGzkV9t4gMR7hF2mqnCnNo9qrflMx7mDvsYeoIiktNoOjxAXxDG5ev/Des279s b60QsnbSTbzNXSmHQJ70K8IdisO8cwvE+H2PK3Oce+7I65xa1p5GmDiuodMc2VkXfhPT CLqg== 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=OKleBfcMhmVhtRmIQ6UGe8YrS8ublQbIUBEPQzgoSig=; b=aUPrOjk38X/wG2N9PrCqNxRYuviBJkiXRtMcNKlByP2zZCDIEcZRmbheOQWldjUqhu 1cAL0ikOcjC8fuXjdI11MP1VDaJyEpN/b85FB/ILgze57MOL/qgefTxpofeZhKLsIsu9 dm/fvyLiC8ogoZlZa259tz+jsAa14xTJOQo8mxag33AaTF+fJ+wAx9mk/VmcdmpzT3IM z16PMUsZYWQlJMN2yyd+cfllJTQwf0BlXPBldShmu6Wy4aoMNZUbuSGynBfUpPjoozJi pl+6N0ttyrSTj2wfXqL7hqGA0G8St2DYcfaMoGw+hiWwd0wYYmshKjGfZC290H6UarDW GJpg== 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=n4ZQQQOj; 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 y2-v6si5894591wmy.152.2018.11.23.06.12.57; Fri, 23 Nov 2018 06:12:57 -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=n4ZQQQOj; 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 54E6C267A95; Fri, 23 Nov 2018 15:12:56 +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 1A9FE267A9B; Fri, 23 Nov 2018 15:12:54 +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 448F22678DF for ; Fri, 23 Nov 2018 15:12:52 +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=t/VbQlk/fS22wjEfATOwbLy2r2/Czh6XJQ0y5fH45XE=; b=n4ZQQQOjeONt +Y1JOYJ3SoHfc0N+z88O4s4tMTe9xyCtG1Z5tF+kW8rnyHaQP/hTwT2LCrW3nKoWEzqCa5zzKF1S6 q2eMXJ5BWIS+7Az+AXX2BVQUoWV91I52wwbrIdJe443h2cm5iAgaw8QnHIaJeI+nwXp9iyKHEVn+K +QV9k=; Received: from [176.12.107.140] (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 1gQCCR-00018v-Pf; Fri, 23 Nov 2018 14:12:51 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 93E6B440078; Fri, 23 Nov 2018 14:12:50 +0000 (GMT) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87y39mlz1s.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181123141250.93E6B440078@finisterre.ee.mobilebroadband> Date: Fri, 23 Nov 2018 14:12:50 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: simple-scu-card: tidyup "prefix" parsing on Doc" 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: simple-scu-card: tidyup "prefix" parsing on Doc 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 f94b0f7f9246013ac158ae3adf194c1bfa1d1847 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 22 Nov 2018 00:55:24 +0000 Subject: [PATCH] ASoC: simple-scu-card: tidyup "prefix" parsing on Doc simple-scu-card.c is supporting "prefix" which is used to avoid DAI naming conflict when CPU/Codec matching. But, sound card might have multi sub-devices, and each codec might need each prefix. Now, ASoC is supporting snd_soc_of_parse_node_prefix(), let's support it on audio-graph-scu-card, too. It is keeping existing DT style. It can't support each codec's prefix if sound card had multi sub-devices without this patch. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/simple-scu-card.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/Documentation/devicetree/bindings/sound/simple-scu-card.txt b/Documentation/devicetree/bindings/sound/simple-scu-card.txt index 32f8dbce5241..3a2f71616cda 100644 --- a/Documentation/devicetree/bindings/sound/simple-scu-card.txt +++ b/Documentation/devicetree/bindings/sound/simple-scu-card.txt @@ -75,7 +75,6 @@ sound { simple-audio-card,bitclock-master = <&dpcmcpu>; simple-audio-card,frame-master = <&dpcmcpu>; - simple-audio-card,prefix = "ak4642"; simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", "ak4642 Playback", "DAI1 Playback"; @@ -88,6 +87,7 @@ sound { }; codec { + prefix = "ak4642"; sound-dai = <&ak4643>; clocks = <&audio_clock>; };