From patchwork Fri Jul 1 05:18:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 734D2C43334 for ; Fri, 1 Jul 2022 05:19:33 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 812F616CB; Fri, 1 Jul 2022 07:18:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 812F616CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652771; bh=kbqjyszXmfA6bhThiPigmUaqWfmoON0qCgDwmK0wf50=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=P6HdvQMiVoZqIrmfw29Yzv3vSaPDBiK2jjhNjgKjdeEyx/PKPR4REu7uTJ+tiSbHA QWUHUuM1y9fucgpZIgKPde/v9REslICLQeNGRlPaBQfLHATIdFvnbVDa3q4576H0Jg JpPjImYD0UJ5I8HhyL2PXjpBQvchzde0eikkT+fk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1D8B8F80536; Fri, 1 Jul 2022 07:18:27 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 579BCF80535; Fri, 1 Jul 2022 07:18:25 +0200 (CEST) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2129.outbound.protection.outlook.com [40.107.114.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C63DBF80535 for ; Fri, 1 Jul 2022 07:18:18 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C63DBF80535 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="SAj+M2lL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HJbrfHxRn/ovdLQJEFoY9IBv8o2UHyNT/iTR+bnJJyWKGwsciezK3FJxXoB4oA9L1SP+2+rDy9sUjkaUNtgQziR4RIbL/tsfTTsNMIl1K3MKtT8S8xLVddheToC1oV0POSk4Fw9e+mKa6zvY+l/xi9KUoPL0xNlRFTwUzaEPLMMWzbUgyCn/lT5LJc/sZNEQw3SaArTz5UwEEMFKIcC2NJueVaCRGJ/W6chRp48qBRZY1I6W1tz9ch3xMydEl5wV6bIeJ0GfbvfY1Ok8hsb/TS9rl9sWZyNdl972dVAOIo82dnQGOk+E3WdAnnYH8uBbuE7NAWctiy8ya8HDQa9j0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Tf1RWRnFQ0vBNJeGCtPt32wed/O4ckggnwinGirrCGk=; b=j4gFY0vx7a7gl+2D7H7uuPVI47+HpyCOqFYtW3sBPTPKA0Me6fGf+MsPThBg5CMNyjwynFVe0he1FQbRO0zRQtghEmgAJebqLReHMacE+N2myF3ofGQOv33KTIQ9kKOHF3m/6dUB/2E26o4OYF3OX04xXQofFEG7CqRJebgYBAbr2kIllAKE6K8dg8mWdg4b2C+ZvVotPULicOAU/hnpRql3Mvl3jtmpWIy/OxGzQIMrEh3ALA72Yc2R8nJCzvZNCaV++KNt58u2U12kgxrs6XUzPpWvq6wbCdea/m3kv9vaVXL3CCsEPQ8+h/RKTEyqdzApWdqz9VphY0flcQEFtA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tf1RWRnFQ0vBNJeGCtPt32wed/O4ckggnwinGirrCGk=; b=SAj+M2lLqgDFDnUI2cFfFbpDei9Mj6G+og9ITxUxhhFCbfJek2SB6/suquWolG9IV0ASi6zP56tKES7hxMVXUJbjyUDs6HfUedKhv9bSG6201KpcsMmilvTcbzFLUdZ27mBBZ4yVS6hebj4L2Mc9aBV5HlO5g9ythvf28/wjO/U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB8838.jpnprd01.prod.outlook.com (2603:1096:400:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Fri, 1 Jul 2022 05:18:15 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:15 +0000 Message-ID: <87h741s961.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 1/6] ASoC: audio-graph-card2.c: use of_property_read_u32() for rate User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:14 +0000 X-ClientProxiedBy: TYBP286CA0039.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::27) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41a99cbf-269d-4796-ee35-08da5b211976 X-MS-TrafficTypeDiagnostic: TYWPR01MB8838:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /lOlVr5BzlYA4PxeGnvHCQyeRfCN7A55G5Tha4sZlxhlYzYnFKm9OxfE0uNDENE5Zcxho0oStqq6GWFTwKZTU/kCb7KCsM2JVKSlja6ty/cpIC1bYklAbzTB9tOLNAMRpLvwZ88CnmQvAZRAEm10VGC3/GtxZK7nrFvm4aD+su0+fdPvFAILEBr4BHEfhh7kwnTCxbqPy2iKHLdAqAJQOj+/yBSE2XsE+ct/z2BEArBUW672DFl9vQoIluJ/EY+iUF9kYWdgwt8J9K1ZYuMubBD76G7auJ6kLroksP6e5hMDR8o2MZ/efYr/kr4T3Zkj0RNEpvwi2L8NZSkBKwGSNLxnyjLHGAtW/tUzyV61l3STl9S08KQ4U6R5AcbR7ob7ljJZZ9ifHJcRng/slum+KzAkjtiDyLBvu46hRxhIn806dxMbjIKd5cKTR5vUisjdvEmpsKjQVk3PYvyQwH934i5kOF1Yo0YI9c8Q7uCMkTo/ecxbZMJcUbEZehKb5EWvJlas5SaaElBUEpuwglNmwIAVFfXQEmIBQM6satHt2eY7n6wc9NaGRiChlFWBQy5eWi4dKKGkgEpvt9ZyjlHV/2cVUXwAS5PJjpkB7xSHlpWQjMqfwkeBECg5JS9Wrig4a3A6lHdCMZq43VoTcLty+BsNQRiHrQ9hy6MkXC58WWjLw/JmuVPPspdcD0Vk8I1GIi1EINd4zFxFTM0Nhpx6pwLcywYE7Wu3jOpGy5zmb4J5ZH4obPsg9/7RFXHUJKqK0orFSjcU2vxAdbCR+y4voNmpLMhGgMdxZqJjZnQ0rxSH+/4ipi78b2EnAwa5tsQF X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(376002)(346002)(396003)(39860400002)(366004)(186003)(2616005)(2906002)(6486002)(478600001)(83380400001)(36756003)(8936002)(26005)(5660300002)(6916009)(316002)(66476007)(6512007)(38350700002)(8676002)(66946007)(38100700002)(86362001)(4326008)(66556008)(41300700001)(6506007)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qJHT+QalPfW/5ABhejv1XLx0Mc1/jza0Bc3ssFJCmxbj3gmS4PCr7XwffX9vScLbqCUAPKZjJPGBfs55dpUBzrxCjgZYwlBlgKdJ3ZAO31aU7OgVr8jWhgpF3w9Y+X4VkPQQ81I61EXnmIJZZDaRJ6/daj5KiNd+pJVGB3liRTas+LRAq7w2S7b4AYHfcM1VN3oMb9aMlhkY8S6EB34ngSVGonEeqfHGDTV6DIKK5wW3sp50a8BiEgTsUsNtC7utlU9K+gkQ/aiQrEtDUnxSNXYXDC7uNL6rzp+FSQ0ID2l4dPMNzKff3ZKVqGaBSSV7sKesCz+Bledv9aOe3VUBz2kb6mqkTKhcJdX7ChfUToximtgrnvy3BKmgNELm92JGsuvDshogc5MhRMljy2h7UM75uFLF86UZpUeEa4kYR2ZQNRP1twR9xxzW68cahBht7ITS3HKgNeO372lmezrVS780j+OoZ2V8cgE8oRR9IOkLOlVwtEyZqNuMamnJFMErr+uRRw4yZvGVLAHMIvqA+n1plcyhpvHBdUEMnOLidwFEHdZUG9OmfeLHKSPQH/+bq/O6wWmVyFuC0lOkKKAmmPmTSMrJfHZkPSDEzw6SyDEM7CoD9PTN/Ns5uHAeFHDVlzhek3DIi758s4Hk2DMbHCc6S/rxkIGK83IoqVn0SPAh24mX7ssWiQNLxgwOGnicXfSgrVYhDcpsVmjCS9xVUGdREM39c3K8jvXsG213pwseril5Auoflx08Ty5MYBwK1LB5hbXKK5BgvHn/a2ms21s1qZ+MdR8qNxJWrwlrmNtuh7IMKfWpvsEk4jec4PE7Ir92hWNObSowzM217ecGNMSW6z2Fzfpd8yhI5eZaUkFFDco3HKgPcBXn/AQ4yjVbiO4DIpupykNM5qnljjnRPy/wLZTQxawwEBL9GoPgN7tR6s90LlGWI+rooc1OwXnRV6m1q7RHA1jLiMBALb43IFgLUvU2CtNr4MwF+jInwYBVecu9EDvx28AN2/aol9DwAG5Sf5q+BgV1b70gXvrt0Q7SNYuetSzY19S+z66zKrXsCH3x//l0QXTgYac9jIAVSBe/r4bsNhN9sgN6ieu6orstxeV7bU6VLGW08WZVSRbqc59wOtb7rTNjzQHYI7BJ+TvImsoMb55h1X7j56TCcclES99v03do/KY2n1QUfn8FPlLs6TQ46WucZTqtReUeNnKox+ytvkgELPx09Uic39SI8BHopnZHxwbYdu05reUDnWZj9uslT/Eg75CRCD7Y4kaZKMbUCZcIHTc3iqGt8Y8twEH33bhUK2WZGXbw1tFw17k75nd2ITJuMoMDa9Q/8AO6/37kjAXYrYRaceneLQ7BOHMt2qmj+M1RNeO3q3tWknBO3pcuF76udPV95urttOTANn6s4PjrPe8MbtfUduoQlaaU86WfDyZZTmBEXSBT1FcLd5uOW01H2re2w/oDRgVNrPOyRo45QDeHvziDW3ntTxeVACIWqjF5vH58RcnnEJUU0ut6mENfRxaNtaKSAJ2LmDqEeyS+nbYwxWeQz61Fib4bkSoK+J6qNaOZ+A3sjbmY2NvoU0mBJwruTNmLO6Ga3wkLWm5RUfUK5ota53qZQ702mTnZeqB5uJhPUzQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41a99cbf-269d-4796-ee35-08da5b211976 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:15.5743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H9dL2ud0IOU2kXTSFBpYivWZVVtil5k2ajanDS1RECua6tIjC6/DSgZpZ23RAklh4szSHsTP9CRB5y6mdLNFiJNvnAHzMHkFgEAyrwdNVWoRvWeLCfOXuoB+0v3DfFbD X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8838 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Audio Graph Card2 is using of_get_property(), but it should use of_property_read_u32() to getting rate. Otherwise the setting will be strange value. This patch fixup it. Fixes: c3a15c92a67b701 ("ASoC: audio-graph-card2: add Codec2Codec support") Signed-off-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-card2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index d34b29a49268..8e0628e6f2a0 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -856,7 +856,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, struct device_node *port0, *port1, *ports; struct device_node *codec0_port, *codec1_port; struct device_node *ep0, *ep1; - u32 val; + u32 val = 0; int ret = -EINVAL; /* @@ -880,7 +880,8 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, ports = of_get_parent(port0); port1 = of_get_next_child(ports, lnk); - if (!of_get_property(ports, "rate", &val)) { + of_property_read_u32(ports, "rate", &val); + if (!val) { struct device *dev = simple_priv_to_dev(priv); dev_err(dev, "Codec2Codec needs rate settings\n"); From patchwork Fri Jul 1 05:18:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EB22C43334 for ; Fri, 1 Jul 2022 05:19:42 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D670716DF; Fri, 1 Jul 2022 07:18:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D670716DF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652780; bh=01NQJXt2kxWxl9F0muVUHkoWvUuziMPLuOHR8UNUbV4=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=W5v3AtYne+YGMkwNWJVYQ1LqiszcMBGmWsG2YQCtJHpQzCH1ZlB7zEZuWTPeW9jDf uK7I/4Vd9dFz6gs4oNUA8wB42JjZFJ+zlETQxyPHKzET+HpeOpw9bgELb4oaCnU37b TyNQLtCQO5/Z3AeqQymkGNu+Od+9U+owricc+Y6M= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id CC013F8053A; Fri, 1 Jul 2022 07:18:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E5C4BF8053B; Fri, 1 Jul 2022 07:18:33 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2134.outbound.protection.outlook.com [40.107.113.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 259FAF80539 for ; Fri, 1 Jul 2022 07:18:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 259FAF80539 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Ma5uYPkV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVLL9HsKhAdH1eelMbJM2LD7LUVYsgpegGWaLJFbQxT/zfYEC/HyloEG9A77eaeVCrceLr8H/Bvq42oyxIZ+JZ0mrju8M3FRH3rPP9BbRq45YQc9ISFD4yGfcQWsojZYDUifMlA0KfXH5Z0QKjN3J+njFQCc6Bb6S53qLK6kZq4oHBNhJkZza30M58HmGTmHrnc6PFkC/4208f1fPyLZqFMTU8GHYGmpVXyxJPiuD1Ob7nloeYig4nE/mFVnBajlNcWz3wN6rjOkyl4+OirluV9ggt9PQ01GfMTKeaa6Qf/kyC92Fv8xpmjVE92z0vEIMB/RNHtRvjNf6VGmqWSJaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lY0if8P8IQ1dmlWZn8V9ThM3d67ZoxWmer/7dku+fyw=; b=exioaI9eLe/CcxrIeDjfwUJ2Mo6kHU1oki/IroY0xMlOb4XeCSWnNjQQRdAfLV+JXNviOseHKtoRf7B6I/wOdk+AShN5KP4+iSse5kfmls0q4gFMjAbkxdoh6j3CN8Q68y6+/p/yPqvWCD5GqxKEezGoIBek57iKnX/p2PHzvUR2/b1cpHKkaE13yMPRRR3zAAbDilsB0tMIX6LmDIUP8UMLgKffz4PVJssdodLFay5KXLmFOHxnh6SFE6YBxR6v239wIuEWq3UJbt3RmyQs8jsBiLvqRXT4ktH4lP5j4KkknSocfIId0p1ysde0r0VpYNS/di2g191cgBkchQ+DHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lY0if8P8IQ1dmlWZn8V9ThM3d67ZoxWmer/7dku+fyw=; b=Ma5uYPkV9SpdGX121kOT0PK1LEK+fEoBpbr2oawbsOYI63mouT9jFsChxRXoCEkTlLh4fxTKDjauQ48t1BaM6bjlXPxyGH9Ni3xH5GCrRWTmOQCItFYccqIqTsbbjcbppQrH35gOUKpgk6MaKqGv+PkdkSXx6L9XF5pDzNAXoLg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by TYWPR01MB8838.jpnprd01.prod.outlook.com (2603:1096:400:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Fri, 1 Jul 2022 05:18:21 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:21 +0000 Message-ID: <87fsjls95u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/6] ASoC: audio-graph-card2.c: make Codec2Codec settings optional User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:21 +0000 X-ClientProxiedBy: TYCPR01CA0153.jpnprd01.prod.outlook.com (2603:1096:400:2b1::12) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1e207e3-3ed1-408f-c520-08da5b211da0 X-MS-TrafficTypeDiagnostic: TYWPR01MB8838:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2gReraXeyBnpWyyWR/48hARYXX1nCUREaTNuplMdhgudB6WF46zA0QUk8helCY1mWIW0u7JfVCdyKPxpefiURUHO6FY8ABV3mRyU+JZsLeq8IW1ABz6w0IE0L9QZa8p7mxanPsoo4PL58I8lvJQM3DXKge1NTTRTKWGiyaZUfNBOy4+xaIG0r6LxUTSMx8LPtuW/sst0ZlADrKIa1jaxPHdT7rGDekW1bxzCX83kpiue+0q/20/JikeObHVDze9ZB63mxV0Ah3pzY1C28CIfusaSf6nA2ywlh51AEQinT9I5wfgLYuFKzO/eYgypdrduVMDLdbnB0KZYhIWOHiOj8EOM5LkDkoEHo4Vk3CgG5aNzYgx08m3sE1fKBGx3hYsgXIirEOnJYhVQWX/kUpVuoeXRQuW0i9Zw9cbrKrHOpglDQT9i7YnkuOQiTkM0csAAsmuyM3lj9cTABppGsypzU+QHbzRIL4Wr7utYdcXybmDXGAdceqJzpfppB1UxfU3dvpXF0T5A0UzGBLcREL4UVNZNLZN/0KIkq/skjeClDgz+PJL5eno6oe4qsgCIx4hsMejeM79Srv/Whl0fK+e0wouU/OUaUlwmBb5LwYNZAAXKOjnwBaoGTvtyrPU1CLoZhQPrAgksYYmK5tf/wRZUjEZ4PjUKvxB2/ruGjFZY+WffiUaMGcTn0kxhqqbO5XQBp9OrECBDu0HPBRfsUupXicUurLhHuq9FHcMo9dmp5gS5sCFXOuhCQyI5Qd+i9pzOVRoUB2bb0sqHSi2hZti1FTuxWMpJQAWSjwmEwLeKZ8GKLy73yNIxV4Qm1MIHTfaF X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(376002)(346002)(396003)(39860400002)(366004)(186003)(2616005)(2906002)(6486002)(478600001)(83380400001)(36756003)(8936002)(26005)(5660300002)(6916009)(316002)(66476007)(6512007)(38350700002)(8676002)(66946007)(38100700002)(86362001)(4326008)(66556008)(41300700001)(6506007)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SCILH1opdExtOtdNFzk1bC/Y+eeuYbKmBlzpVPxtf1rAJHE+Kz8/QFraaMMC8t67dQD7oRZjGXVJfj/B34lld5eKgnynsA5O9JqBmadkW+MpbeSNpdm2KaigLUl1gFQYVdRR6XT3symX5oKtEelMY7jN7emKIl77Zsgzhy5qD3rmRmM+tWLddMuVyfp7ePh/hlkd1Ra/7D/dvXByfDvmbqgnYNJk2Da2OieutxwweCfPnGq4HZ1mW12jg8V0gqbm+PHCxVOZO6UxZCIQuMFHaVnqfccrC0j5ogfEYHeUUx/rbgC/m6G2wVQ1VcnB5V+F60EWM0ElZmR8UR+IPQ5dR59uXUFTW3f5NtpT+tMnn7Pq7V/DFnT4IbX+K0CtcDEYm1swFJKMi8JwfhhlKIFrMXN3vB8NxFLTYLSNvIDJ6Jd3vN19jdlDnMGdr7IeMCCRK/tiD8Oqd5OllooXZIIaJ11aDdpCqCvMqGDFjs9YinLEgzoWcw361ehzEOo+g+Q6UayVBtjzVKWBk76LCoXn+3AcROq06nGTORj6lM8rHWqqkyFclmL/kIad4bZ5TGT30hl+t7gNlvsFv4YANssjjB3eGCVzV9CA5jqBXu31LF0VAQeG/TwJDNKynymKDaTsI8wQmT3eGlTlaBg199YsSqrsozRPC1ptzw/9vz/CF6SbhJ2UhoTEmb3WvizWZqwW9aiGpqxCH7tceJ63zFX6DxXIU3rzt+Xzse2/59uzbMYl+FWykcXAqOpquKHd0/Yw9zfBvGQQibouwKBrL8ZTXLdpnUv6yyfgjcAyoKeuEE29Uiw1ULizMsXffPlCaxRmoT5Q9ehh1jtFGGLC6osvNawzO6OobHCJBcSrLVfzGO+u/U9RFWYExWWKgX8GkFfUjnVhin/RAKpQlFRSfakeSiHF88q4EqRRcUjcnNM5w/iYmZkvOzMupEo0QCcVzoTUEYoFdOrz+oTs4juZDtZr7XFgRpVqhhV7uL4M72MJAsipxjPDNSFVSc01BoOGWZny6PayWVLV8BCe8M8YgyWCygFGWriHwb7ZQGRPQKtEAQoNwIwl15gXreK18xBvVTSqJRN7EfITmJK0QBlR5f+QJiKCk19v3Ou9LmgA/yyOQdS2vVwL2sd6SzXMYrZbSS8rKD+IIJQaQknaeNlRC1KRkDzzyPjvUrzYOIJ6fIF1MIUKeb30g6hl/t+p7cwLI4MZklE/nMTEG6+a53AcQ3rtkSbTWsb7hulcCnSDCjexlPIegWraAkQzgEirZvY7iBJqqfRv79b/14a+Lnkc5f0oKKqKQzXnEVlNnYsHpOihVqSVFQyKSTxMbENaiVw2Ff6DHT7AOdoyGRrG0T3gSAVJZnPb3XHZvKi4nGa2alfE7pU4nXF31BhAJu5xeQ/On3gUbSU5LSgcJ6d255fHIwNqIHIebl/zacQMxEI0DtYilP74PaNZGyOKrh7KkkOgXRGmIbMueZM603LjYRboZTa8TUiugDn9QshysWM0iEnkqcwFENLKhjxVr0BOimG+HtmLtC+jpSQsgSlli2ErmZAYdTom4hKUkEz5bxK1L7mKUAMwzwfgmzInE3nVbuJ2Xra56zC27nllxSEW3I2orRuMJ6/6MXHFaszJ4iUQHp+mqVU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1e207e3-3ed1-408f-c520-08da5b211da0 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:21.7813 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OguVtuYE37t0BJmabk20xjAUsWQSO6ilD3EAtUqq78k5Vb3Z8RzY+ozZ5NXXgtw7jUP4z+FYkWI+boTkba1yh9ieaNz0syr8i58DLVeRLdpb4MhChXlALjkgfFAOC/Nn X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB8838 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Current audio-graph-card2 can use Codec2Codec, and having its original parameter (= rate) on DT is mandatory for now. But simple-card-utils.c has asoc_simple_init_for_codec2codec() to setup *default* Codec2Codec settings. This patch makes Audio Graph Card2 Codec2Codec rate settings optional. Signed-off-by: Kuninori Morimoto --- .../audio-graph-card2-custom-sample.dtsi | 3 +- sound/soc/generic/audio-graph-card2.c | 36 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi index 8eee7b821ff7..053d987a1fec 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi @@ -154,11 +154,12 @@ ports@1 { codec2codec { ports@0 { - rate = <48000>; + /* use default settings */ c2c: port@0 { c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; port@1 { c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; }; }; ports@1 { + /* use original settings */ rate = <48000>; c2c_m: port@0 { c2cmf_ep: endpoint { remote-endpoint = <&mc2c0_ep>; }; }; port@1 { c2cmb_ep: endpoint { remote-endpoint = <&mc2c1_ep>; }; }; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 8e0628e6f2a0..510058c47a92 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -851,8 +851,6 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, struct link_info *li) { struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link); - struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); - struct snd_soc_pcm_stream *c2c_conf = dai_props->c2c_conf; struct device_node *port0, *port1, *ports; struct device_node *codec0_port, *codec1_port; struct device_node *ep0, *ep1; @@ -880,21 +878,30 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, ports = of_get_parent(port0); port1 = of_get_next_child(ports, lnk); + /* + * Card2 can use original Codec2Codec settings if DT has. + * It will use default settings if no settings on DT. + * see + * asoc_simple_init_for_codec2codec() + * + * Add more settings here if needed + */ of_property_read_u32(ports, "rate", &val); - if (!val) { - struct device *dev = simple_priv_to_dev(priv); - - dev_err(dev, "Codec2Codec needs rate settings\n"); - goto err1; + if (val) { + struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); + struct snd_soc_pcm_stream *c2c_conf = dai_props->c2c_conf; + + c2c_conf->formats = SNDRV_PCM_FMTBIT_S32_LE; /* update ME */ + c2c_conf->rates = SNDRV_PCM_RATE_8000_384000; + c2c_conf->rate_min = + c2c_conf->rate_max = val; + c2c_conf->channels_min = + c2c_conf->channels_max = 2; /* update ME */ + + dai_link->params = c2c_conf; + dai_link->num_params = 1; } - c2c_conf->formats = SNDRV_PCM_FMTBIT_S32_LE; /* update ME */ - c2c_conf->rate_min = - c2c_conf->rate_max = val; - c2c_conf->channels_min = - c2c_conf->channels_max = 2; /* update ME */ - dai_link->params = c2c_conf; - ep0 = port_to_endpoint(port0); ep1 = port_to_endpoint(port1); @@ -923,7 +930,6 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, of_node_put(ep1); of_node_put(codec0_port); of_node_put(codec1_port); -err1: of_node_put(ports); of_node_put(port0); of_node_put(port1); From patchwork Fri Jul 1 05:18:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586338 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DEA2C433EF for ; Fri, 1 Jul 2022 05:19:51 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C285616E7; Fri, 1 Jul 2022 07:18:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C285616E7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652789; bh=LOgmRlb304ZIkJR6KmlNe7yuzo2V+myM5yEegAndcmQ=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=dN0g0j4rZxAs2hZYoTIR4/hS4sUm4CS8nbPjxw4IM1V7M2JoJMfL29Rz0Ql/ZeB3I OQPaDziGZxNYAqHZmtYt7HrkPM4Joen2cFcTe88YXGua7n+s+vXgmbCnrtcQSX+zgr aOuH8BvxZRh1HSzwGbgYZYoNhxDXcztKDp+JsZXA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6BCE4F8052E; Fri, 1 Jul 2022 07:18:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 534ABF8053C; Fri, 1 Jul 2022 07:18:47 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2130.outbound.protection.outlook.com [40.107.113.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2B0C4F80152 for ; Fri, 1 Jul 2022 07:18:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2B0C4F80152 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="QjAR1iAE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KzT/IvcdwG9hmfje1ekTSQE1moWV3+U44fAp4jQLs4/9gvQavQ372lfpmbHAmo4JxTv2luJIapoLk9T/+xlaO2C4XCZJrgJZ7qCwFvPfFQpbarjvGLi2OWtWdtrh3bYDr8+9oXjzwXgWhZRTUxxtZ+3nGj1cBfVYjuyK8WW5PCoi023IwxZVFOjbxyRgf24gNh2M1DGuRa9Y4EW1uXM52PY3ZvXv2Tv6ltgeZ0EmA2wMNFObhpexe0IHTkG8rH+jryFCYe+BZ49suHSGQ1Vx4yWT4qUtzWMH8UiE9UxpwFJoi4ozDQcEFTffV2vZKvdLPbZGdjKHkynoiPpMEi+QYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v7fVDHlIsED8+zz0zg59BUef8pqBwerhK7kcix4DqIM=; b=SQwW/Sv6ooJnkx3Lji7BHteKTY5zjyPO3xh3GpkKc3enCOF5GyVyZsTNnqHdxfYoXg4X2Tm3HtnlSXqbX8fyOWVfa74q7pEbozgNQKDalP+ETjyovgefLQEk3i2j112Pn4/6QQTvIV3nhGl5MDccTZ7GteFF8GMmMx0kfE4CzPGDTnlolOM2IHEb+V/kOPQVy7jk3AN9HWEfZyXWbnWS6NvsdRYBqvMebSmntZFch9sMya1Pna1iaIbsv/9VeUwWdZiyRNhEVJbizcaJSK3jfDiKQVD3O7fI/yVy+My3dDZrFsKf6tNNZocnTPkgpqGezYMfpQWPMlW6CDwbK+TJDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v7fVDHlIsED8+zz0zg59BUef8pqBwerhK7kcix4DqIM=; b=QjAR1iAEiq1sLnMMv7f50z8V/iSAApb/B/e5y+ZegESnBu8Ei6oZvDP+XmPAVQiSKd/07vINOMhzpCnrXC7+3Bz1ziJImxZq6OgNc1fwT7MGyd+vdsMglI8erMgjamqHDmgsCWT7ZB2PnlywVAft3RI93qAPMnZp2WaZeK7kywg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OSBPR01MB2776.jpnprd01.prod.outlook.com (2603:1096:604:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 1 Jul 2022 05:18:29 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:29 +0000 Message-ID: <87edz5s95o.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 3/6] ASoC: audio-graph-card2.c: remove pre-alloced Codec2Codec space User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:27 +0000 X-ClientProxiedBy: TYBP286CA0048.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::36) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 691b535f-6fe2-4eae-23df-08da5b21211f X-MS-TrafficTypeDiagnostic: OSBPR01MB2776:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GYAAsMJipy1ISRssqTW8UN6AYggRo77LoXpQ7vfKDzSgWE3RVVk98wbyhX4msF3buzFcnuc91H/sqwc7uu6jlS/Z/dnYRcbXZIOJJcb4QqwJRPHXSJP/LNkXnD0RqbtLJEmbeAf4C/5YXkuDvEYfk5/98nOY4B/AkzB5LR9fwAJhx7vQC2J+hDYmyFFAdJzRbEM76MyFu86amTKaP60x/TR8vhWiJ19vu0F4EcwNfzrPafdg/hnY0hYY8hNJR8m1zKBRrZ5MebgJWXZA4zwXFacW/5nSDIyTkVI6dlFw/kFv9pChXXDiNuY+M21RE0l0gplHl8AC5PoU+auz+eIty/CgmDszhdENF1x/FVn9Qt7ttSx7zpFH8WpWafVYWMzRy4mObKmSV7fpVO7B0n/wMl5H6VUXP0wDOAgd6Q00q7nHQ0wySKgAuMxHkG0rQRBYlanhMpP0el74VgqgeqNCXcOMaCngqPbnmKV3Jkw4pyH6d2lcs5wVKtMxZShFuDN0gZKt/6YOGT5IgQESck4JWIDRu+1Fpv3LIkPImpeGqm332/uMNicZ/TsOJZ8XwtR6ZoFwLoi+zG4sfXE3FT0qUsmOkwmHz/ke/t22+K5Uv1Lqvj+G0wAEoR2WRITaFbUTNqBdEiWAfMhgJvV7OSTsTFMigXOSQ5j0p7u+y9geolmyNXcGVG2Xv+TbCZwGrqLJdu5+7s2mmjQRRQ6vuP9GPBObwRj3wY3pbWxFfm3HbR728AcHltSAu7fGqBEbwS0mFsgFKJ5U/9D0Fp1YV2AoKPwgriZxhqixSHvZJA4ML+wDCZuoHLtwfXSzVNjyJ0uo X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(366004)(136003)(396003)(316002)(26005)(38100700002)(8676002)(41300700001)(38350700002)(6512007)(86362001)(6506007)(66476007)(66556008)(4326008)(478600001)(6486002)(8936002)(83380400001)(52116002)(6916009)(66946007)(2906002)(36756003)(2616005)(186003)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SoIENJpkrc851K7U2Lj7Od3PmkKIXkH7pITS4HvWUOFBwBJ+E/k6FTIN0GlUQip4UNXMRi/vbfCCcvVSXlP4fqm3fpEVpoUJx9o1dRNZqAE+7eTwtFBAfJoIs+6jUhJmpbTqkUCvVf7k2jQzq/IZ3ljwSDGMyYAeBSj7o3lPVb2CqOfnwVC+1Piu0eGYXh3NFbmZjVd+PGkgOQXMqyhJJJ4IAZLPDGkrmy5K9u6FjC/lpfp0Vq6oxkwWrjgxnkF9o2VhyMzcbGtjzXr3kul2EKQWHDImHCsnBQWNMvZlyvMHGNr3TJnIepCBJvdxR3sIK8asfPYZgxL/IllxWDYya54c0M4OqVwHLSeIRLW0cnwvf8pAj3Md0a1S2UWOGDsb1Rrg/HQO/lmWudocBWnOWo2no8sWJSm50pwDuVxUaYjbGjZkMPIPtQYIekKPb0x+sPs4JjYja4Yp4GxWVNH3bCEznZtm5EVJO3lWsEzjmuvDoRxqubniF2XXmfmv9FquQjsuk2PoJrlBp/yDTLR5ORltgyuBtDvWaXarXxW1hBPrquO0avpM0D0DTm3QYIdmhY98Ck9aLViOkFNRGLwjcm4JBI7PmBWDeL8V20x5Duk9ny2Jf1no1QkF8Nshh3QdlFyJEGIGQH5+PpIkNQeOzi9Ddlz4wrIHKda5W5IVH9KMJRCBz1eapFcTImUGPkDVgx38PWPX9Gtajvc71XPgqZxmdqAY7R6ISh6b2hgcInywYia1b8yZrKVgdsxknYwKh/zWjJaXQ9rprsxuTJ52veMvFy8gsq10MADOcgUBFjD7fnL10Qj3GN5pmiynx4M9POk0gGeneVc3YmYQtA0LBAtAdA9Mf0Iazh2Uy76H+aBzdaETDecKJZI0Uk7XpLKtlUK2PSyQOeNl62Q53YHsxzDlaQ9UxwD/bF6xH4adO+7UrjgoLgwnW9AB5+b3H6dzZQT1gXyqfk2Cmrp0PzhxYayoG/Gq9HzfpV6pgI18E7Km9W/McaJuR5CuGBQWgQFJKCeYwEogNvsIXtlq8dlX60txK9Iyp4IOk5IVIV0qpZtKZScqS2InJKMqp6CtEIVhAKdxUrodMFUAKyIdIqyqVjiWHP+bIwUVWL1bl/7Qht/LXdTClqmDL2nS8p0QPXyKw9h5tc6eIiAAiXJTpv72Z5PUR9i/Erjo1UJAVKHgp/GBuOmrU2VCkvNnSvcoZ2P8ilEQKJvKnMvkUsCCLG7t3NLl/HQvZZiBVqgLGp99AAqU5pgfVT3eMly0/PX2mPnSjdu2TU+jeXoOirLrSVmbgxEwl5oelZitYzhJ+joRH8ZXmrhIJDVaBjPEjAj+LsaMZMSZ5ISnEClCUnRvcOOb7NVmJax/w+pS7tqEVdhAqU3w9hENqhHNWTTZ/N/OO7w0SLdiYQjhUIWvlocnT7SoJRf0Vd6BzrI3C9djvsFGKuegfK7ghTvhn6jeiCRN4JK29hy0kQ3ZhWvV4qiBJbR+UwKaFR0mZGehgStmldwpos7d8lV8k0gHMQNgddWhmQ7LpS5jk3KSEvzytzQbHRPxrqs/LB/BMH/0pDgwlVr7YRCjJqw4Dl5/7u67GCJ14TS3TBkcDEsu7LHK/EIMSahZZHZu4/EI7xPRUB2hBn1Yz6s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 691b535f-6fe2-4eae-23df-08da5b21211f X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:29.5500 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: El82PPLEKDIi0rkJSbL/phuSFXkdueU/w9CODjdcAQSteoD30ZUWGCGw1PRn6bR3a9wOP5D4KS1QR0sGV8omyJsX1eDYmu+FOwyZnLamWt2K9ChZsLj3+SCviJLl2EAv X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB2776 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Because Codec2Codec settings becomes optional, we don't need to keep its parameter space when init time. This patch removes its default memory allocation from simple-card-utils.c, and allocate it at audio-graph-card2 ondemand. Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_utils.h | 3 --- sound/soc/generic/audio-graph-card2.c | 10 +++++++--- sound/soc/generic/simple-card-utils.c | 18 +----------------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index fe2337fde1f4..ab55f40896e0 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -51,7 +51,6 @@ struct prop_nums { int cpus; int codecs; int platforms; - int c2c; }; struct asoc_simple_priv { @@ -64,7 +63,6 @@ struct asoc_simple_priv { struct snd_soc_dai_link_component *platforms; struct asoc_simple_data adata; struct snd_soc_codec_conf *codec_conf; - struct snd_soc_pcm_stream *c2c_conf; struct prop_nums num; unsigned int mclk_fs; } *dai_props; @@ -75,7 +73,6 @@ struct asoc_simple_priv { struct snd_soc_dai_link_component *dlcs; struct snd_soc_dai_link_component dummy; struct snd_soc_codec_conf *codec_conf; - struct snd_soc_pcm_stream *c2c_conf; struct gpio_desc *pa_gpio; const struct snd_soc_ops *ops; unsigned int dpcm_selectable:1; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 510058c47a92..19e31d53422a 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -888,8 +888,12 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, */ of_property_read_u32(ports, "rate", &val); if (val) { - struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link); - struct snd_soc_pcm_stream *c2c_conf = dai_props->c2c_conf; + struct device *dev = simple_priv_to_dev(priv); + struct snd_soc_pcm_stream *c2c_conf; + + c2c_conf = devm_kzalloc(dev, sizeof(*c2c_conf), GFP_KERNEL); + if (!c2c_conf) + goto err1; c2c_conf->formats = SNDRV_PCM_FMTBIT_S32_LE; /* update ME */ c2c_conf->rates = SNDRV_PCM_RATE_8000_384000; @@ -930,6 +934,7 @@ int audio_graph2_link_c2c(struct asoc_simple_priv *priv, of_node_put(ep1); of_node_put(codec0_port); of_node_put(codec1_port); +err1: of_node_put(ports); of_node_put(port0); of_node_put(port1); @@ -1093,7 +1098,6 @@ static int graph_count_c2c(struct asoc_simple_priv *priv, li->num[li->link].cpus = li->num[li->link].platforms = graph_counter(codec0); li->num[li->link].codecs = graph_counter(codec1); - li->num[li->link].c2c = 1; of_node_put(ports); of_node_put(port1); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 7be84c7840cb..a761af6b13b6 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -746,8 +746,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, struct asoc_simple_dai *dais; struct snd_soc_dai_link_component *dlcs; struct snd_soc_codec_conf *cconf = NULL; - struct snd_soc_pcm_stream *c2c_conf = NULL; - int i, dai_num = 0, dlc_num = 0, cnf_num = 0, c2c_num = 0; + int i, dai_num = 0, dlc_num = 0, cnf_num = 0; dai_props = devm_kcalloc(dev, li->link, sizeof(*dai_props), GFP_KERNEL); dai_link = devm_kcalloc(dev, li->link, sizeof(*dai_link), GFP_KERNEL); @@ -766,8 +765,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, if (!li->num[i].cpus) cnf_num += li->num[i].codecs; - - c2c_num += li->num[i].c2c; } dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); @@ -781,12 +778,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, return -ENOMEM; } - if (c2c_num) { - c2c_conf = devm_kcalloc(dev, c2c_num, sizeof(*c2c_conf), GFP_KERNEL); - if (!c2c_conf) - return -ENOMEM; - } - dev_dbg(dev, "link %d, dais %d, ccnf %d\n", li->link, dai_num, cnf_num); @@ -800,7 +791,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, priv->dais = dais; priv->dlcs = dlcs; priv->codec_conf = cconf; - priv->c2c_conf = c2c_conf; card->dai_link = priv->dai_link; card->num_links = li->link; @@ -818,12 +808,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, dlcs += li->num[i].cpus; dais += li->num[i].cpus; - - if (li->num[i].c2c) { - /* Codec2Codec */ - dai_props[i].c2c_conf = c2c_conf; - c2c_conf += li->num[i].c2c; - } } else { /* DPCM Be's CPU = dummy */ dai_props[i].cpus = From patchwork Fri Jul 1 05:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586884 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6232DC43334 for ; Fri, 1 Jul 2022 05:20:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6F37B16A1; Fri, 1 Jul 2022 07:19:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6F37B16A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652823; bh=wM1fpiHKwvk/e3CNfppoKkBQUw/crB6n/f1t9XhHpC4=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=WX0NIpJEW+I9IOkVuEq7YlV+s7CmGpKAzMUCSXVL6LBCOIp3iiUcumAYjEHooT7Yq +zt/+JPhDgxleB04/0P9tr5Njq90fEIh5F6ouMCaodFxazcso4xeRR3RYrVI4Xbluc ig2gWCgSDaHp9BrUGlEIwze38+azIRVU9i0SdHbw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 72DB4F80544; Fri, 1 Jul 2022 07:18:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 62262F80152; Fri, 1 Jul 2022 07:18:49 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2130.outbound.protection.outlook.com [40.107.113.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C767DF8047C for ; Fri, 1 Jul 2022 07:18:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C767DF8047C Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="JH8ANfEB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=noQSApzN79Hm/QuYNmkX2wJfKnBhVTOcK2RQYZYqkT/Bp79SVT34/awJQd5MPEB0rVS5iCIuXWdGmEuIwshWUR0Y9xb5hL6h3S75OV2Gxf0rQRYCsOComEGTUfQn08oxMvMUwUIvBLmtJV8rdKP0xP/AbFYp6W8OxgguEwXXL3Vx/lo4EySUkS6a/xe9Q6aLMNW45cACzZru/FGu0wqywVcWbTs9b0xBsuJbFBirUyRxFk5wJCGeOgmMSxLgtzJwDxnZDYHfwzqpE32Xc839lwtUunAsnmExlROU4kn7IFKX2LY1VG6HgeTr+jOU/B63yGqUWVkbAWS1y5rOZwJlfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=koknkcwlOh2Je91vYUIN1LSLDgcKSdtrEMkhqKFoWK4=; b=nPJpR2uV1Ki5hC6K0udQSj7G+8mLcVydKFYCijWyUJ9SgdpLowZoM6ASMNZ4xGCQZT//lrdXWHVygD+j+rFBgbct/F3ge9wbMPUdnwzAue7i7QZ9sFm8nY+g1KuhSkdErSMoPGEFsi/dnvSXkV+5qT4KGV7kpzQ7uXD8GVwi/yXnf3ZpfP7/P8IqAuMjuck4OTTYB4QnvfXUZCyC0EWPNXzP7K5qgtU7nrRou8KrhtPaTTbdhM/iWzMfSclS0SbPiLWcM8fUZ2kQxmep8v0hwDtJM8RplRkafzVi2wMzm/WwvGXB7dk+SG3daJd2Ad5BM146YNv026KHxG48olGhog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=koknkcwlOh2Je91vYUIN1LSLDgcKSdtrEMkhqKFoWK4=; b=JH8ANfEBOirrdln2XbYy71fbfwEv++ZL7gwf57H99ocqghr2qC6ZH/24WamHb8pqmbiennCL4eAQMOLas7NW+TNoULWSOSkGk9EikHU/Z7iBrShZFDyWQjrA/y2FfoBt9d83vuxI7Luc9QenOYFW97YzDPGvwciZ3hMnFTenGPw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OSBPR01MB2776.jpnprd01.prod.outlook.com (2603:1096:604:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 1 Jul 2022 05:18:35 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:35 +0000 Message-ID: <87czeps95h.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/6] ASoC: audio-graph-card2-custom-sample.dtsi: add verbose explanation User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:34 +0000 X-ClientProxiedBy: TYCP286CA0070.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::14) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94041c79-d748-42b1-49d5-08da5b212574 X-MS-TrafficTypeDiagnostic: OSBPR01MB2776:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8QLjQrHAdR84YeGQZyd/w20+7LLnBuU2zGlcpdMCIzujhBsqIxXjdiahO8OSwm9NbQa7WsuCujVtj1f7IXseXa1A9S4kZ7qQcleQWqp2TxjmpEsYIjmm0vSNLJa5UTjn0iehViu+kbIgM0p053wPo+ZsWLDudWT5InK/ZkZN7AXCMGE8uQpQmManM73cF0G5v3a95+LDGuNXuQ06TJHq75JYfs+2GJ/y5gUtnyVnZOho1kaErYLPi3IiO/+HRBweBafryXC7Yg5KcCR1z81Umc87shGgC2Lh7lMvRbOvTnxnvj3/ReQuO4PDE+kUabkCFHBFYUAdpK95U5MMXYR/UhtuF3Uu5EkFFec63O3TN75cP7VM5OQAB9eoPB0DK2mJWK1xu97MlC2nt1ktiaxNaabluLhO7rWDut417pEKuW4HiKOoz86MsA9ptYEsxGeyImI19b9Mf2mvdzuCAu9uGCiuaitWjO/ASSeRb+f94zmiCzN8rkk+Vv+S3quEPzmwN0V2iavFbLDFL8reptRaIzn0YZ4CY3OePo5L52z6EApBChFR0jDOZVEew3XtSeaVstiT0zJs7aMqGtITsWAqqQ5VpbldfgIeQrq81q9AWWnXSdaAc49yKpQYWlQlPW/u4dGylbMW06xx1MWpqM6xGUaLd2BX7COcm4cEYqx0MQmU36wMuzuXJ2HNfAHr3y9RAvUDs7z2B3sMz7JGgCKDCdU6cJ95VCkkzr9sp5Jmrk6ufqW1ityQGhFj5JIP7BdCLFb6z9Lgk9wRXIgLsZTPsnt3STcQcSNDf8gIdbTExNZ5+c2TAjtS5fpMota4JKNZ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(366004)(136003)(396003)(316002)(26005)(38100700002)(8676002)(41300700001)(38350700002)(6512007)(86362001)(6506007)(66476007)(66556008)(4326008)(478600001)(6486002)(8936002)(83380400001)(52116002)(6916009)(66946007)(2906002)(36756003)(2616005)(186003)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FTXVzXUDkkcp7E4+j6aXXJH4MGdwr3kQ4Ppt6/n8Bjdx4kjXSagBVbIECaGJe9xQfGg9js3T9iiw2dLtIjbATMmwMF6Mb7B6agz39fnO+nJEs2/wj6dVnqcvkhBZLiBk5O18+BQkqTnJbeys7ZJ+SvScXZjjqXScIQgSh0YOVC8c6UE1b/61/lDB2wpDrxuhsKFHAMOe2dcK7kYHV/H4MV0erRuEnS5d9oz6nTBBp5B5qKMLIS5zPFbuZaxo+g96U3Dp3/Jf/5QUwWG5lJk5AP9Ege3zDMLDSXY0yDlc6u8NTtaC+1IWZ9UAZSVKcsGGRQ82LduG8YBt70y1Fc5PVryY6UCLvulp1OuEdYFakreGh6fkZZdrDYgfOayFTCSVTzMiLXuPxw0TPDDtCIDPQSQsJviDfqzhzSWxzMijgY/OvjzHERW6/yuKT6OxwbZqiBsthSVANWDqTWmCUyiFy8nRblEMNdn7dk6+U8UYvBY5f9xa/zD8GL+aRi2uUdB5pmGat9f61vgcq9/YN4w1DzBH4mqXFSkn4/Dtq4Hi5Wzu1L+mF/i9peg6P+QBKnDh043SEa6dV538n8vs3IPl1qVQ1aYSYmAeTQucdn5WH1uXaIT86kaybU8lTKNVLTfbN5l1g1sG7iQ6vzGMua57NgXbiRo5i/3QyzW6dHrqbz+29Q7lbnUBay1jFB+xZnxGWIE/x9uOFNBJOJ5ynEdD+0kGpo4GvFiKcjsRl+bdf1TOZg+EVd4STmEMcI4c7k99iO7vuSplDomyyEPwFV1em4w5TER40mnOrksvt+cekT+t+HZeZF9JYFvR96jmxd61rKtoDVTeCcBi4vS1/fE2spMdGL274op4ptt65Jhr14dSkrq9OZ6MbttwtTBKit+mYtaBWZnxDDEztZVTPcYdDRV2i1ZXDGTfB2C/gs6mlgiqB86uTXwXTh4lyJ8Jj/1SXTFrsyJjw+83xgKc3G/5LqHiXJuquY4vW8jk2682jRtGdq/RLbO638LRSNQ1Q7lQnqJi+I51i6vw100MVT0hnae6REZ4E3Sdum3XWfwqVWME5np/UcCjx/ug8zCEiCFo6wZa4HOV1eF6cyW3UHgYXP1hJhTFxJxJn2LaNO59/8sDIlvyanv+rxIqjV5lTNP7ihWqNgEKfYIlETEaeoK9iw55nKJYq9rZ9i7Wafx+A4fzMQplzU2p9CmDipmqN/+kMmjG7g+mQmvA01qVDoSfCrCch1l5xF3Z5NrRZiZd0DEsBOZTn9gC8QeKuWEMftkXkMOhKyPiZy0O1fXftyK6OvXDqqN3/YwBqQtvIOwoNcwt6XoLCBWOewKYZx7AAj7etGU3bIATqVUqPfqpshrPnPqGejFBJShJgRSPnXN0eN2ZmljMk4sgHJjZ2OiRLLq8RatQoFBOT5M4uDfdBGpOutqUhnYllAKEHj8CuetydEIHUzqsmBxcReN48LUHFXwsdAFaTG1liWtNarB71Vk8Nun3MlcuuPDWqUfbhJkHdmJ9kkHvc08JrkvrTZ+qmkKw+S2Gib1DvoIcw5MQ/wosTfESpLFHDMT2gMtF8+JL5SngSiRqHnJiDhCLILfNRJa9sEUmptGSP8LQga9wIivaGajk6nLUujoIKR+nT5n1u0s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94041c79-d748-42b1-49d5-08da5b212574 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:35.1941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KMQ2Q2w/0b+tBYh5EuzF9ikuFbg+ykLgyeEi7P5CaNnIhthXXI42MD1Az6W0/1eejk+Vu1DANGLu/ELgTtIfqd2AfWxilZxw6TrkA4qfj85lUCV11LDPs/gAmDQZ0/Gc X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB2776 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto audio-graph-card2-custom-sample.dtsi will be used to test Audio-Graph-Card2 behavior. But it is difficult to say that it is easy to understand, because the comment/explanation are not so many. This patch add verbose explanation to it. Signed-off-by: Kuninori Morimoto --- .../audio-graph-card2-custom-sample.dtsi | 98 +++++++++++++++++-- 1 file changed, 90 insertions(+), 8 deletions(-) diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi index 053d987a1fec..fe547c18771f 100644 --- a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi +++ b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi @@ -17,6 +17,23 @@ * CONFIG_SND_AUDIO_GRAPH_CARD2 * CONFIG_SND_AUDIO_GRAPH_CARD2_CUSTOM_SAMPLE * CONFIG_SND_TEST_COMPONENT + * + * + * You can indicate more detail each device behavior as debug if you modify + * "compatible" on each test-component. see below + * + * test_cpu { + * - compatible = "test-cpu"; + * + compatible = "test-cpu-verbose"; + * ... + * }; + * + * test_codec { + * - compatible = "test-codec"; + * + compatible = "test-codec-verbose"; + * ... + * }; + * */ / { /* @@ -101,35 +118,74 @@ audio-graph-card2-custom-sample { "TC OUT", "TC DAI11 Playback", "TC DAI9 Capture", "TC IN"; - links = <&cpu0 /* normal: cpu side only */ - &mcpu0 /* multi: cpu side only */ - &fe00 &fe01 &be0 /* dpcm: both FE / BE */ - &fe10 &fe11 &be1 /* dpcm-m: both FE / BE */ - &c2c /* c2c: cpu side only */ - &c2c_m /* c2c: cpu side only */ + links = < + /* + * [Normal]: cpu side only + * cpu0/codec0 + */ + &cpu0 + + /* + * [Multi-CPU/Codec]: cpu side only + * cpu1/cpu2/codec1/codec2 + */ + &mcpu0 + + /* + * [DPCM]: both FE / BE + * cpu3/cpu4/codec3 + */ + &fe00 &fe01 &be0 + + /* + * [DPCM-Multi]: both FE / BE + * cpu5/cpu6/codec4/codec5 + */ + &fe10 &fe11 &be1 + + /* + * [Codec2Codec]: cpu side only + * codec6/codec7 + */ + &c2c + + /* + * [Codec2Codec-Multi]: cpu side only + * codec8/codec9/codec10/codec11 + */ + &c2c_m >; multi { ports@0 { + /* [Multi-CPU] */ mcpu0: port@0 { mcpu0_ep: endpoint { remote-endpoint = <&mcodec0_ep>; }; }; port@1 { mcpu1_ep: endpoint { remote-endpoint = <&cpu1_ep>; }; }; port@2 { mcpu2_ep: endpoint { remote-endpoint = <&cpu2_ep>; }; }; }; + + /* [Multi-Codec] */ ports@1 { port@0 { mcodec0_ep: endpoint { remote-endpoint = <&mcpu0_ep>; }; }; port@1 { mcodec1_ep: endpoint { remote-endpoint = <&codec1_ep>; }; }; port@2 { mcodec2_ep: endpoint { remote-endpoint = <&codec2_ep>; }; }; }; + + /* [DPCM-Multi]::BE */ ports@2 { port@0 { mbe_ep: endpoint { remote-endpoint = <&be10_ep>; }; }; port@1 { mbe1_ep: endpoint { remote-endpoint = <&codec4_ep>; }; }; port@2 { mbe2_ep: endpoint { remote-endpoint = <&codec5_ep>; }; }; }; + + /* [Codec2Codec-Multi]::CPU */ ports@3 { port@0 { mc2c0_ep: endpoint { remote-endpoint = <&c2cmf_ep>; }; }; port@1 { mc2c00_ep: endpoint { remote-endpoint = <&codec8_ep>; }; }; port@2 { mc2c01_ep: endpoint { remote-endpoint = <&codec9_ep>; }; }; }; + + /* [Codec2Codec-Multi]::Codec */ ports@4 { port@0 { mc2c1_ep: endpoint { remote-endpoint = <&c2cmb_ep>; }; }; port@1 { mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; }; @@ -138,26 +194,34 @@ ports@4 { }; dpcm { - /* FE */ ports@0 { + /* [DPCM]::FE */ fe00: port@0 { fe00_ep: endpoint { remote-endpoint = <&cpu3_ep>; }; }; fe01: port@1 { fe01_ep: endpoint { remote-endpoint = <&cpu4_ep>; }; }; + + /* [DPCM-Multi]::FE */ fe10: port@2 { fe10_ep: endpoint { remote-endpoint = <&cpu5_ep>; }; }; fe11: port@3 { fe11_ep: endpoint { remote-endpoint = <&cpu6_ep>; }; }; }; - /* BE */ + ports@1 { + /* [DPCM]::BE */ be0: port@0 { be00_ep: endpoint { remote-endpoint = <&codec3_ep>; }; }; + + /* [DPCM-Multi]::BE */ be1: port@1 { be10_ep: endpoint { remote-endpoint = <&mbe_ep>; }; }; }; }; codec2codec { + /* [Codec2Codec] */ ports@0 { /* use default settings */ c2c: port@0 { c2cf_ep: endpoint { remote-endpoint = <&codec6_ep>; }; }; port@1 { c2cb_ep: endpoint { remote-endpoint = <&codec7_ep>; }; }; }; + + /* [Codec2Codec-Multi] */ ports@1 { /* use original settings */ rate = <48000>; @@ -180,11 +244,18 @@ test_cpu { ports { bitclock-master; frame-master; + /* [Normal] */ cpu0: port@0 { cpu0_ep: endpoint { remote-endpoint = <&codec0_ep>; }; }; + + /* [Multi-CPU] */ port@1 { cpu1_ep: endpoint { remote-endpoint = <&mcpu1_ep>; }; }; port@2 { cpu2_ep: endpoint { remote-endpoint = <&mcpu2_ep>; }; }; + + /* [DPCM]::FE */ port@3 { cpu3_ep: endpoint { remote-endpoint = <&fe00_ep>; }; }; port@4 { cpu4_ep: endpoint { remote-endpoint = <&fe01_ep>; }; }; + + /* [DPCM-Multi]::FE */ port@5 { cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; }; port@6 { cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; }; }; @@ -207,16 +278,27 @@ ports { */ prefix = "TC"; + /* [Normal] */ port@0 { codec0_ep: endpoint { remote-endpoint = <&cpu0_ep>; }; }; + + /* [Multi-Codec] */ port@1 { codec1_ep: endpoint { remote-endpoint = <&mcodec1_ep>; }; }; port@2 { codec2_ep: endpoint { remote-endpoint = <&mcodec2_ep>; }; }; + + /* [DPCM]::BE */ port@3 { codec3_ep: endpoint { remote-endpoint = <&be00_ep>; }; }; + + /* [DPCM-Multi]::BE */ port@4 { codec4_ep: endpoint { remote-endpoint = <&mbe1_ep>; }; }; port@5 { codec5_ep: endpoint { remote-endpoint = <&mbe2_ep>; }; }; + + /* [Codec2Codec] */ port@6 { bitclock-master; frame-master; codec6_ep: endpoint { remote-endpoint = <&c2cf_ep>; }; }; port@7 { codec7_ep: endpoint { remote-endpoint = <&c2cb_ep>; }; }; + + /* [Codec2Codec-Multi] */ port@8 { bitclock-master; frame-master; codec8_ep: endpoint { remote-endpoint = <&mc2c00_ep>; }; }; From patchwork Fri Jul 1 05:18:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CF75C433EF for ; Fri, 1 Jul 2022 05:20:33 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4C97616B4; Fri, 1 Jul 2022 07:19:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4C97616B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652831; bh=3jM91X5G6c/6Z4bjJNhMXb949YHqLQnS92p13iAHjC0=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=EUPAvbQcGbdpfz0cn05NzEKO8ZgrJJz5LCCSMRFiKlbmZfzMH51d0Q9c63axAEerA QdJCmjx6WuuiNXjIjXnaD5gXJynDyIiguQEeZPqJVikB4GaX+vpBIb72XtI4Sr2Owj l/UkvDCCV2fG+ii+J14Jo+m36vTXBMysncYrdd9Q= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 223CDF80155; Fri, 1 Jul 2022 07:19:01 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 68ABFF80553; Fri, 1 Jul 2022 07:18:59 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2106.outbound.protection.outlook.com [40.107.113.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E742EF80549 for ; Fri, 1 Jul 2022 07:18:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E742EF80549 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="cUvwTJy1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kWzcnLh+uAy3IH1yN5sNmnLg9u0bD67pouT09ENCSjoXpYHjax1z0rQejSmV5OOplMsfSSuhga5U4JAnKNrw9mwuxwjiH6EHU3QcHa6LdBHq+iARm2Ce34REI+wuYQwWsk53eqQHSvJB0gSy2kjTEQFbA4ZJ0DeD78eLTwlEabpdiTGfh4zb9NhlGVuHkh/c7BJOoYfG0aYrtwd51tcvOMX9npdfMcUl4hPudF1fW4rDLP59zaHbT4lIB6VzxemXhIkm287WlASPrmPlaLPbNuEcEypqaTpEPgiMaDCkNHtH1q0nV3JzsNachBwiB/geQaaS3vXobS8VRO5BLVqNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lyEtuBDwwNDW5RVymBxDkUQhMCz/WmnBGTMVXv1Js1U=; b=LZD87C2vMPZH1LATDYSTo/qLRZiIliHFv31awjvDKhgSTXppzPm+nBqPnNzOIBexFN/M6UPqm9Zbzeqn7vWRsewUOKnJ2LKjVKuh2lioxMksEOfSbG/F5l5LareiFjjxAgP9PBjmWCQAXxZ+ek5DdQWRZOirWl1nWICyiAWpA9UF1/a1ydHbdb2VvkZKJdfKicTDS9aJI7zRvbnm3QtnFt73SPOpoNbXm3l1Yqam5NNfScxAAuo9zir7g15gOjD+qj1cb7YVcTdoCh4x7WG8koTrLkRQiXYxHb7B6T7pX3LIXAeNtESWs7AZCQmkBJf+G3tWxgyfc2GnU0esgchFfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lyEtuBDwwNDW5RVymBxDkUQhMCz/WmnBGTMVXv1Js1U=; b=cUvwTJy1vCVbdcDlSI2X5uAs9dU05Ku9ywaZmB/r2had4u2K5BppVZJqP3rrnvuZpM+oICwd4hh8bX8o4Sc7GIc/KLRQJFimWQKemTfjm/QuC5bAWRlabG20yaJP+/jvD80hGOexH8DOhhp5L5jKJ2AjibEIXtS5P6El9ZXUgMg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OSBPR01MB2776.jpnprd01.prod.outlook.com (2603:1096:604:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 1 Jul 2022 05:18:46 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:45 +0000 Message-ID: <87bku9s95b.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 5/6] ASoC: simple-card-utils.c: ignore Codec2Codec setting if it already have User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:40 +0000 X-ClientProxiedBy: TYCPR01CA0128.jpnprd01.prod.outlook.com (2603:1096:400:26d::20) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ea73e24-8531-4b4f-aac0-08da5b2128d3 X-MS-TrafficTypeDiagnostic: OSBPR01MB2776:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I2hGgDr2BX5wR2TWV2ybHDWgC/L8+FrtHRmWAyy1/kyEOa/VC9KxNTsRJt9R21d+ZCfPchDN/5sJr9VSBgEho5Jxvk7/TOgdmKdPXmVzPw8HbRvMMJpx/M1H6XLOWEeU3OUuprnXL1c/j1Oq9YqAfsuHtrigKvJ4dM3S12tGy/VVnrFd+yRpkZlPHhv3ZWNtjf4f7RzwKKIOpt3kg9C20O+L6EYLfMP77MlpvcPezzm9YKs2BPTg61xOe2LEFcqpQNCOQA6xqgpGRwspIsc4xnpFoSYx6W7EewtpWKf945NZahNZs0dRnUG3SvFdLH3BEES46vPh9tez+gfCBHiRArvNiOECXWWoVYehmHb/yj5j5AktrvMLBhc4IjHKsMtquRHn17iriTRqiUmEQRDFTR25OqryrlUgVRcY6EZS0Xjnyhb8h+ipcuR9g1OjWStwnfaF2NzXpBSN4qvM/Mz6/6WjYqOnN1agXouTIRg0OyiYdAP9t6B7mc9HvBAerI6J6jbgBxG2cmriqkYBRtUY3tQ8klfClWEoq/E1LKsOFuoab16C9C0Yl7KT0nWXdZYP3q5D9ZGdMq027VAyBVFpA1MwX6v22XCPrLHrVFqP4GZVS1BvZ+UISSG8HYJpc7u+G5bkxX9vIrbKsgFq1IHU/0kbfF89iQu/o2YdIK4rvsvrLneXu/g7nsF5yUXtH2w37kvIXnlDk15PibjAix9RsLcb+FchBtC9e6mvN8kxZRVpNn20PxgNybe95CouEVoAi1YhNZmKamguEbjSisWxAMUgH3fjlbxjWdrOyCe5fVe5vil2AYCT/iYIou4tMAe5 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(366004)(136003)(396003)(316002)(26005)(38100700002)(8676002)(41300700001)(38350700002)(6512007)(86362001)(6506007)(66476007)(66556008)(4326008)(478600001)(6486002)(8936002)(52116002)(6916009)(66946007)(2906002)(36756003)(2616005)(186003)(5660300002)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dnWIUm1epBpMEWsEp5Y1vrw/7VJ1zWbW+0cSS3faUNwk6DLNgifudN+8JxAewbDiVdhsaai5fZHypL3C2ZFdPh6HKklcI4kjHootraNe0yWudw7wv7PKAkdM5noS5CrxI6MM6jxaGicQ1NcYw8TBbrfnsDnraXzUsv0rwAki04Fk5QAoiozGMENlz01fUQWsZxKzhhQJsBFivXp7OHIul1AspaaYy9h7fiDetObpIGHkIWhCeT0w8gIvWuRZ0CzKPwcvAD2+yF350Fb1CTsjm+d0/FDSdZxKLdfGvMsbY8rXH5KwCjKSGshAv1cyuBztfcOC5qGaIFabjYQa6UldzJb9h4Lf2imFv014fca8j5KQJv+o0nlqZQKRJ1y4xfCB3Y0N+Zl1XTg710Yo29H6lHJ5v3apqyqjAynyRLQkgv+NCl1FBoOMJyTCGy13q3r9pzrTZCqXNgXfgANUfds2FBJrlUTz0fZAI45vBMLuupzENH8XDMznkMqAg+ydSKAAcCI1s9AJIhLoHWqhb0h1/waREjvm6W3GJdbZwKtLL8YC1UddS/clnplgP/NTTLNAK3lL0yQB+OzTWBTJp75BHPIdODJrD1c7Kv3qaUJZ1lfV4cXDJm+SvDsReQajrZJPrLK0q+bUMOnBk8H8ccuipQvI3EoSGWtGAeV2QdWQ+DQ+UdHnEYwgtiD6BslZumSntdYX0nZ8TTVCrxDszfMpB9pxps+dJOCxmunxsU0NRdn/3FrOzFjiTWIthudcKHTu3/xWsfrQHwJ3lC+vsQWIfXyNhL2b3GqZjuz5Zy0YsbYWib02eKwyxzBUqs/+6JFcNlY8G8wq73jwG4L6Ih3hjtHnOJmohaDmTY+XezyxnZmnVnqfLzZRizvfJpk1ssAgG/fYPCq8jkpTkzwC3LAUL8ujLx4LjL3adn/OhRph7aGgOsmxvwdEiV2vi0z49hpKIRomXYGG3RAjg/sHCoKgUsOZ4wsUHFTcrWNk5wkxssTZRe+iZawWBko+ibDReBQgK0qiavTj/T9T+AMULfJokfOwWl0vYEKP6X0Jc8ZP20Myx5V+8h/nN20716q4d2KjpXIrqE/AF1hrWcJYHWpvkJ7GgVFJIAWXj0pD+e6ZTSclcgQ/JuZ0LfPV0mYKdBosu5bUnxBTjDOBva83CH8YiW5Ubw2IDXo2mnoJsQ6/UslMxXHmpK5NjK4JzubNlCs4AE/FSRCwEhAXIiwFzq+4TWlBmfZinvighQVTV3xK+9wFDBKzdTX9pw1q87nbhAw5QC6CXx5nGDmbhDJInSsJkMcvafK3IiZvfYUVqNK8FYgx7gIKKkfgKmSOmcHz3DD6xQFikC/F0w7jl4SnRkwdCBbudUdC5BkYc2Zl2BNycVEoJmPeO8qq4TbaKdwl9c60eWhtYjOmLXJyV+CxJKSSVjF3N3/HCI+Y70Vlg9oypl0KSIZ4sGPl8HpxZqD8/KfskFt5XLd76JiVIIP7St7INl18bekR/+Zf2o9nqsrNnBgj5vrwyhG9sC5ZAiviTkDb09UBlG/5EoT+BUogUhmOQQ0UYZ0gLUEN8goIaTaVuh5NiUfBCUjwx2TSmcQCNjcbIqH5oPKgKcNZ9K6oNuSP6+bqnjrGOOK3yrDxgz4jHK4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ea73e24-8531-4b4f-aac0-08da5b2128d3 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:45.2778 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2zlUUFkGI7rdrwGejgAA6OHsSMcrHKCwZX4kcafva9s2M9MFIcfr1GMSQqmga4IaINJvVu/5PFeHnSWZAUGXXOhOzGLBgnCYoFWWk/udpFPCgv7eqsahxusVO5uX/7ap X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB2776 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Audio Graph Card2 setups own Codec2Codec settings, but current simple-card-utils.c will try to setup Codec2Codec default settings if needed, it will overwirtes the settings. This patch ignores default Codec2Codec settings if it already have. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card-utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index a761af6b13b6..b8a3da692ee8 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -527,6 +527,10 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hardware hw; int i, ret, stream; + /* Do nothing if it already has Codec2Codec settings */ + if (dai_link->params) + return 0; + /* Only Codecs */ for_each_rtd_components(rtd, i, component) { if (!asoc_simple_component_is_codec(component)) From patchwork Fri Jul 1 05:18:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 586883 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30777C43334 for ; Fri, 1 Jul 2022 05:20:43 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2350616C1; Fri, 1 Jul 2022 07:19:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2350616C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656652841; bh=zS7poFe2GuNBdtSvMSTwv+P/tQLwht0RR5u3CO1GCY4=; h=From:Subject:To:In-Reply-To:References:Date:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qqOU/UfqzdgNaF/vH0aCkNPmD3J4NPKvmAs8QGGFyvIqHYkMrApOJBgigGwVXY8G3 hfxN0vTbpZpFOXuPPynl7LC1IzaFDh7Dm9MpELY3D43d4ZXFVm+8VSXXa1MpVFujkZ FgIOI5w/UwWuuNbyUjD/HuzG12UHGvyg5ulz9FnI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A86E9F80553; Fri, 1 Jul 2022 07:19:04 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5285EF80557; Fri, 1 Jul 2022 07:19:02 +0200 (CEST) Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2106.outbound.protection.outlook.com [40.107.113.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7D9BAF80551 for ; Fri, 1 Jul 2022 07:18:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7D9BAF80551 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="WfGOvZdJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F7qJblV7Rwoufa9SSdR2sAfxqrsLrlJIFxts/fiEnUrjGplqJqExyDX0rNKwsxirHX6hGUUNKmGV8Z7j/5GHy9SM0a2bjNVKqrd+gZ7vcyFC0ZjMTHZs72GNDeLd94i88ZMYy4TU3TP62Ofm7PbtSEFQ76Y7tBV4/0VlrrkExVcd9fqvshW4OZTu7Wqea3FzyTMvHJJpmLhmL8tjWyqZOKGvK13hv2l05l+6YlodQO2P21Kg1P4w99v1x8gQJtDv3/RTQTqmrV/mkxKfGpzUExF/TGHnj+rZ0rovvk1cEEo//zttUZv+Wi5HLBv/5/cE1CQ8IFsZIGL1kVAgSXHbLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tRHTA/sgno1S/4tWke3KZ9iEqh63nqgyejN0+jsoo1Y=; b=GryhO8T1CCJw3Kzqj937EPvD9PLQE3brcvDkGDeFlZcDDyIJrKEi+Ni30vwEAcNBIWB3p1ftWUDHDGc5GOXMNoV6mUFZMAGKD8ZDi2G0udeDg+A/CX/rBIKLDQwOQpaI80nD0kpUGEOpz/KEGu6ZEVVTfCBjx6ZbiCpt0/XWD9IXjpqwQHMjfeuhL6EqWG15Xaw9YL0etS2a/j3viT91qk65DBXHLzbeDDXaBXY5DTG4KZMwOahLUvQX5M8aRmITKeNp8hM45RdHNUUj7eHcy0t/DGBqmcDKQorJCVknojXFdfYdCKuk0gLuNpDB5NUnbWys5SJ2LQla1PuZYUlWmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tRHTA/sgno1S/4tWke3KZ9iEqh63nqgyejN0+jsoo1Y=; b=WfGOvZdJuoX/MIOFYLCBkOFO6VBJ0kRkfARnIUZnuh1AswtbNDb3Da7VRS8G6hzun3k4IiQAk4kc02gUcwvhhdnZPXm/peOuw9mDy+jTL6/RjGQffsCS3n7v7eKqUbPLcOf7XGEAdN71y2rlDrnomJGv3Z54ZlzTGvGXK8tbMPk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) by OSBPR01MB2776.jpnprd01.prod.outlook.com (2603:1096:604:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 1 Jul 2022 05:18:51 +0000 Received: from OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2]) by OS3PR01MB8426.jpnprd01.prod.outlook.com ([fe80::3838:1a73:ae46:bab2%5]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022 05:18:51 +0000 Message-ID: <87a69ts950.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 6/6] ASoC: simple-card-utils.c: care Codec2Codec vs DPCM:BE User-Agent: Wanderlust/2.15.9 Emacs/26.3 Mule/6.0 To: Mark Brown In-Reply-To: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> References: <87ilohs96p.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 1 Jul 2022 05:18:51 +0000 X-ClientProxiedBy: TYAPR01CA0181.jpnprd01.prod.outlook.com (2603:1096:404:ba::25) To OS3PR01MB8426.jpnprd01.prod.outlook.com (2603:1096:604:194::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e43c29a1-b72e-4ed1-3f4f-08da5b212f74 X-MS-TrafficTypeDiagnostic: OSBPR01MB2776:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0A8/RASNBF3tHALARst4Rc2UUwqMhB3gwL4NVNWgOchoUbMHt5aYQZAj7bBmJ5168XFT0cCsOOvzO65Zt5aC3YxGuhb/grmW8qmlk+gq1kvox3bWpz7U325WpmvBundyChbK9w5JnqfBfbFf7vNqOvRx1pNZKJUi15BYWb+Bk8Iu5PtBjbVc1CTHt2tDrcxkiMOTYHUPthCni3t5EEUl1iKT9EaU3H7i6K5CkdoQ4gEqX925fioGbeiD+qVw/9UaRGXKxBxybaE0U0OlMDMkh/NexgIXTVRyyUF9s+6Rf8frlhh07lZtJmwlZ5Ni4XIxSwr2vGiDB7xHcrxExIx6LJ0nX0tjZp9RIcX9mYGUrOxRRjrADOtEJDOqR96thCTJuI8u9ZPRomUI6fzu/P0ZvjS2ZID5DckynKpO6FVBodCl4odfeWkEJ5Rqht1AYzccnXR8Ff/vWb15WxMRnCuZOy5wiGHRc5AKC5T0BUztfkJcBsWS4BbcI7aYQyxZCKe2IWMAjC2psP6E9Oi4+W2Q98zkk4fV6tRYMORN0ktZoeRwGzA/ZWXL0WYuWADAttSi3VvR7ZaPDXXKCiba5Y4dmTtJqqRVdTVDXyDhP130asUoWp3Y/ar6WCmbqVRGMwwW4ck3UDqFoFQ+aqhJiFjGrgPR2EXKQBSbGS6qaa5R5s3ZWL1jvZKS6ORYelAdiWqn7P6wO1aP2Oz4xoU2tOSZSkXSeaGo88oyfCvVnBkOiZvAj4rIEHNKhFQFb/hYy7cON0qrVqiBM4f89zGZ+3sjqC+Zw3eVxOoiPLzOf3q35C2tSorkppU3+wP50dZs4Est X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:OS3PR01MB8426.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(346002)(376002)(366004)(136003)(396003)(316002)(26005)(38100700002)(8676002)(41300700001)(38350700002)(6512007)(86362001)(6506007)(66476007)(66556008)(4326008)(478600001)(6486002)(8936002)(52116002)(6916009)(66946007)(2906002)(36756003)(2616005)(186003)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OoyUaZHKuE0NoztyvY6Kyb65Ip748BalD4RRhFTRfaJoMQg05UIfv7LZ8AH2iTNTe2DoT7QIO9W/8FGhTaO7/zDixWC6GDgqUDCc27YYeUb28GoYRjRrpVPvBqkH0fr2t0UnCDoL3DAo5mUyVcAzHEhX5hShjTjGKj3zAD9s+H+w83qMOdJtK8w8rPH4eCPz+dHhErT8i1ZvJHFwewzs4kgiQjV0YDTIQ93Io7W2LtwPE4g+NRRjqWJPvhNjn/rSfl1mkch1D26bzWesrcjtO0xsPxnV7atGZcv6fDMQqubRxfRu46q/e3hsGBpTGbZamSUqz9X04bRMYOtMFHBp9efcElw6C6RtTknbCHU8776Xsl9s1zqR5GHgFLT0oIrKrZ1qU0D4CqiEU6+XN1hv9Y5ZKJo7wn9IQHfJuomihSNaagKUfHKV0cAvlnh5pBW6hU0ekKMaWVqEXQY2dWsaEHLvrKyHZltKHCi8AR64erlSeE3W3F+jNGKdgHEJbLhaYpm5RMjiLCPmG5COzTAQDd2+/jXiGaslUdUt0aQDuD3jxJesei5ZliTkqdPnsbk755GlmTKr8aZctyQHZV5GgB5E8xybNYBWd4K6DY+ON2I1wj2gpFS11ChTxgOMZf1bP1RhDSWm5/MJyehqW4cuTUNxxqOJKBwvWCbOWMR7zIAttp0I+r7qZx1cn6HqqGqgrzB78bp2YzQ1NsJ4+Mt3FoHsy0f6JvKRAQu/6SEIJeRCz2l01f/Gf9w+z2BFuTcF0B2yUvV5eFryDrFammqd7uRANs1wQY0UQNAS/J+sRpr3++R7MDf59xL/t4eUlz9Qdgmnrm6JvDQocSHta/EZbsYx36B0xBwFTDBNTwWvV+J05O2DaxQAPBe+AIXPlTztmf8C6RPMgRP1M8voZmireSIBkcPZOMuXz7hc0LogHDkhJVwgjRtkNfHYB8Q+zzPzIaU4s1IQlV0BwRA4oxhduiJBU99imjQ3rc5ErLE0hI5rJEl9SDUayZNjZwh6trfZvnzQtOYI/E4PvnkVCN9j8PTz4ejNqrwdh6O1IcQ5H1FscdoJD02YLUNgLSbMywJcHd9RRUk4iKD9qiQThRFe33t9WV3AFiQ9wReSgJ3FZDKaTAfoQz8wKTXRL+doFuu47cjysJc80cVpqMyyEc3gLLFF6hyV+HXDrG7FwiRMeCzVfMJ2052Z2OrJjRU1LTILjy99XnwHL4t1Bkbt4jFtIBd4Ggh984QqJjHasAEz/V69P9AVIKDeqFoQQWR551Tw0rdAHolvbxWM1bVh4D36BC6oNKLm/PQ7SflfMv2Hg3yZJC3Bj24KvIpIiEWeXlBfEhys7Nc7AV6GJPEPm40Ovklpd5OlfEmJHYQRdcD0HtCEEqgiIK2K7D4oss5G4uky3g+Qc3/y0W8FnVZE9LVVgJr8SB7kiQ6sbX4wbbMP+972Gbuec3P6S6XcRjK9LsCAP6FLNLZV1JIn7Mpk/XR5x+56c3KyI9TlEf+QsQ5X2Bi8TY++5t1SuttmnVv+beQp4djetkgcJRsbavrI7ETVK0qOo680oX80+6bmU4TtuHoae9gsGKlCGSIUSTEK3xfHPxF01xxbhQ0lyfSH0+14hBeQ1IP5CQL3M6H+/UKJjP0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e43c29a1-b72e-4ed1-3f4f-08da5b212f74 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB8426.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2022 05:18:51.7198 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SEr0JUk5VR3exWd6egM14o+ZJ5nmztLbddURi1PpLEq9g5eN3yeQOsAW+HRjCfEmNNPmziqBFHnK8WiLRzMmtdqamTPVVaFSHXPoWeJdqI2CHLis38rEGKA5X9Ne0+3C X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSBPR01MB2776 Cc: Linux-ALSA X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" From: Kuninori Morimoto Current asoc_simple_init_for_codec2codec() adds default Codec2Codec settings if rtd was Codec only. But DPCM:BE also judged as Codec only, because dummy-DAI doesn't have "endianness" (which is key parameter to judge as Codec). This patch ignores setup Codec2Codec settings if it was DPCM:BE case. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card-utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index b8a3da692ee8..4a29e314fa95 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -531,6 +531,10 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, if (dai_link->params) return 0; + /* Do nothing if it was DPCM :: BE */ + if (dai_link->no_pcm) + return 0; + /* Only Codecs */ for_each_rtd_components(rtd, i, component) { if (!asoc_simple_component_is_codec(component))