From patchwork Mon Sep 30 02:13:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831603 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 2F789CF6498 for ; Mon, 30 Sep 2024 02:14:51 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 664A614E4; Mon, 30 Sep 2024 04:14:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 664A614E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662489; bh=KwbRFUYELC4Pf9m8x216R55WQ/yk0VdTLaKEmkeV+QE=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=rEg98pM9Aw/nDK2NPE9CREVnCpWAddk4LsgHfbtqesANo+KD+8xKh89mmZmXPzjbr qgvbKpx8l2NttWnqC4QbkBQ8yEzWY7wTeYVy1smaQrBKZnd2Dxk4eoqUTpbFAddpbg pcNIL2p7aOL88JfwIn6lepyKVXADinltQ1a2J3SA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C0B7CF805D9; Mon, 30 Sep 2024 04:14:02 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1469BF805D9; Mon, 30 Sep 2024 04:14:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 865FEF805C1; Mon, 30 Sep 2024 04:13:58 +0200 (CEST) Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazlp170110001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c407::1]) (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 74841F800FA for ; Mon, 30 Sep 2024 04:13:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 74841F800FA Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=K59cUqtG ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xz3NWv1H3MbfjHsM5eIPyc9StUrdw+PILGXsAZRPKQv59rn9/i50gh7nJsBVvh21QHk1PEtZ5fyK/OKOrZfYr8zqEnxOSn2k8MSaJdgkDU0B22M9p50qFSLAlNV9U/munjSN65QhujRjDX6+GVM8wPviXbI1ME5YE4HKxEbw+d9kj08kEjqh2ALOfb9TLZAGTSHUyelt0ET/lMBWXHPlilZHVjE4+WveAMoK3xsaEJotfTKo13I3KahtIu0iA+8XDmQ8E7VTVOFFiKmoaTO66xkTEJHpJvF9xBiygGcyK5qm14hYRv1UAhUjoVY/rx8f6BoSEkEfI0fB5IdL/bEBWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=8CXx41MjWsgOAv+6Mo9TpisGQAqREkYWXI6nCgFBTBQ=; b=Sz+npi+P8HUNrVOZB99og9pff5OyaE28hkKAyzF9W7dM+uJoeFVD7g09zuMKQqwillboJdLkjmH7hpLVyMWYgaNzOy+wSl3FrYhoapQbXgVI30dRCPIOArFD/xRZNjSv/xmVPD9WMkysxasZRmJqlVLBJmtoDj6I5e8jsW98fduVfeYJCwU/nSo63xID+5e04pNrEoe7ysWnsBGAHaQWBhI08yHhKLbisi/K6yi48ASF83UDZ1z0AoF88RPdNlzBi6lAx5pM3ZZQAa+N/IF6h36P8RS7B4DnHy+VP2PFiTXZ24XRy2fZcG7JSQOfNFpN5tadDv2m36kZvBt1VtjC0g== 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=8CXx41MjWsgOAv+6Mo9TpisGQAqREkYWXI6nCgFBTBQ=; b=K59cUqtGPZquwKb4mx5zRixWSAOSs5nTTR/sJQRH49nps+/O6UDOAv/eSwBreHc4+bkpomY8EVEyV1HPPT+3vQ2zGU2HCs08hu3qXpz2JKxfOC9F7/saGVmVhWoL8kFoMXtGUy7taZ5U1QxT8k6YOETY0gWtW2QQelWIR7ZowLs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYCPR01MB8143.jpnprd01.prod.outlook.com (2603:1096:400:104::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:13:49 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:13:49 +0000 Message-ID: <87plollwgz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 01/13] ASoC: amd: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:13:49 +0000 X-ClientProxiedBy: TYCPR01CA0057.jpnprd01.prod.outlook.com (2603:1096:405:2::21) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYCPR01MB8143:EE_ X-MS-Office365-Filtering-Correlation-Id: a0d09325-e53f-4291-ca10-08dce0f58583 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: cGgDyShBSURRGmeCvxN8cWIPghWP4Hi2PHU8ly8wDJ6YDsV/YPHoHX26EUmkTdFHt8jZfa/ljdO/FPh/X+SGKb0Ta2b4XaEYj58h9GxPboxF41yfzQNcmRfgoeg497zja5D7WJV81bb689jR7oFWkKDMktd48wEOzIKKG1+mlo19QNZgcDrhK2zzK1J6T2Zk9n0Cea35whqD7sk/FZ7JSPWmElPbHOmlghgp/xcY5KIRiFHAIRKZNOggXvh45CjZrEIfBrye8fpS+wtozz0dY32b6hTf4dJSisn9k02CVK+A7cw8EfMxLC1uMXKP20EhKGtlC4IpIx66wHmhemhTE9vVdneGJAEmx46970B9wIR5afXbWGuxM6wo7iZdhFPCdry9DIMXbBBRiMedMcyjPWLoli4aWHGXQTmvDNWZvjSxpbb+D+057EB4au9AoMLU2naRNvzDHO8hI+XO3fpahKaNvPF4DApdms53K6Rc52TO8TBvamvBOwpNiDGMY2QzjKj/3GA6O6oDdcpstz1GLLXUTbKbOYFQ59HRDpwPlk9YLsJE4rV94o9HfC0ovkOG2J/1hMqyJAElnzKJjXbutyTcLaC23Ul7mWshNdIr2ziOmduwIO6wvWIBFksxJlDy4UlSRCZ0W9Gz1O33n2r3QSghGkwkF42Epbw8MT4GGE2ccvZT2gBBe0oHzJeeSXJ+EJgb4olc4KTNah1GAYjZLAEWVSfja74IkFD7RuF2vnQz/GvU1EU7oA2nG1ZsFeimvvU1x7DOEoZFwrVXqyeN+Q/hOoAGqsfqi7PxJU4wyqo+bxIsWS1aQ3tXzpaWZ03QtmbUQR+XoVO64nggBmEl5Brxt9+W4sZNP+VSSRinwO78DrzvC6bm+E4RRWpi5Y4oLmAJ7g6tXo+NCLUqhcNEPC/FN6IiX+TCVNw0Q4KkEX/e7r0uMJzUVa3vg+KrIgLywKnmYgk+uw4jCOWd8P8UQHhCYV81z/rA6xvLTj4Bl8rctPfZWg7Ll7fqqd1ZgK51T+cvMfy0LbUFkY6qAjJGWBCsapLxi+feO5Dp8XbPjiBuwdSuiGCIhA0roCTYWeuT+glU82ZY5xaOAZKv4yqzU8F+hQ1YLwq3tybIG/0qPrZmy6bv9r+ea4Rn9PGYYtkfcrt42P3AD7dx95K75up7wjuE0TH1ua8BdALOHPpIVerwaEoORSk0+N4XrsMXA19Z7n7OrefLZsALT9sFNCxbk8KPvQhf1MK1pWIsmHVE7JcNyHPi39d3G0x3cj6yxwk1Oc2ZVpi/aji1ztnpl7ioIOS27i0r8mbdICj0eEGcxqKSAfXrFsFal1LlWC2bDV+5etlL/tL9BIiKr1Ko/EfFWeIYZab4OjOZK0gwGlz+UrEhUwj+51BMdexb0iQXEJmhveCooL+fACGQisq6iPaJKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SioF8BIJR4wHw5sWjEuQ9rzp6X9h1ox0d8J+mWSXQp+Y4/VRyCYCf+yD4K7n7z+hLgOzz+Fnyuidh/UjD79rxGyMeWoiWjym/KgFQ5y/quX7XUmOYLHB/jHNfPbMvzHF9dnyZp7xoOaKxGhkEYvduV1Wt0mM6dvQaMfrXBRce/8MVeOpfgjMOvKUT5nq/posLtfxRhZ88jTJA1FSbfCmorcmWiDY0I9cXBLwfOIBUgh2zMYy0PbLCiQaxWkowCPVw+4VsDmWvxi208aP8TPse/Tu2u1kVg3Bt9Cvey83w9bsF6Y8f2aCwXurEKCg1JslbPQ/x8DOFQbuP941HmGIh1XkgdzITtEXOk+TO5bvGxKo64i++fshcKxefze1v1QyAd5JklcAqsOTsywvHHbmRa6SBav0hrQBMmMlTNvlFEvJ9FucM6eDZSD1pPHam2O1vM0aSEuPOCdzYL21whNm7edK//5Pr5L9uwqvyrDV8BK1Iv+B8oXkYMyDUnRBfSYVhIB/4R02OJUqmkHAZ99YPYyn/g4j1qsE7SPEW9LYasCOq4SlfzYDgOWnlipT885ysQ4ZSBcnlGC//roNycwH73BByd41iR1ZkEH4oUnS3UaNMPJPTmEZrXI5OOvGqpfchgh/4lrVBZkyH8/7gfMFrYB3cI4j+r1ZBflNOmqbfIq2KRZ2ln/UUfSx4G0Pyw1zP0lg4UAVSAM8wmQ2ze2TurjIkIMp9r2zrhMxbFto1P2M3oFmxQ8ub3uj5KlFxlbnw+5CusH6z9lDC0b9DvLbl9GJg5MeVwdKOWBXUwGERmPfOY8Vldj42RZnlzr8eWxlG63uxqCFxw/xluBrtxRuGzFFeyAak7za1oJ5as98TfzAQPGCEKgKNOZzXAo3likg1IcuSGgywY35ikv6wWQMD36g8/SxIf+JbawzSELpI41X0pC5LsqQZM5iS08tPV5bAljaKI6GptmchkpriSxVIBAWroRzH3F3L6rdBYoWiRqzlVbwk1zr7QOdYqprPpt9yLcIdnWZb5mymk7DofV4j7beOgfBfPNlHSUBCdMdoOzmsXGYuhUfGZdQeAaL5Cb1bzHHzkOZZLmpurOc8WdtJinJ/oE3i++OE5AlGqJAYs2Ubs3T4tHVvTeGfJEIdMNjtwVJzyxEtJmRXtREkGT2wGKrbncWwz6cz4rJ4Psi4fEZVDQWsUtEPozljuk+RpGwQCFJnzc+iTn3Jj/kn/kicpE0rajpY/vyrv4IJToIQECDQ4KrBntIB+UXUX9FbZIvviD913PqfXtp9p8QCrlPqi6WpchFABNB6yjqn28G0hMR64N4hx09PMw/dNZORLnWcijTxsoVK/HW6cxDdFIWunlQeZTtomTrjgwZAwoupaK0+OHoT91PDE9YQX3yGx5U9nka8GIMvq2qYN1aHkfqvnmMxGhoUByBkkrrTKVCqf9UPOLGThxy3zwVbnGj17UftkkJ2GzTioRHdSMHJcwslolKoF18OaMwvFndk9Wn6Z65HM5OEUWP88XDxswRfpqX9FlOV53jiZcbF7o6JoJITj+tlyhI/88uLB/FIgY5yYHSRcRoZUvZaf6IQPcTQSTjwIi979EIAqDnP+5YYpIrJOnywi3HS1cGzPz0os1yk4c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0d09325-e53f-4291-ca10-08dce0f58583 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:13:49.2127 (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: qmFkpRkgxsIbemaiUK+Uh0U6xCOVD3wNUl+9Kpj5d7/Kek9LN3joyZhLJLxle3+ido0WwXt2HYZSegQ7pmrqYdY7ZW2E4hEDHEY2DT4J4GnrT68qbTGq/Lc/23TlT4Sf X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8143 Message-ID-Hash: 57W54WGCBSIA22VRY7NM7HSFIPNMKQ66 X-Message-ID-Hash: 57W54WGCBSIA22VRY7NM7HSFIPNMKQ66 X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++++---------- sound/soc/amd/acp-es8336.c | 2 -- sound/soc/amd/acp/acp-mach-common.c | 24 +++++++----------------- sound/soc/amd/acp3x-rt5682-max9836.c | 6 ++---- sound/soc/amd/vangogh/acp5x-mach.c | 6 ------ 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 77cf72082e73d..02b04f355ca66 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform), @@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform), @@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), @@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform), @@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform), @@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index 3756b8bef17bc..0193b3eae7a66 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, - .dpcm_capture = 1, - .dpcm_playback = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform), diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index e9ff4815c12c8..aa38104b27042 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1407,8 +1407,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1444,8 +1442,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1480,7 +1476,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) } links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1512,7 +1508,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1527,7 +1523,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; } if (drv_data->amp_codec_id == MAX98388) { - links[i].dpcm_capture = 1; + links[i].playback_only = 0; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; @@ -1553,8 +1549,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_bt); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->bt_codec_id) { @@ -1574,7 +1568,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_dmic); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_capture = 1; + links[i].capture_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1613,8 +1607,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1657,8 +1649,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1686,7 +1676,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1724,7 +1714,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1774,7 +1764,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_platforms = ARRAY_SIZE(platform_component); } links[i].ops = &acp_card_dmic_ops; - links[i].dpcm_capture = 1; + links[i].capture_only = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 357dfd016bafd..4ca1978020a96 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -317,8 +317,6 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), }, @@ -327,7 +325,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt), @@ -339,7 +337,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_only = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), }, diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index 7878e061ecb98..2ca904db82abe 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -276,8 +276,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -288,7 +286,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), @@ -375,8 +372,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -387,7 +382,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform), From patchwork Mon Sep 30 02:13:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831602 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 524E9CF6498 for ; Mon, 30 Sep 2024 02:15:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6C9FFEC0; Mon, 30 Sep 2024 04:14:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6C9FFEC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662506; bh=GgGhujaI0woWlgYqdJG4tJyAc+dIuukpTkAfJ3dobUU=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=BCmORQucMw+DG3V9ap0Fy0X+mifGOiwoT5r8M2wnbTqXDREtdtklRAeMXqBB1H7xt Zk3EEkMizdAYiGnjEyB4LIMLiEYyds6DpThPWkBKI7e8WIPX+uvgaE0k7//lSF1IWk yiDjf258c6lL3MUpwOP8QP+P8WYOUOEEAbkUcAVU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 35DE2F8061D; Mon, 30 Sep 2024 04:14:08 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 7FAD8F80631; Mon, 30 Sep 2024 04:14:08 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A7DF9F805EA; Mon, 30 Sep 2024 04:14:03 +0200 (CEST) Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazlp170110001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c407::1]) (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 C63EEF805E9 for ; Mon, 30 Sep 2024 04:14:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C63EEF805E9 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=V7o7REzA ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZJm6Je0T99gDPy4ilu3etum/L52WpKoTwgvIfNfyG7kXBxNnA4T/zHpVSc66vkCsjYu9R3TCr/Z4DdT3adzLDgD1xXVNO0a8QHRMRNMTtdrlJkFoOfyBDnyQO5P8oSCqYH0KnctQnSNhwQxhs4ozTIjttfaI/ZXqD83eJQ6R1uM512ANbCRIIU7NQl/0nUx6k2jV2V4nADk0LzV55qGhnObaW+hX67BymFeFHlwNXYSmDg3scLtxGptlqZNfKJsYKsER+vWvPu1sZzkTC5P2ppNnJKjB5/zDgOtofuwrI2eSa5Js44FjNgw6Hc/+nvq+i+HPJUWa6XKJ98NUBrR2Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=KZAxs4yzTaa6Dg7lirfzVAAaYESTfbXLM12N5GBpcfg=; b=vysd1v2QLTGTKui57eE4PQZZWwbQfnzTgawMgFkx71y3AASYJgUc2lvtUndl8BHJGyX5wYOogVom9MuQ8XqYrRsVm6kcThu01q+E0j301oC2cOwmoBZpfNdnJub6hZbfRjmNs+D0Gh52cBdehtI9DJKYRfSp1JrCrDKHUMek/D8rnGiItznZ8bTAj5BwtoqwvGVjH6jOIolZ40cxqGfWgb1ljwAuygCnhzUXDJOuuD4/lvBg8tNdsY7B86ShozBrSefJ81i0AqB6V7KPa8LsGFYSW+3QpjiYwvC8t7zklN/mJ1gOYnAx2LmYbMC8l/Onec8qVToIeZpaDE1vRuMvxg== 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=KZAxs4yzTaa6Dg7lirfzVAAaYESTfbXLM12N5GBpcfg=; b=V7o7REzA28k7JtEtv12XD6kmSAS1ezK3sQJwOqcuugAMd1N8F+SMPQfRYjOsvyUx/LEyKqidpKaec0GNLCXkeVbsScLeYO9+2YHrlINKyY/CEe3kwEe1saWtNmLLZXYM+NJ5bBLQbFxHMK58b0ZujFPY5PpNEPTn9DDyDJOLaxM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYCPR01MB8143.jpnprd01.prod.outlook.com (2603:1096:400:104::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:13:58 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:13:58 +0000 Message-ID: <87msjplwgp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 03/13] ASoC: sof: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:13:58 +0000 X-ClientProxiedBy: TYWPR01CA0029.jpnprd01.prod.outlook.com (2603:1096:400:aa::16) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYCPR01MB8143:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c1d7c9b-a063-4a3a-1207-08dce0f58b42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: DCLJyD95mlPZSyJhh/hOcRSF/C1CUj2g5NL04isaQKCvXRP/oSBSfcSWeEJKyTyqZIYhFeS1s4nE40oVeFFEtXF/P2+2VCJ78A3ugrXIxy6KCUilK9vNKrhv+MJ97KVOy5GHEMx5NK3LitQPH3TWeeQ0K+55hRNVx1Dk5mzsp5OO4wDLaa5CuUp26ND1cC5wrqozbHW+FdW6EZvd9oy1Y/onhUIyjeFRmpsw8u8AATRCp5YP13Sd9X5Bu2ubsdI91IGkrVRRl1xqnF8X5b5Td/JWQOtfbVpp3AJuc/Z8r7NhzI7DEfkJx7vAW377LO0gdPIYCp6Ea0lFFJPTMDVLBNBjkiVk9KJTbg6GGnpZrTMKClgYoxQMK9QR9ClTQys1QaVUU12XL8+A1ZrpfnqPdU6N9i96z78hVeyFgnj+FlNReDcqkfgTZdCI6aunCqC05xjZ8eWAj7MxsyeAcAwSCNrJ3zzeL9a+nmsMBuccZ43yp48knb+ZPHQiIdq1KsJMhsvTzH8u0yi81zItfcay4DGjJMbPJYOtm2CQ9K7v/CbBeZgl4V5tRlIqgPAgvjn/Rl3tOC6lOYlumtwA1je1zkkancWGeGzz1vrltjZ62nKmkpRPDN5aarRl9RtVPoe/Aqcqq9DvxjpTKj9KVJpM3UCeHSExhlSgaifGGzsuxbNRNdnBQ08h/t5Ej9NAn7j/pDI1bvc+WF52+PewlPkUlW+ffqFh/KBft8sCRtjR2a4JhUfTa+3eb1vS4LpKFde9N+6UXvDCaWPxj18Ea15mNuB+mYi2mwkpo11Ml8PnqqPAg0HD4pI4kV05X083/r0j9NH/HHcfB73BaNd8Nol7vu/+vSi44lDo5shQ2PnsPFVGYTc/2uoBT4bm4nMNfSNW1eeeZhCmhj1ESuX6AoHKA9xpijO/OPv0MWTt+aej3012B1PZMtPB+PpzkJQinRviW4tjW0HJMWNnn6r3P76OBeAuKR3dpbWYeTtJQLDB9Vuv8XNaYzXHSQzGjA1CmstoS8oRY/EYYy26j8MV0ut2squCQc7SSj7MVktS955CKgcO1iXgcOuTSZANtaY3LYyEG++WhvzArsSVLJamO8uiOFCbxYHmAIeOEh8yUERbpLSEYh+17ccgRlDifvx+OEa8Q7FVPcxMIQ9WqSCBfBSu1Rb/Pu0DayhBHyMhGoAVD+R8hLMpLZ36+Dm8hFbx1r7Xyn0eiI2R4uGPl2jDKFO4BilI8bYvLg6+Z8Fy84U/p3YTQ6ZS7YMndZJsYK6V+945btL4UxdWdZA++dX8EZ/QhYu1Lu2oId5IRHDy3ySwTTqJZWFOo50Y6hOhJnUGz+H0y2HY38ACHlYcGUjIyDf+u1IX7naQMNIFVdD9PCn1eOw5H73fT8GB/9v6XysrVWTunW1ujoLJgclW3el3YFnQyg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Pf/mXcGTKvsBNrGZfym5jGN7iAsArIhF9DfdaO3qFO4Ahxeu3tICJ3D7QRv3kst5kvvDuPmwO16tj+mJTdk2rzqHmr5CpWLltaagnFyNeBqz5owmhQVA3Zb52bmMkCYuBK/e3us5tRgIoa+lzrJCJSP2kLSPyhVfiugNC+bwPDfIvHTTsJbkp4csrI60i+Ntb2mquYjX9un9dyy769hb37milwEokRtuJqTurM5dmmcqkwUQsx2pf8hvxLDbPJ1D6i+7pRQZ0a7MpqDgVm1LM9GZj+PuyjFM/ZieAZypjqh4lEfkDPUSlND24cbJtzvVLTE/q+ovHstoYsPDagpJHuUE31Utax9np9rWbYYURLDE2OWtdkcmexd+We+2aa86ikxYpJiVd49L1NB5VUXONV/3/Gzw0ogMKxYvnVCyURfJTMI63FDnEvydkS/iULkUq8igPxtk9Ye4IamLSqG77Z8uUpQFfYItk2V67l1oaBDP6obGDVYWCxlydu3IrvpiNJO7tuwDhvXIAnUwWzwWrQtClKRxwFHeBKH8oXoLvEqYWIWCP8aPglLUT6wWvf7ID+cXGrxyd8DgXa/JjELBtr6dPZYnjdJtvyC5CDNKVmeK+B8S6CAb0+hEPRRVSX2Bl7Cm/ZqF4LwW9OTjVMOYIUGZmVXUpK/y7zFT1u3tFHodard2hErdFM2++zUlXFz+mdiJj2hbQRG/XXRDYSLCi5prowuqQL0/C7FSkvTGyeelDia4F6pynqNIC6Pn+vSPPyUtIWINu7kLMuSq7HIFdL3hDt4vcZL+E/Fj/zrYtMZE9PvU24SFpPoCpqNpUv11xQSLfP4ndsYKGTG2Hl5AuIQ6nkChtbSxXd0kBnXfWYUotBw/YL6OuZZQptdgrmvkyL5+w+0p5WGpI08aOGvv57DpBTb/bdMY5KhZTpgoiJywTyhwDfRYddK4MwYmSbraCujLv1W1U5o5Pep7i5NxBmN/xRQb0wRuW4To/EiGDpXkuLviku+WpFZUnagnSVJt4zCOTJSMN63xF5Jc86Sk5/wdSRwcFUPnezmvGvnGZu6Hd/BRo7tWxiTC9H2YDHC6Ho0BYdzipy9uKN7AgA58DPEtPK50P0dV0xEjsmUMCIAuWW9egAXW8yX/aHQwsS5PmU6z4IQjLfAkP2F6dxclv+xwOhSUJNQY+PMN4qlpZVFybCrCQmQtW4zxCVv34Qn9eM6v02oBNVKz3w+WOC0FQNuKIsZlLW5vYRcDZ9ioEyVbK29BviSM+vHVgTxYARxT2lU7CNodWpUQO9Gnn4Ucxf1xZscnJH16V07hZFIy51pt2xHaZgowV1gIKYJT7Jv6yAFIY9hbGj8MRW5LHzwBPL4Vgunh5f6lZyfJNhnWia1TL+0/5quuKnKtDZlJly0KwS83wqKkz/WCNFJdhm4imfVTBJU94/n5QaNl5ntwO3u7hO4L3B6md4Ce0TQOoFhkkcKCS5b9T4fHEvfEXXVecxrd0lDNgz9VpoQHQA1CZYoIapN17vUM0Comqnctk5Mdu+A4PIbglCD6jDNs4Iky0gERCMBwJ+XspwjG5O2w3MN3UTos+RdrR/qbp+zhBL8BFSEScARj/xrCxFG12fpjC4hAkWEu0HC6Z78vXAK9s/U= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c1d7c9b-a063-4a3a-1207-08dce0f58b42 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:13:58.8454 (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: BqvIx6E0UBOo82dqucfSXwY2lSRuPi23FWYGGOrsrycFThfFKTSeQglrDBYb6bHzMYiOSI1670xpRjsTxnMc/2PRsuxZ2A29NKf9W/oj8sRrmOcs+prVfqKlfgNHCVD6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8143 Message-ID-Hash: KOLNAQOUVHMR34MR2YHRK4ZUDA2LSPZT X-Message-ID-Hash: KOLNAQOUVHMR34MR2YHRK4ZUDA2LSPZT X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/sof/nocodec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index b12b3d865ae30..c0c906a78ebae 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -55,10 +55,9 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].no_pcm = 1; links[i].cpus->dai_name = drv[i].name; links[i].platforms->name = dev_name(dev->parent); - if (drv[i].playback.channels_min) - links[i].dpcm_playback = 1; - if (drv[i].capture.channels_min) - links[i].dpcm_capture = 1; + + links[i].playback_only = drv[i].playback.channels_min && !drv[i].capture.channels_min; + links[i].capture_only = !drv[i].playback.channels_min && drv[i].capture.channels_min; links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup; } From patchwork Mon Sep 30 02:14:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831601 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 1AA00CF6498 for ; Mon, 30 Sep 2024 02:16:01 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6DDFC1944; Mon, 30 Sep 2024 04:15:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6DDFC1944 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662559; bh=+3iOY++1gWaDouYT9bhhdLFKqUAA/eCCpStrVxpCZ78=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=jyMDaAnB6oodkuGVWJlnoHGHg/rhve6suxlQPfPFvNYqvjNBOvA8C2tL+lIeFz9gd HUn1buDf+lNiO2fkWtp/8jg3eKsx42pnmSZIPkAr5gZ4/JHx2jYzVKqaR6ZXk7fou9 rMhPqP0oki7CskDLEewyXrf+4Dd8RHnq5ZfB6SoQ= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 516F6F80689; Mon, 30 Sep 2024 04:14:23 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 9BAC6F80685; Mon, 30 Sep 2024 04:14:23 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E6223F80676; Mon, 30 Sep 2024 04:14:17 +0200 (CEST) Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c406::1]) (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 03402F80678 for ; Mon, 30 Sep 2024 04:14:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 03402F80678 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=AbrsAwHS ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HEqEpE6VwipzVxhf2o+IsCIZsMxpPxdULWA/2R6kkIJ60kaLVP5r+InvCS/NHjmgPuAocaS27Dpw1dWljq2Ylrof2oLNF0ureLTqi7goeflEgR8b0tImeu+J6H9yKqMbSk6RcVgKxGwnLdVO19bZNdFayr1uez7PN2huq6JtscNky15jhQY/BGdfG/sYvyo1pE5fW3JkkoRnM5Puk54lEjTbwlmGBFScR38w+Uz6D05UaMmVNi5ey75teSttU26slqK4yZpOT2XOzEE3Mx420Itkq7YJaCxRZ9/Kr1wGbKaviu0BxWVRF/TGavbiv7gafbvTzx4s33OhkU1gBis76w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=NMde+Gsewkg5yaN7cIsJHBgQ3crEs406DnvzH+HMtbk=; b=RnRscjEzmOATHLYxFMsd/NlQRxmOgKUsZLih9nF/6ZdPSYgE1Mc9g6lIjM2suQrnkrzhDFJUickw/SVePEEvPnbxgJMxBOrVg8VR49hv+QizNpifgPc5OpytS1XJBbub1Iw+ssY9hYfU1YANl1sMjPcJLhfSGLfzrAwEAm2tYpt44WkG/17/u+oC30DwRx5hi7fj4JhVsyRj2qexnptog7zqLcELyt8APPkh1Rq9tdK8YGj+7fFALVrfCpfjPMZL076ljyB6DpBoqwWEM2kJefoQhQ1gWWCRzBp9OW+Wdi5MuXQdQnuwRu9hMYArmW3YXEB2qDjYlUfCTgysCuboHg== 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=NMde+Gsewkg5yaN7cIsJHBgQ3crEs406DnvzH+HMtbk=; b=AbrsAwHSBUCsEQXNfEbqLxqc/x4nozKGpVyDCf/HgwuxF34HEuQ1HqC3MZ1K/aWVU2PfRG/+s07ENiXDtMwcje1u4twxlPhn5wCUHIfG8cN9e9n1MLBQr3UUhjz0IzMUIgpf3hZnng2zjG8fEr1R42ftwc5DWkxF/5ReTkGhk5A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB5798.jpnprd01.prod.outlook.com (2603:1096:604:c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:14:08 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:14:08 +0000 Message-ID: <87jzetlwgf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 05/13] ASoC: samsung: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:14:08 +0000 X-ClientProxiedBy: TYAPR03CA0024.apcprd03.prod.outlook.com (2603:1096:404:14::36) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB5798:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e4d7d2b-700f-462d-63b2-08dce0f59123 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: QdI35MNTCLYkId5G2FaV9mHl0vBr9q9IoKvhsJ6zAOCkoKBqFXhMVBpbdRboS+QskdcW8dqJD+V5HU3Ib0t8oz4pA6JifgY8fFPE12/9l0cQWUWQESrVutPmJ6mIWoDJ15nLkSxc2voyzxQsXrxtxuWa6lloKBPEtMFWy6HAdjckrdHf4L4uFl6gFyQ8favw3Ibh6fHnV7bSVipqMyfiC61TD2IY5oPE/SfuL/NmPPult2yl/MSDNoZJp9rS99Kb7N9svFXJ5ES5B2z4IVgjDste0LBAORG4hbzvG80DHwqLMDtpqPln71M8Pi5gNXbgJ7v3nSkWGQUYu8ciDmS2AHPbCzjxPNgTWcjYQpnr2HCsrcil4a7VZ+O813eTcg+N0wWMh+2vRMoGb+Hme+ILZVHnZun9hZl/Dqqz5dBAmF+ieGhiYwIzGqSiVdQabLMmIja4K8vfXt87PcboQIMMudhMWLDPP6ZHO1NqOMbpR/pL5G2tVxIIcKP4hYEriXV+jNVW1Sw2+BmEswUdM6sn/sgVV4wxfWgQbbge2fnk55Jv5u7xBu5GR706UqpsBkV7gS3uupqULANiK/q87kpJuts2ObQ9wHbmEsWkn8wKAh1hJBQboVyelQX5KLNKjV9zVsIe6tripu41qMLk50OWhwc3ITIsIF8EN5p3KlJr+EX7bFBFNOT9Ga2u+7zTU3eld2OT9ybmGDkBCkPh9b2XmafT5j2s6WojYKqjqfweIXZGx1YCXUZnTlkmVqk/nTY5Qj1j8K8y72dZICtqHIx4hmnY9ynYHxjMLtpKg5Tm/FxACkpMuOB8RRTQd032p6/UWVgVkhN5zeY+6Oenx8gGGHyaVYUqOJ19nHCN/ANhVMRVt1uzkExTdHlek+YYoSZ6oYKgUtFngzuC11wZLVw822ZCaAW2mMiJJTF8cGA5GAm2frGL1YG7um4Q03KuBFJgjtU2+6FdnPJ57MoQ9LVUqx2kUZ6xBzCOhLEkLlRCMA4tFFGfjpbTCcoBuRhPVkjYnV/I0wh0N/8FY/T3iXzoV0+vXyoQ9e+oaokQw8wRT0ve5AMlvUHk9eCzjLU48T5dzmZw0UiQS1nGAIUgL9i4SEmFu+ywiIECQCg8tEojLroJ6OlI+1NqUhVv6KzrXEkFAayZFs6s6r4/4cWW5SLKWIanAbbKZ/82CoYS3oRMDDNsGkToZmTaWxBbTfICgU/YbiKAYNfs7HCr9fTCItlOIyegtKwIQKrGVBawrtw0LwvWs3X2k4KyMSrbr2sFJSeRtxsZ5dC9aSEyfq8ts9u/57eJGnB9wZkTMGfimeTuS4t+aqOV3DLgx8EC6gW9Y+I4fcrDbb0C3qTQyIe2ivYZQ9DHLRzQ8Rjcqi03wDmYS2KLEzZrFjts1YaWEeWsnbLNM/e+y3WuJbkSPIkb3VfkAg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YukRzQFNHAgjw9HSds4+t16CNLcW3b0zQpVMOx/mwQFKOdtdyQg/qC23xUha+KOsxu+IRK8Jn3s9p0hd3wI5ruqnGPfsoNi/3wgjx0XAcjancYPLZQ6XSOYcBgwPvoUUS0I1HndguNmHmT24vEAwudjtg9V2ngvl/wZHTg1Zmiv3AIURKIz4oJkToUsCfwwMphCQBk37DwmH8X1KLQqeqGz8yCjKse9rtnMVQqkDhBR446/c3g/uhyOETETC87yXOgz8LdPa7EbjIACKzkZYMjTiYCilyjyd5TYD2XElqat48YMbHk9j41huUVVEDqSJLcloUhxnC8nV0dwyRuoTEWzXT3pevy55xTBBLlxaHg46rDEBtrz/ia9kLU61xwTP5j/q76GzdTUCAm8OA/PhTwBpftX5OK6FuGMjHtXTl73lQzStUf6JRNRnN3UUXv5NJ5Kpo0nQ8b0MADlduzzR/eKNuIkPNOb5HuEG+d9awXRVKWofwDdxFcQ85AaRPQPJGogBnO5XIQHm9Khvl8t/myjKICbjwBkXbQFxCBF9T6rpcOIflb1s+NNcjKFn39UGWt/zD8T4xLtlGPpNuontrGY+/VLwWqp8LgL7rShAIkxrPlGiuI6OFOUoMkCoxlfkWQzSsSBOx8qhGtQqmaSNDSb8aRsY1f4UTXlTumyDiool2uId5FOoD9g8ItWMh1OtTDKiX5aVMkP6t1fFzs9axPepTiJSEUP+8sokiTgPExk3NXaqvV5b1lz4z7iHpnWVkYe3+6DyHdeNAst+vpYi+MZ0z/JYwkCtgTnwcIXs6/bsHThcNF+nKqwdvIm47WV9Z/2zVYwOcM3mgDnKABu8rZ3SUmM8S3Yywlf5UwPQtyh34rTR2zY6u4Ct/gt0TpQIOiHmYW2J9yrDb7yphRwwTYmQqL2MTBj8ug/lzozzqcJUqzGEil7FZCdUmqFPStNN69ZupRbn+l0zWHcFPlYTKtfxsoO1E2ZhJgA5dR0pgH9Q3jhrwhLeQD2T3JOYdQB9FU3dfwT38kbEp2KADNCqtwj/0tx+dyqVh2LRhds+PBNyu9SYLzqvFPSZtqg9OCgS8B1Nmsbf34Es7ZgBT3gZdQ6vI0Wd0mXZOpAiDKgZTpBVCpkRFm+kwRj3PPRlrMjGuKRz0NKYdBWrLmeegPS3EcCyMSUT/0stn+H+5g6JPF/46UPe2ux1Fi2z2MAXKCnzcf6GGEpBJuU4BC5d0GbzhNbf0i65qAaPb9AU4ExQNz6U6cszmePQaj6zZolLFlo/21eNs+gq7KTTxMGRdbn4HK8pI+dNH5l0yQHkDzcd+IWKOL/ICP5tY7loePib/MleHvsf9SOK4uuDvmXjJj3puJug10aJrEPmP3ZEz/qG7E76gdPxSJVCzjzOlidcvU6We4pTDBf4+flpljIpN4ZxLzwf6nBPVN39LssKZkIo7vv9MzNXF3PwUTQakqpReQikA6pLw6nbTeYLh12QfM5uQl2pTP2CTDqebtlGz31dCrECLq9Z3WLZsTcLdLJoQPxTkAei2LCH0tzjY1TQDDpuEo/9sBRHTWHXlyQFxxbIbxT9hwGOBh8O/+EY76mXWLujxv8TgI9R7WWZW4FhlBhQxIU3Qf9reMbGS02gbtlLF0c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e4d7d2b-700f-462d-63b2-08dce0f59123 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:14:08.7132 (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: wVkYMMsjbaNdV5DIJ3yWbC7MPa/jOHiR0lds1EdLS/d56AGupXrdyuK+mbCmXEi+x3K+btufBf0R8vmCHw7VaR9e8juQrw/zi52qlqq7vTpFdiLju54BMn34w8V+OA9T X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5798 Message-ID-Hash: 5YVMZJZWQ3J447HYGXLXS4NFD4WN5KVL X-Message-ID-Hash: 5YVMZJZWQ3J447HYGXLXS4NFD4WN5KVL X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/odroid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index ed865cc07e2ef..20e17d0610301 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -171,14 +171,14 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Primary", .stream_name = "Primary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(primary), }, { /* BE <-> CODECs link */ .name = "I2S Mixer", .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAILINK_REG(mixer), @@ -189,7 +189,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } }; @@ -278,8 +278,8 @@ static int odroid_audio_probe(struct platform_device *pdev) /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { - card->dai_link[0].dpcm_capture = 1; - card->dai_link[1].dpcm_capture = 1; + card->dai_link[0].playback_only = 0; + card->dai_link[1].playback_only = 0; } priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); From patchwork Mon Sep 30 02:14:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831600 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 6104BCF6499 for ; Mon, 30 Sep 2024 02:16:31 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9E7B72097; Mon, 30 Sep 2024 04:16:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9E7B72097 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662589; bh=pQkpjcmPEcGj2ip7jg3igqlrRArmCPbx8KHfvymo0BI=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=ictfoxbYNF7bflLqB8olI5GiWic1hgIuefX607EiNUrV/V4J6AueP7BXJl9x4qTrS y3RjetUF5DWt0fm4QVkyUhDisF6Z44nOg0n9JPk6O7GuPVYxHIq+IAgn+HF04lweCK wCKJaN0gOQhV6J3IjqZmy+iFCAaiQkBi/lNBEXmU= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 6AF2CF806C0; Mon, 30 Sep 2024 04:14:33 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id CB162F806BF; Mon, 30 Sep 2024 04:14:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E901BF80696; Mon, 30 Sep 2024 04:14:24 +0200 (CEST) Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c406::1]) (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 D4D6EF80528 for ; Mon, 30 Sep 2024 04:14:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D4D6EF80528 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=EMfJZ3ED ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZbzJK1hwFogCYZIzJ3/nNxxCZhyTVsRoVMoPMg3vAH+uETtbvHcSBQ4F15KSGvioVlMdHb9H8tzjY4dW71AJHKjcbgFDuEAzGNNLb8WTr47LpAUIm2880rZ+da0fHJY3R0eNGNX/CFfJj8T9vu9Cwr5a53oQCX0FzWdSmyElNBvZa4nvkEuLk1+59nfuZj0Nab3QaN0fCDtoTLogyFZ/QMCESJRbYtw3+Gm34C8baMGjDJfGFliV0gJ6kTZoC054rzJXyDJLqSvAdloF4jfW6ldqb2bzXl5nrjRuhApGsUZzxjo4zP6gfM4TDTISLLq9A11twxYX/utex1MR+/e3lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=PKSmbg0e1i2JyEjg01uQkSIGGs3KUauyeo8AeJYB0Cw=; b=rNDf1qOn/WJQvot73chEGo5PeqLFix8Oadf4UHZq/VKQBMMp7G0GGN41VKjy5W1Wg+cHbZJ9aLG4rHXYmY/ZHIign7rEjTO6ffis3CEe41aJKUehuFlBb33kP1h3Z6nn4vI8uuKLUr63ayLmsbKbIQwSRn2LHbcnFRkHBhiZwootsYZU/yI1TQ4vEidtTrYsSwC7mUv3YQh3dzeDzP2S6KkVOnXqhWSUEtfBolR+DH0WMFBxdXE96eZJ2QDnd84L/UfMulsjXXKwqKHBVYiCLmpA6X4UjurJLxBL8ZwREmoZFHhrtJptoVnm4NUXPul3olejQpb7qVNauJSigvMk3A== 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=PKSmbg0e1i2JyEjg01uQkSIGGs3KUauyeo8AeJYB0Cw=; b=EMfJZ3EDOLG2BXG9F5wEqOdFasnbUOM5xwo0JVfNiewtHdqKgEGLImE1D1lVWVEBTcG7Xa/QyuotgOmtUL2I4WRRk/ur/8kz1Mj+YtsH7rzuVDwVRzsRoWp6aXCOlWj9dsRRPia5yLhWayNqGzkt/JRpA+aLRVZQ9BU3rUsLAqk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB5798.jpnprd01.prod.outlook.com (2603:1096:604:c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:14:13 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:14:13 +0000 Message-ID: <87ikudlwga.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 06/13] ASoC: mediatek: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:14:13 +0000 X-ClientProxiedBy: TYCP286CA0202.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:385::10) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB5798:EE_ X-MS-Office365-Filtering-Correlation-Id: 805b706f-5759-4667-6fc6-08dce0f59401 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: YQ1WFide8i66b+tZaenvR9PDQSxt8tGC7YQGFLiv7cNBr/yzSu4VXbUn0nnT18Jsyrd9oQdcVF8VvHx/hv8qv9bUyZsFBc7NJZA3hfvUP0zEaFWCPywYl9jvQwM235n6VX8lTNmzOQ7VD6GIgraSZy1LF7gPESfPDsBbm1g/7kUu6qZe+N62f8tkIkyNEfZv1d71RMU4UNbBX0yJyFfpy6DPkWqsnNCXKUXuD5Oo8U5ORHt8jLWW0ue8VYKHjrIpnQD3An5TFoQAxyohm3yu1iLIRvi6/wlkk/fEGOIZNp36Wir802EOAYoGFDjMzcLGMAw6pWZ9R4110/iK+t1GsunVVWbiThwVC4FLvdFsI08KzhLgE8jE5PAU/ZAUGwp+4MBfkRSF/+qJrVasM4tAIT8SjtJvJBKqGXxHO4AttmrrrKK3zO1M/wy+yhBTQdCKubI5t0TvtrqGjk81fWYb8hhgujqOBp9jcIUJBgFEeTDIaHhw+b/XA2/un4W/nHcK5uxChk8OrlBUSSAO0XJc1BzT9slolhLVInKS/9QAMUb6XDg5rqigEtDnu0Rn14nbw+7r5/ZGzAfLwvUc5Brbta15Ly6dmqtmohRQdvelQ0dhxxC6bvY6v/gpWlBpY72V4L0u0cKaokYRhaUTR64L1KCz8xny1JNCiK4QOykblLrvaCk2HD8hiDGlyhugNPV8I96ac7yMnLVJv+vHMo6ldbI/M0fYgADqV2WxXr3ULZkbF2+VFTuER60RAKVNJTavm7aQPmBAtW6TY6rmz/cfQ+s7YbVIeWQbsUiOCzgb+RmNi/sTgUYarW1ifLD9xWqACZv7GDOHl2tv5wWGS50J3se46hpvEq2o3FFm98uL+f+w5IP/OvUAMaMTZzbsZ2vZGZkbakkMxSSQncK/l3Edwh6Bhy1IqwI0E5eC/ZqIsOWTZ8EDHQA6qSu3KsO2Hkw+/9BODVMNeBlErZ1wtny/bJP9O7g3kwZTDrF0macuf9alaFpucAHVHBY8Mi7LR9hcXTZBCP9L8qY1yePkLqyAt7UwRgtE9+SumeOofaJShYQmuTW8334ex3azsUc9uyYJ2DVKiHOxC3VwtmV9s5maO7f18qF7EBIGVdhaE9Fb/+tQXRy8QBn58pwxDTMetsCC8WodQw18HXLrp6EJgp1SUVDinpCFXc88WT30F2hkzajHpYZ8i9I4rtkKJMYNjTNEAh3nuTkokIHsbq1CixSj85vX4bQLMONPlOkjH+/c1bPnogA3rjMvwUlP3YT49JaK6oiy6ZCiau+JiNsWIDuX3gG5n/jgFRehH0H2fjNcYNtsbAwGstDkD1ZNL+f2W4kq30Cqr7NufnTEDBWEfIjUe3+lgcI5K35b/kGrlIqFSS2OR6UJJLp0vH4O/722pu+AuD9jAapqHCJXQrw7bHAZTw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DSQH9UwEbb3HzU8eMsAfFEB4AgWojSKHKySkwVSRXA8s4JiSXhy1z0i26V1hwvtjbasu8QskcfZIMsuk6D0MYMkbLGhgxMzjStNHUHqKD4i54M5zhtkZ7KKz0ZZsN54duRWucKiNcxEDS/mpsw6Xfo8yWUwPAVZaobE/LrZekD/wgQjUMIwkKtqHFbWp0rrfS3s07EosS0Por4GdU8ijEDJfcOoCDGVZRcrmGolXrnjmx2n54wYPMzvWD3oqqdAu6maZ4+gV2rZ2A2htvlTgSKiU/S0m46cNAM4Ui07K2E46OE0UsVQKFq+OhHPC7QRoIPG+stqLgm9OkYXwQpCHKMEugVxZYDTtPLtiq0yJm7bHd6zC2NNgn8y/Y/T93E70TZVv+/qf0x+Af6KvdcXA1E1QawMmrgdbS0P2CW8v9ysl1kWAD2y5Mxgx/TEgqsu2bgx3cSSUmPC4Z66DPAAyDiMgmgLmURj6okghOeBt+Lo/tL8SfOU3wYUsuUQrB+gZuEeh4Uk+btjCZ857idt/J6fi0VNxXiuetztBcDfx9to6A5NnKyb9Ubg1hpA3NLqSkPV4KVxUUg1KfxkQ01D52p9CPFzv2sSvsi6q3eOGCpADErjlIHZbGbWrM1OojvIOfWfLULwSOuWWipsgH3ob/sK5MV+JH28s/ixpz/f6D3E01FuJUuxThDr9RXDVcDGHlcuhdd/9YJ7ZILW58jHGqMz94QxwCH7D0s2k8OWVvmschFm4/pYyZ15XkgEoB0C41NJlHUmu3fXvLhRW24wDNHd7Vm7xqJTbMOCpL16uWf1VeRvUZsRLICzeOY/HAhQ+y+MujPBY6tJB/xvRaqRKhTthjtOhEoM9YvPJWHg9IUutMir0PVLdVXakHfyngPma7wp/kcsXVVwapwvqTMGRruXCkNMhJcPyu7mUw+XlWeWxUfCu5lOplh2HUF3J4aoGPisTn3cPtYOGsrcYj4VMepyFUkIiwUA0QTzdZAIKRdVbmNAkllToKh/3BVLzM0v/ZubMuNzRqkSKhQfUlx+7aQOe/g9674gqCHRo5JbTqM/Po1k2+2oPHHf+SQsoPnzsZ0TtUL2KZGDkoxEqrtAoAWPi8y6W6+W+eLq7TacLv8WF4stsNG3MvqOl4kFKoK2MdR+Z0gWcDp6dVwICNK7NlF6iDKbzo0MfgPLhlGHbO1xTJ16Pd0ht6mcE6eCBvnxBA/u4c7jmcCKmnnMWP6bk/3GX2gZkfATC8eWcJOQ8+yzpRNR9REIaKTBij/KfYAngEGWoHVA7QbiYTnyky6BEqXdOQleZ/JmC117aCwtOiMDcIHkj75fhQgo/TuBP48TBQ5/HRsAI1GTtpCtMdu5KUGeaSnV0HGXOxVxYZv+QT6VdTt4dgCth4FERaDmAemj/G2ppjMHx0+w6gVffa52Q9XKA51OJf7GXlQSZ32XpvbQ5jPZhtT7ZaDO/iRNRLmP1lrxk6HGGzM4CIMyLPrPESO2lLCYBIP251WAYLJqt7k7ZJbfTLw89V14x4StZJKU93eEs6BDnfYY46tVQTtptvoTXomzSuzORAolJv2envdqRyMOuhFSOAoJ1jIuMgSmd1yWugRjHDx2Wx3Hz2qkk2fd2Y7iRkYbBIhZfN2V2EZ8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 805b706f-5759-4667-6fc6-08dce0f59401 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:14:13.5912 (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: xOGlWegWJBh/ozahqA7DR9feVaAcb26np957n9vlohiXr7652xwam4g49nlQpab5AUsuxNSrqahAfiz7u+gFK6siXA6rokIbVHnCulPTEJC+JGBRe39JOYapxE3orLcR X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5798 Message-ID-Hash: B566CTAWBHKQKXARQJQ4H55EG6JOEGSJ X-Message-ID-Hash: B566CTAWBHKQKXARQJQ4H55EG6JOEGSJ X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++---- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 6 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +-- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +-- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++----- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++----- sound/soc/mediatek/mt8186/mt8186-mt6366.c | 86 +++++++------------ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 58 ++++++------- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++--------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++++------ sound/soc/mediatek/mt8365/mt8365-mt6357.c | 14 ++- 15 files changed, 185 insertions(+), 267 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 4974b0536b7bb..00a79867235d2 100644 --- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c +++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c @@ -221,7 +221,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_multi_ch_out), }, [DAI_LINK_FE_PCM0_IN] = { @@ -231,7 +231,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm0_in), }, [DAI_LINK_FE_PCM1_IN] = { @@ -241,7 +241,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm1_in), }, [DAI_LINK_FE_BT_OUT] = { @@ -250,7 +250,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_bt_out), }, [DAI_LINK_FE_BT_IN] = { @@ -259,7 +259,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_bt_in), }, /* BE */ @@ -269,8 +269,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = { @@ -279,8 +277,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = { @@ -289,8 +285,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = { @@ -299,15 +293,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s3), }, [DAI_LINK_BE_MRG_BT] = { .name = "mt2701-cs42448-MRG-BT", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_mrg_bt), }, }; diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c index 8a6643bfe830e..2814f0570928f 100644 --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c @@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_wm8960_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index 784c201b8fd4b..daad9544a8d41 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c @@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_1), }, { @@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_2), }, { @@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_3), }, { @@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_1), }, { @@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_2), }, { @@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_3), }, { @@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono_1), }, { @@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -152,8 +150,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_speech), }, @@ -161,24 +157,18 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c index 6982e833421d6..c3d1e2eeb0e57 100644 --- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c +++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c @@ -45,7 +45,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -54,7 +54,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -65,8 +65,6 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c index 0557a287c641a..0724564cee6a6 100644 --- a/sound/soc/mediatek/mt8173/mt8173-max98090.c +++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c @@ -104,7 +104,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -112,7 +112,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -123,8 +123,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .ops = &mt8173_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(hifi), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 4ed06c2690652..d8e4e70d834ce 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -139,7 +139,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -147,7 +147,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -159,8 +159,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5514_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 763067c211539..488f2314dbf78 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -171,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -179,7 +179,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -187,7 +187,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, @@ -200,14 +200,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5676_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_be), }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */ diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index 466f176f8e948..59c19fdd86758 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -210,7 +210,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -218,7 +218,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -226,7 +226,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, /* Back End DAI links */ @@ -238,14 +238,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = mt8173_rt5650_hdmi_init, SND_SOC_DAILINK_REG(hdmi_be), }, diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index f848e14b091a1..1d8881e0a361a 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -425,7 +425,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -435,7 +435,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -445,7 +445,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -454,7 +454,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -464,7 +464,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -473,7 +473,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -483,7 +483,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -492,38 +492,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -532,7 +526,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -541,7 +535,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops, @@ -551,13 +545,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -570,7 +564,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index bb6df056a8789..6267c8554c152 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -440,7 +440,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -450,7 +450,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -459,7 +459,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -469,7 +469,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -478,7 +478,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -488,7 +488,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -497,7 +497,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, { @@ -513,31 +513,25 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -545,7 +539,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -554,7 +548,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -564,13 +558,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, .init = &mt8183_bt_init, @@ -582,7 +576,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_tdm_ops, diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366.c b/sound/soc/mediatek/mt8186/mt8186-mt6366.c index 771d53611c2a4..a5ef913743d4e 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366.c @@ -647,7 +647,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -660,7 +660,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -669,7 +669,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -681,7 +681,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -694,7 +694,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -703,7 +703,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -712,7 +712,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -721,7 +721,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -730,7 +730,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -739,7 +739,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, { @@ -748,7 +748,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -761,7 +761,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -770,7 +770,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -783,7 +783,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -792,7 +792,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -804,7 +804,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -813,8 +813,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -824,8 +822,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_fm), }, @@ -835,8 +831,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src1), }, @@ -846,8 +840,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_bargein), }, @@ -857,7 +849,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio), }, @@ -867,8 +859,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_aaudio), }, @@ -876,8 +866,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = primary_codec_init, SND_SOC_DAILINK_REG(adda), @@ -888,7 +876,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_mt6366_rt1019_rt5682s_hdmi_init, SND_SOC_DAILINK_REG(i2s3), @@ -896,7 +884,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8186_rt5682s_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -904,7 +892,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_headset_codec_init, SND_SOC_DAILINK_REG(i2s1), @@ -912,46 +900,38 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(i2s2), }, { .name = "HW Gain 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain1), }, { .name = "HW Gain 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain2), }, { .name = "HW_SRC_1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src1), }, { .name = "HW_SRC_2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src2), }, { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, @@ -960,15 +940,13 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "TDM IN", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(tdm_in), }, @@ -976,35 +954,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Hostless_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul1), }, { .name = "Hostless_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul2), }, { .name = "Hostless_UL3", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul3), }, { .name = "Hostless_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul5), }, { .name = "Hostless_UL6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul6), }, @@ -1012,25 +990,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "AFE_SOF_DL1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL1), }, { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, { .name = "AFE_SOF_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL1), }, { .name = "AFE_SOF_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL2), }, }; diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index 08ae962afeb92..84abdba9ddb6d 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -932,7 +932,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -946,7 +946,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -974,7 +974,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, [DAI_LINK_DL8_FE] = { @@ -985,7 +985,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, [DAI_LINK_DL10_FE] = { @@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback10), }, [DAI_LINK_DL11_FE] = { @@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback11), }, [DAI_LINK_UL1_FE] = { @@ -1018,7 +1018,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, [DAI_LINK_UL2_FE] = { @@ -1029,7 +1029,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, [DAI_LINK_UL3_FE] = { @@ -1040,7 +1040,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, [DAI_LINK_UL4_FE] = { @@ -1051,7 +1051,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1079,7 +1079,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, [DAI_LINK_UL8_FE] = { @@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, [DAI_LINK_UL9_FE] = { @@ -1101,7 +1101,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture9), }, [DAI_LINK_UL10_FE] = { @@ -1112,14 +1112,14 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture10), }, /* BE */ [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(dl_src), }, [DAI_LINK_DPTX_BE] = { @@ -1127,7 +1127,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .ops = &mt8188_dptx_ops, .be_hw_params_fixup = mt8188_dptx_hw_params_fixup, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(dptx), }, [DAI_LINK_ETDM1_IN_BE] = { @@ -1136,7 +1136,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(etdm1_in), }, @@ -1146,7 +1146,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(etdm2_in), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -1155,7 +1155,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm1_out), }, [DAI_LINK_ETDM2_OUT_BE] = { @@ -1164,7 +1164,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm2_out), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1173,7 +1173,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm3_out), }, [DAI_LINK_PCM1_BE] = { @@ -1182,14 +1182,12 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(pcm1), }, [DAI_LINK_UL_SRC_BE] = { .name = "UL_SRC_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(ul_src), }, @@ -1197,28 +1195,28 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { [DAI_LINK_SOF_DL2_BE] = { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index db00704e206d6..1aba9c75594eb 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -598,7 +598,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback1), }, { @@ -607,7 +607,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -616,7 +616,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback2), }, { @@ -625,7 +625,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(playback3), }, @@ -635,7 +635,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -644,7 +644,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -653,7 +653,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -662,7 +662,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -671,7 +671,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -680,7 +680,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback9), }, { @@ -689,7 +689,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -699,7 +699,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(capture2), }, @@ -709,7 +709,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -718,7 +718,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture4), }, { @@ -727,7 +727,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -736,7 +736,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, { @@ -745,7 +745,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -754,7 +754,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, { @@ -763,7 +763,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono1), }, { @@ -772,7 +772,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono2), }, { @@ -781,7 +781,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono3), }, { @@ -790,15 +790,13 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* Back End DAI links */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = mt8192_mt6359_init, SND_SOC_DAILINK_REG(primary_codec), @@ -806,29 +804,27 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "Primary Codec CH34", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec_ch34), }, { .name = "AP_DMIC", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic), }, { .name = "AP_DMIC_CH34", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic_ch34), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s0), @@ -836,7 +832,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s1), @@ -844,7 +840,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -852,7 +848,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s3), @@ -860,7 +856,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s5), @@ -868,7 +864,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s6), @@ -876,7 +872,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S7", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s7), @@ -884,7 +880,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S8", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .init = mt8192_rt5682_init, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, @@ -894,7 +890,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S9", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s9), @@ -903,23 +899,19 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, @@ -929,7 +921,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 2832ef78eaed7..56b9d2433a1eb 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -913,7 +913,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL2_FE), }, @@ -925,7 +925,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL3_FE), }, @@ -937,7 +937,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL6_FE), }, @@ -949,7 +949,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL7_FE), }, [DAI_LINK_DL8_FE] = { @@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL8_FE), }, @@ -972,7 +972,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_hdmitx_dptx_playback_ops, SND_SOC_DAILINK_REG(DL10_FE), }, @@ -984,7 +984,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL11_FE), }, @@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL1_FE), }, [DAI_LINK_UL2_FE] = { @@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL2_FE), }, @@ -1019,7 +1019,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL3_FE), }, @@ -1031,7 +1031,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL4_FE), }, @@ -1043,7 +1043,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL5_FE), }, @@ -1055,7 +1055,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL6_FE), }, [DAI_LINK_UL8_FE] = { @@ -1066,7 +1066,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL8_FE), }, @@ -1078,7 +1078,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL9_FE), }, @@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL10_FE), }, @@ -1098,13 +1098,13 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL_SRC_BE), }, [DAI_LINK_DPTX_BE] = { .name = "DPTX_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_dptx_ops, .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(DPTX_BE), @@ -1115,7 +1115,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(ETDM1_IN_BE), }, [DAI_LINK_ETDM2_IN_BE] = { @@ -1124,7 +1124,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_IN_BE), }, @@ -1134,7 +1134,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), }, @@ -1144,7 +1144,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM2_OUT_BE), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1153,7 +1153,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM3_OUT_BE), }, [DAI_LINK_PCM1_BE] = { @@ -1162,48 +1162,46 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(PCM1_BE), }, [DAI_LINK_UL_SRC1_BE] = { .name = "UL_SRC1_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC1_BE), }, [DAI_LINK_UL_SRC2_BE] = { .name = "UL_SRC2_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC2_BE), }, /* SOF BE */ [DAI_LINK_SOF_DL2_BE] = { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, diff --git a/sound/soc/mediatek/mt8365/mt8365-mt6357.c b/sound/soc/mediatek/mt8365/mt8365-mt6357.c index 42cbdfdfadb55..d398e83ea0528 100644 --- a/sound/soc/mediatek/mt8365/mt8365-mt6357.c +++ b/sound/soc/mediatek/mt8365/mt8365-mt6357.c @@ -168,7 +168,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(playback1), }, @@ -181,7 +181,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(playback2), }, @@ -194,7 +194,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(awb_capture), }, @@ -207,7 +207,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(vul), }, @@ -219,23 +219,19 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(i2s3), }, [DAI_LINK_DMIC] = { .name = "DMIC_BE", .no_pcm = 1, .id = DAI_LINK_DMIC, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(dmic), }, [DAI_LINK_INT_ADDA] = { .name = "MTK_Codec", .no_pcm = 1, .id = DAI_LINK_INT_ADDA, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &mt8365_mt6357_int_adda_ops, SND_SOC_DAILINK_REG(primary_codec), }, From patchwork Mon Sep 30 02:14:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831599 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 994C7CF6499 for ; Mon, 30 Sep 2024 02:17:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1CE7C162B; Mon, 30 Sep 2024 04:16:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1CE7C162B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662624; bh=vjNpnhzqDXKnDqxEBw5ae7eG6dClwdQsA+gJ59PpyqM=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=M13xXHVO3Q9Io60CBiBLCkQsLt2LVPI+/5Jxe52ZA79S2SpvOJ0ps2DlNcB1qZQOQ LS0hGKcXgBleLdoyQetjYr9Tg4/lLWeFN/OT5Milrs8IwKQPgQxn0jMycW2VuJAYnT uu23DR7xaGOsrWzwL1DsWq6w0ojEzRFfhD/0bBgY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B3373F805D7; Mon, 30 Sep 2024 04:14:39 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 20682F805C9; Mon, 30 Sep 2024 04:14:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EC184F806C3; Mon, 30 Sep 2024 04:14:33 +0200 (CEST) Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazlp170110001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c407::1]) (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 A0D63F806AF for ; Mon, 30 Sep 2024 04:14:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A0D63F806AF Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=R2JLYucD ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WNw2oSAbeCQVoMI68DbOXtQYxWzzOS9oVONztNZPm788sxlzk10mbxAlZVG9d16+A9tee1eDmW7piD5/KSErS0Nph/LozyIMoSIcyqKQxqtivpNpX4hetSr4R4KpCcctZphGl6y1S2X3To2B5rihDZaQqWSkQLO3a3EriPdSTRA8exeb1bMDDfqRbweM8o9FaDd7jqgR7yzDalLtYStOzoePV4AIV18S5kXUAfsKQrfPbRIXuRi4huuwBaf9+wPfH9gnTq8RmAjzh8E0lHFlDXPo176Cqjvw4+Q8RcKwUNMQA+p3A7k66qnVxcJD98WzonDX69e1sJLi1mUz9FDP4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0qZznr1N8LMHa3LmfkvpMN3i4ohaD3VbMCuyex1GicM=; b=sR4Uz0XU5ZELuCLK0D/BxWtjIBXsjP5/pUZO3qvbK9Vwygw9HGVD8qZ0muPiWJgifxe7aMV700bNkIpE+F7Suo3PtlIy2ldPIdXiH+zoqW5QaRt2r+foq9EkGdT9d5tb4UpBSsfSvfdJtcCb9dzr91JDJKfO4Erd8BqO8QQBd0N0HZ2z07nQf4flvjtkks3yfgMcbvFGRueDB+/vZJbeBZ+Nk8To4gi1928SvTY5Vbx2psnkyu+PhKfHPhrXrlp33q5xeoWM9mmtN1083oos5EgiSPv46eLWLErdG1m9kas0aL39rX48etlCJQGMoPEQWiBddBL1CIpi/DCSMOsL5Q== 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=0qZznr1N8LMHa3LmfkvpMN3i4ohaD3VbMCuyex1GicM=; b=R2JLYucDp14JiCe1I/frOEEWYN6Ry6ncdWTN7ESIL/+e5pRUTEfjZ5VTWfbS6nLP37xunlwSrkxibNt6kOrGhyeDId+pz+annbZ7EOl4E0PJzstPJIFrgg0ekEceQc4QNBDlakW4jbKsKerMAycUGIPDLrXC8fjaAGMj66nIZIU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB5798.jpnprd01.prod.outlook.com (2603:1096:604:c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:14:28 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:14:28 +0000 Message-ID: <87ed51lwfw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 09/13] ASoC: soc-topology: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:14:28 +0000 X-ClientProxiedBy: TYCP286CA0101.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::14) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB5798:EE_ X-MS-Office365-Filtering-Correlation-Id: 2061d84d-1993-4838-4ca3-08dce0f59cc9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: YGVcsA08ypfwzCSa+YIIBkff1k+HrFpJIDIOAmmetBdVx/w3upwRnHzCfFdLCg9LHR0iwBxZALOu0MrLtV5qamhbgc+7PdzMp7wBBL5MkoVVVAvkErYN8T305Zkt23oYpUacqC0dUg9CuHwfFb61QaLI3kHQzhWTTCE1PUkuvJNBCm9r1ZMPvipuQivC7Ms1cNTz7hSYiniMpKdZnkVC4DwcFbTesSZEtxZ13cX1NhzpeyLfBayB/80Xai1RNbVh1VilGSPAHiQmvdl0bjHhfWg8LQWZFgBfuz9umJgbJVPg6o3cWILKVn0cYTDYm4oAXqS/sfViprAMDGxFaMNnVS6PB5Py23m39u9RogA4bmybPO3/iJaayURBNDVF6xkMKMSoVeTvi8YYXhmtcPdHl9gEGCpd+ihr2oLTfBqUMX6XLvSRqxTZI2GvoIVqgF5vbuoNfgw0C/5GUeEtt9W79pVqYqYvVaivHhn0XpG1b7yre3M84P3OOdya51yPJTvMi+gVHTdcgE1iKeruEm0uteL8vnQLWcdtBzAKxR+dQ3XJPDJXK+XMtuHaIUbv8TkZn3o8qzmH9bvY7EOD62yFOcyv7W+eL0J+I3uwiwpS16WnntB2xTyWTHKumJSOsh/ev841KH055GLgDzMbOX51cpq7H1uxDmWMGzqbE9JKhBZEqhet2QIbrriTFfnM3YUozzii2beREGgKd+uq4bqc2BGBYlr5E/f3Kw6cA45pY4cmm16W7sdzWwyxBU1xfl5bpj/hN7U9Bs5c6y6vjo1vZv5wdlAhZGNpVaPQQtEZCyLmKoN/hYAN2a2PunI/M5Idw9Qqs1MrqR9G/G2pmHnW/FKKWd/W8UT8fcJBGo3wTmQRnd6EZSYsTv7u8kbnvJwckxArK7nQ0q7HSSwpHel3dSxT8Hpz1sdO2hbyLuDGQAlY+iaF5mbfOpVg5pVzurJhWPMUjpICf/AntI4Rm+BOk5SKXpqWZ6gGIYsj1IJ3FlKz1lRZv5m/JOPocOZcf5bPOLwS1izp7mgrjd1unZlRd0eiI80DifHBuZl6iORwfCDafzPohwQr9iJDaKB4GxcziRO4NDbL3z1UuH2uSJeMdrjBrJk5Y6XofJzRh9Ve238D/ah44dWCEwFL+1m0ubCMESE6OZeAL0U/QcRSfockklxvlM0VpH5qZSAjYJtGth3fwTazs/UfbTaMgHI2S+WdTuR9ZHfVM4badv0dpSd+ll99o7AynmXsBTLQEUOc+0lnobXo1wdSZpTXDORe2YC2hvf4oKHKGrhWiiQPx8V01uAoAnT6jFK9ODPLjKJENGdO7M7BAr5hyUq1L+jvfhbVJXADdejodZGh+DxQqfi1kwLJj+06rmwUSOhjtwneqbKUrutHe3XsSjCVWmVr1I0z2QzePly5dwp4dEIbGdAGtQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9frARU1mp3Q55OG3R+bBAHxw41GYB8ECEe23y3I1lApxSpyg87VApHbN1efEeR9mi2mu1GPC6UYipFta0E7O+Bf9muPXFpVepzlG4l5+wQbc+I7qVm/fPUeH2a7V1sKb9/ebPQbjr6ifcnVPElDlQk28IQQd8ZYqAOfb0dBLFLxBNz27yBcsLDx1u+viuM0Qt04DVnF4oRIcYCWxaAVVedKm5TGcBEactQmWeXVc9zodJJovmwNSZrh10zbs8m7UeTy4mIfLJemc4wgfPNL1O4qhpknk5cjW/boC+e71qevusHeEbu+DL+jox2Y7DJbw6sR+AZzLED2L3ITGh+4NxH3Lu9zFp3Gz+JiUEYMJijtHkJ1cym8CRlJz4lAAjuxOstFXdrlO+ud/AL8oK6I+ZHShBPIlgwYlEx2MScA3uMj3kmB9kaRta2bFS8MNb0ytfnj0z4qdf78KADoHTsFFzQCIJQwj6i3fsh7yILSqWMGVnmsZ1GV3+K3m3L8ScNhGGlK0r7AlpGoFyjmwOEuUE0jOPYRRqUI0T4LlXp2YSQJ6/f2M6to1hmaazNE1WN+Tsjg2Zz5v48Ykha/59vHEZAy0h4n2h6Wn2XcmQoQfiOjH6c7bqa4H6Att5Y40HIg3L/Kxl4pwXBFevHWATLe4xRKKgSYDAKF4zbIvTrJVocdbEH3i2EZ02oFCJi9t7ccyLFdmrLQ32QohFMfrFTbtfFKfuD8FVqbDxs44bJhE7vuDTTAZfCeEJ37nH0IQKsMInu846t6aZisP4flifHCIlJLktj5k4xx6QXYrxRFgFiLqUtHSD+rM+KWhLeboEtPU54z1B3ozWYI5CoI1tFS6WiQedMNZ+HAVOiBdM3g8z0xQfY2+8dZjgdZwDU0jPYqerG1yrjCdgmbctIaFI1xvrdmZOz0psUIMexdrqGkcMXRAvyv93BiYEgtZ88Pir0i32lANkHLG0VQjUdRzivBlEpiciQqDYMRc6P1M5TnNTkDTFMgWlhHAZxWo0qBWDTZkTv2I08Aej6//AsgdLJ0HLEiG1O6IZu+RwjRI+4mDwPdA812Hrk8/aHDEjeo5X/YHE6d713jtoDqxZevhHxVbqfAnjpQMBvVhirJthgzI9jneSyYJMKtzeflr3hKOpvfLmMrxMi4VYG+z9oa90DUSEuWvPFWDbxhhgbLnnPYNHdu1TefJDSvdq4TSmHtsFiY9CzjLeYbqMnn7OMOG6MKGd9W5dQfZs4N66SnePymz3uAL++znxK5wyjOPdNTpHhz4uEIiIlUXnaPO0wDPGKWCpTruoSppEXyEvaoCjr3ksHg7EB0eDnrZwGV4C+U3NfguQITtfEwm+CL2zIxl/EpkQ/P2r127lVu9cIDu09wBOjMCMGIpNqvrLnBH3JHCgiKgm/yT9l75tywjOQ85r0z3wcT/fKODM6/GAt4LqsSy4LU879Squ40OsNovu3x31w8ED+JTsrBzkofEoAycWtZfRD+e0oQ7CvVQoly8zxTH0zMe23SHjoP9e1AkYImkDTHQc9Yxlt4AOCk11A91fSXppvnXcD+XCq1UaZhly9HbmZvJjj/AEYrTou4tJFYhTB9rK+SKa2novs3Sx7vhmIcwRaH2D4Y9Y/aMLH2fWoEy5Q0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2061d84d-1993-4838-4ca3-08dce0f59cc9 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:14:28.2660 (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: GzPfXraTC+CDFpFoBzYSdCh0pZtr5OCO8gMHTG1PYwkgpjoea1tciQRJU/ogz1ZdIO9eO/EimGRJYdmOVOYixvmD3VfIHMUUCPoDg43+KXGQDwvRmKb/EGmS4JQaqKMY X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5798 Message-ID-Hash: FBW7IYY4563COU6QELQLFA2G3R4V2VWC X-Message-ID-Hash: FBW7IYY4563COU6QELQLFA2G3R4V2VWC X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology-test.c | 2 -- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index a2b08568f4e89..c8f2ec29e9703 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -88,8 +88,6 @@ static struct snd_soc_dai_link kunit_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index af3158cdc8d54..93d0ee68059a6 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1544,8 +1544,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, /* enable DPCM */ link->dynamic = 1; link->ignore_pmdown_time = 1; - link->dpcm_playback = le32_to_cpu(pcm->playback); - link->dpcm_capture = le32_to_cpu(pcm->capture); + link->playback_only = le32_to_cpu(pcm->playback) && !le32_to_cpu(pcm->capture); + link->capture_only = !le32_to_cpu(pcm->playback) && le32_to_cpu(pcm->capture); if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask), From patchwork Mon Sep 30 02:14:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831598 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 815C1CF6499 for ; Mon, 30 Sep 2024 02:17:38 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9156D10BE; Mon, 30 Sep 2024 04:17:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9156D10BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662656; bh=G6O3FbFLkZiAkNzy3cz47yXID6ka4yLo1YV64oO7Gw0=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=meVFbebs8EtXlseEQAeOTspOwJC8GIMI75UK8FgddeijzRlc1DVcfLp5alHYQC2vF +RFRMzAgUFo1gzOWqqgw+XZYd70Iw5cCEsDc+pMIZs3waq5lHoH6h1vGcHyheB0ORJ yMYaVy1+liPPU9cjjX7RUaNa2bPat6rPIjackkyA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 40140F8076F; Mon, 30 Sep 2024 04:14:50 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8E9FBF80768; Mon, 30 Sep 2024 04:14:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 63008F805D4; Mon, 30 Sep 2024 04:14:43 +0200 (CEST) Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazlp170110001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c407::1]) (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 991ABF805B4 for ; Mon, 30 Sep 2024 04:14:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 991ABF805B4 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=WQbKI8eL ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F3XY2v69UuEYegsbntxnTJzjQdb9Kr2r9HWF3gGzraL+QVl8QYkme+GC8Iu4EeeH/FoA4PjWidDhlKXIObpaXZcAqoeQcLCJkmQluGBdcO8bQ8c3x5EKPTU1nu9QMt6lrXmxA2wwpsUkroFVrvK/tyYDMqaFpv2QZl1Asex+cqXevnurxTxsow+/wUB52nCiPv6+5XhgARcrgMKDSgFASJY58YA9+UYlCNajlzs7774t2SP4Vj6ucDSwEtBk+WFlFt3em4+npwHHLP1v14b8qmjEdylZeBnNUwkbjuzP3nOhJucvK+v5FVivaAuIf/enH2mSmpeGNsqI2ToTxCCA5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=CFI9/tZ+iCX79zEhF0xVSCFczVQqTc/RxNEUXk7rTOM=; b=GulOSZQwmbuBVHy1rH9aNiUV2T9XKp+VK+CmrPPb3gHQMLbRi41UerxaxY/eJq3lPk9eVnwgm376+L/RiSJpIjmo22o7oK96aUHgyu6/8090nfd59xVfGlE1Z67NPStVEe9V1ACzhlHbl/Le7AWDOZo648Xz6LyvZ4oJnUNfq5SbozrlArVkqgO6renHHl2kGyKLTERKUl8pHwxw9NkAf/92eRktKDCJHU8IdSAbyLECgb6KMcZuiMY6Du9nndWJjeR+uGG/+SpcMpT6cVes6rcCZplsmvVCT1IK6cBTphadh292H9u81FfSSEHO99YXbt1HB652SHMXLDJosLKsCg== 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=CFI9/tZ+iCX79zEhF0xVSCFczVQqTc/RxNEUXk7rTOM=; b=WQbKI8eLJ1DXH2r33gRyYX8bmzyfTi/x4i1kaVVmuG0ZlfdvJuOYgOgEgJdchXJNhxioxEEe+88ADroLvIfq4j2/WuqBvtLoJ9vPTMN3OhxQ3wRHeatQou+mC9HffKQG401jqIp/4vaF1lHlqX15V9U4a3LdeK7fmWXFwUqpuKg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB5798.jpnprd01.prod.outlook.com (2603:1096:604:c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:14:37 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:14:37 +0000 Message-ID: <87bk05lwfm.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 11/13] ASoC: soc-pcm: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:14:37 +0000 X-ClientProxiedBy: TY2PR04CA0011.apcprd04.prod.outlook.com (2603:1096:404:f6::23) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB5798:EE_ X-MS-Office365-Filtering-Correlation-Id: cf95862e-7fa0-41b3-822c-08dce0f5a23c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: 9XdgQSXlp2nO59vNWWy9rrkmSa3gS1Ma4pbYtLBPIYOjjBJL0eEiK2SzI4PH3nd1kad77LUnQQ4qu4dKB6Fb7Xp3pst3kwV3i2vIm6K1XiFWch+jDKKhIiR01ABsZ/ps/SLfP+ESHuyF/4eWMMHsBVH3liTfNJ8rqhs7Wn5qZMQdX99jcxR+IM/1pLBypPyXonqavmjczuno6iVoJHrNpx+F4PHbETk6ZZaE+snRVZFI3Mb3MJxlCjD/6bxrANvHzAttmiNrtlm5E/Nd76RnQPf5yBnq5UIbp8xAXfANID2snw0kURr+sWYMGs6+2JI6iA8lTVhF/q9aBjIMe+ENYiOhe9M28/2PkdYX96W9Srow2x7tU0vMQjfBN3AWvYunIG0j4hNHm70NquocwnVYNmKvQrK6ksFcC3Y232CE2QpXG94953Lbwc0Gr4s5EjYK/emz3CMOAfdQbhbVGcPSF2H391vsUYawrQDMIxtXCHYTfMopwGLBwsqINyDoBm3Q6ctEooYN/ELb1WBaAjsOc6CEoqXYmTPSwZe15KOgCRyjdhnrXCz0f4JW8p5F6Q/A0iU9637isE1wK1Kvkd6Q/a1WNxLdY1DQ4JM5k76LvTAhXVuhp2QfGDn4kfEt8x579rIDbxqjOZfQqWk7ppYskSagpw4mAT4UxfaYbvPDWV45gNzEKy/Lvslu9WCVXqlV0rez/uIXghmTePB5SFbhfYUgl7BI/qqUxWONsDFzOMzlKiTe3bscy9IiX0yOB4Qz5g8lzMmZOSYSqQUUApxA+LCl8aAI8fQqV0HalDYzDBXmtuX9tU3e612DSkg4jWAhYUcp4eCXH/hy/kqML68ptc0dr2SlOVBJeN7V3hy/McSEhlub8Ok22SzJ9hqXZ3e8aP4AP53RrGPDjyLOvFnkGF0yAkhSFg5CQVSjweAkNn4kQRKr4PX9WKqMIa69ow2xBkTlekWqA8UAqihJZmVbx6brc/fsigLNzaZij8b2V5+/eac1VQ2F80sLlyjl3YEXGu97DK8NM9mF39TXj/4fnI90vVQNhBZAYehLBETKrn76H/sHwc6RqesXBongG+jcx1GVO6jIWIlUCMJ7JZlfF0gcU1ecNcVBk0Cn9IfJ5O3eFKaG2PlyWpOcZ8sEtbEwSpC5CsSHgTtCim69LgiV7E8IEm+ulc7ZXret/VmF/3Y5fd/puC6S6BdgAO3H7Ksg5PW8cyTa6WdwiCUEe/tZoN1uJsAmOwk6M+iPGeD2JLZRBgA4cMqS2WUEKjreo7LnKT16Uz5eG3l7Qc66fsk1Vq1BruxafGxG+er59tgEPYGEh2YpjHOb/LFZxCjGthIPfyAcR3CZbXB7f1ikz6LuHeDd5O8fXk//colVugVTDXG1oH5GkGU1l+ZzoRi2jZmaUWC7C5AF6g6mUdE8lcTmmQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jzuTKPEbVSC6MYqwwmoBiGkh9I6tRuIMMFzj9PVtuqwVpj8OXzKty2ZeM8Qm2AMGKvm0E/0py6GX2g6c5nnK8HyJL4jOQxyY1CrskNiIvqiI6gPh+4n0eDfcEDpyZFI5WG/VTKZ+r6FZ+x0MeqfO6MoJQGiTRLQLkAPyRawX28EvdOxvidQKD7OnKXhwZSTN6QknNST55RoAfey5ZXZiA5LjRLQ3XSIOAMyxIg+zVPbIr+a/Xxi5p/34887tVuOTPiUcCjlqWysyZJRUD0rbyniIk80hnKvej48pyRLCO7gZZ27FlxsHPUg+yigVzb3BfWlvnpSdoyQoLF+SXk30dQ/dDyYLmKpYpeN3C7ZVHAmhfefe00CY+HfoPGY0pN+TJWXV7mEv9zJ9K6ko8wg4EaOyIBhccPkUwMRzmmDplRJtoZYFbP3SYXj1HtlH7YwS/9rRy8VmbC9JSvl/aDHIPHKxdiRMRaOhCOSj0jj2bP4i9bNxziFYpfxV+CwwR88e0p6Nww//244bQrTUx6XNca+cUWUYH39D0Qtk3LRLgQYqn3Fc+Vj1lpFEsYR9/xzYaMi23RrkWhWP264NTuHKszQsaZ1tbUBKH2VnUkNbjFxdXLPzKWCkZvHy/JOzAcu2gSk3RJw1MUkQUdcgGP8+FhyTCT1/9XEg0hP0+wsRUcgj1ge0GVuDFQpsZrdDVfGgk3MSzxQ7IyKrOFo19OA/yITSTCwEU/et9Zm/p1hPFzKojZzTnveRLxf2WW3JduVB6o9znvt6+DglEZV/gipvCcrZWdMYrYzXXK/qSuM4Y3/v9VFfB3OXEo4NA7UrZ3wmxIxgw8LQ5k8bBYuo8Q1Nn4FgBYiM55PWIotgSnazIMOIItAkj/59R6KvxCbGeUMvtqUVyt92jxxoiBB4XR/niRO6UYgg2XAlwPMPO2Q6Hq1Ua3FGn+ZNWxjLwxXmRnb3SMUSICHUIU3WpmDTYFkUcHZHfe4+X5qsnCFuaZVNWcw3pLYqAjUXYMxpDTgIgUZ3N6QcfA0H0osp/8Im9ULe63+wfwMehCkqeJGdsuPFYauHJCHx04h8Lrz7cst1eBgefbCG8iAu4cdggx/X7cN5qGtea3f1P74rUe0TaxKMDYQX1+7Ierf/ubwlM9QyfYG1hSPxQeOBsWuFaYQXbeymr9xonSeINvxj3XQw2RMmwfxh9EHt7eo27TVoHN0zqd+TvUYOvn4lYtE8l29EJZnEQ3hralOggqgaiN5dD1Sas71HdAsT7qhkPUXEzJw3ca7E45q3YoUKho+fCavs2y1QGtmuUu5YYmJuKKMq+hhrwED9v/feO7QTc6Q1bU6ZmBuRd0T/lQhT1NQfsH2G0Nrt/FWPk2Ru38gThs270CbHo77jxjMVaGQAppjXYHj8I5B7tCRgpc43gK2C6ByXewZkpsUQpHfyxy67zCyaqk9SzaXH1ZMxWlgE6SzK1Xyx/nt1/A7eewBobJLGjics7lAOzfA5qgV4Bt0Q4fyPyNeVafwogeB83RbJM8NMsETl2/ZgQF9mLW/zUMDuz5myvL9NOZ3mnPaJxMWskbpV0B3bVKTpw9TobuNhzwQRWU4+Q6LD7fP1Gl/rn2s/a770ebqTEt6keaWNHM8ZQOABh0CSHPA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf95862e-7fa0-41b3-822c-08dce0f5a23c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:14:37.6864 (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: 8IaAwojD1fmqLCLqIu5qn9dmBZ0Ts0wq+opzZJ5DRm1vFmivxw5PAEJr93bfk/GDl1yeVFu/em9T19uMw8xUH+eDsU1ep9eniaXZZjEuuuHbJP4JaGPx3HJcdfvQ7Ab4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5798 Message-ID-Hash: UHKWTGBSCAEHVNRSZXRHEE6WN2BOR6QX X-Message-ID-Hash: UHKWTGBSCAEHVNRSZXRHEE6WN2BOR6QX X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dpcm_xxx flags are no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 5 ----- sound/soc/soc-pcm.c | 33 --------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index e6e359c1a2ac4..123a0140a23cf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -815,11 +815,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* REMOVE ME */ - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; /* DPCM used FE & BE merged channel */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7a59121fc323c..27810f6f86302 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2860,39 +2860,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, has_capture = 1; } - /* - * REMOVE ME - * - * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used - * as availability limitation - */ - if (has_playback && has_capture) { - if ( dai_link->dpcm_playback && - !dai_link->dpcm_capture && - !dai_link->playback_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using playback_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_capture = 0; - } - - if (!dai_link->dpcm_playback && - dai_link->dpcm_capture && - !dai_link->capture_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using capture_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_playback = 0; - } - } } else { struct snd_soc_dai *codec_dai; From patchwork Mon Sep 30 02:14:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 831597 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 9B83CCF6498 for ; Mon, 30 Sep 2024 02:18:15 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D8552162B; Mon, 30 Sep 2024 04:18:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D8552162B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727662693; bh=Vw2xYdXdckIo0v/pRr6zwYaapVl4vL3esBItTt93teM=; h=From:Subject:To:Cc:In-Reply-To:References:Date:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=RNYi39MDIxc6vxQ1Qb0zGq/j3lTCztNa8DHFqTqUrE0c5TUpKWoXnO7yO8HScAsOL adWq1uKUlCTpPjpG4Grknr45+oBmE8a8UWqUi1+nzQ3UzvE7+e/AX7JJ/ENByAJYNx d4J6uHltICRESHLP7jJBXpP10BQOExqg+764Iq7o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id D9799F8080B; Mon, 30 Sep 2024 04:15:00 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DFB37F80854; Mon, 30 Sep 2024 04:14:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5B3A2F80806; Mon, 30 Sep 2024 04:14:54 +0200 (CEST) Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazlp170110001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c407::1]) (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 3B76BF805EE for ; Mon, 30 Sep 2024 04:14:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3B76BF805EE Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=renesas.com header.i=@renesas.com header.a=rsa-sha256 header.s=selector1 header.b=XBxDYyHK ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fcq0C6M8a/SRGmgPavsxHJ/fWDhYN6mCe2ODm8hYN49m8yFIkHK6Bzwd3Bm/0tvHbH1cVz2iUBUMXC92mtQmKNTbhaG36qkllXUHf84o6pVstN4/nct9Tcn1I2J3DUvOZhhfoWUHJQ41FBnLXrP1urgLCHnWZM1uxCTyB7bZOAlXnWGDzlhnqm0cK9/+0E7Rc3bWsS/8+Jjz5j1JalSDo5cSQceFky/nyvSoE8RYq81Reb8XJ5zM2v/eKpzzkLGFkvzIW1sqbpLFYhknw4c6K92F5R/uG3jzM0ImmxRyzghq7wJSBIjwPc7Jatn7lmbzuVMo/7KMBoufnFiXQKjV8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=bOovbfK6vR/xOXcpsAN/tbbxAML/E0D1rQC/dk4nId0=; b=fAb9BoGwHiyfyfeae44Hm1tKGPTTr4dNdIX2T/1D9/kzhptkp4NEhxh241mRDejzkx9GwPrmjxNkHf8dS4izJOZR4X81SixCy0WWiqNERclpRNxLce9Sqh1/dyIaifYK+8IYI+oxt1wc/s2XY6PBhbr6yXKRZv8AQrUTzJVgrsieu3iZvv/ctSAKkKJoaPABAI6NIVe0WJEQWDbhcjU90Ru3yz5NbUioZ6ftujQc/Ok9lCzVjjYf7TTOq1wjT30U4Icz8kRMPqYrXeh+k3stoxYqmhJcTkgF6yKA0CaiCYTgaOw+0HncbrGzpmXd0Bs0nSXzuA7BqmCk+BFyHC7c7w== 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=bOovbfK6vR/xOXcpsAN/tbbxAML/E0D1rQC/dk4nId0=; b=XBxDYyHKbyqbY9psHRa06WSj8kGBDBdWqaRMDwWspHSbVnzmc+4hf2SfMr8bLs0AlKx7xQPGZOBVV/3UEYbdTocffHA7BOg5OY0G2YJdZOdgyk0ar8jyoALT13uVQRYR7hmwKqTpzC3WSNfKNCKbeiqvGD/U5sm4LBNs9z2wY9I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB5798.jpnprd01.prod.outlook.com (2603:1096:604:c3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 02:14:47 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 02:14:47 +0000 Message-ID: <878qv9lwfc.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 13/13] ASoC: soc-pcm: merge DPCM and non-DPCM validation check User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> References: <87r091lwhg.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 30 Sep 2024 02:14:47 +0000 X-ClientProxiedBy: TYCP286CA0009.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::11) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB5798:EE_ X-MS-Office365-Filtering-Correlation-Id: b9f06f06-7932-43f3-0091-08dce0f5a83e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: vKAH6fG46PoMI/qQQqXIw6KLXSXp0PuQwSqRuaSw2qbpta/QohTxqedgHssDuqUVGdMoiDX9reNFBN+Y0I31gPAg6EoMVHxPkVkRMS0dDf/LgukE8Z0joE0Kic4VlkQ+9oX2BwU8jHwMtsK+yFdYpGkaM0Xcv7JxWna/2ko35FtG8mRe2vPmpkBdlUn5H2QOQD2dJF4D80JQ03LtvDs7he0LrTbDRpKLQtqdoxs6ERo76A1wFNwr1kqBj4k3nmidEOb747A58JfYuHp06e6HVheVieeK80bHwRIB3FhnIKQomECnRZumQ1XdLl0D/XSxYSZYm0BfEcGHUQe0PazSZqX9wUoCuCIqtAd1UHv1uqioqr1MrADDwHimCz8P03UBgulB5bSa/h7qUxzvGPLJ0lx94j0QyJ1vCU8OcnhMzALz6oK+Hyf2gCXj9uOZgwZ/fXHO9BpM/uHrMzPC9Rf0V/rr9XfYPzcM/78g4MXCVTqNARSx5LtLobr8Z4BvFJF+ZZ/8dy52rjIsIPOpfWWSO4uR5PTZGKuGwyhb5XEQcIoX2o6IgK3TVPfDL0G6eCYlKNJt+sBRrGIwwd2p9RVHDvT0gfDj30yufYuhCaCX8aj2Rh5lcGlcy209/vBb6DcgYrEunDKQ7LZCoqbyq80ISZOQiw+/NtPRFPo76VsCfVX+KJexxhCfvnQg0sRuFGsecWnfJqJlaGF3O0XeLpkKSIu/xKfBYMj4JZcQQFi966dVA7R6mizP9FVW6/5GBVbI4PS4JE2VMym2HGEXk0qBAhQcoeS6qIOBKUf4IkKuINa77SLAHSUm/EJ7+UE2iYGPfSdY7fbB6ML3LrjesMfy8NhjnMo/F9MJT2/gcRGfB6Mgp9w8xUCTHTyqfv7Ezis5y7vJ2BV6TWetOQXSz5gACkLpHUfjggJhSCZAXWH6PQniQgtwlAgYODo6K8ySONnVHVWEMi5W8ZzSMsuPGwqd3NbMh9AcxXr82HGn9QRI4UB9b6NUmO5mWzfGmnYtSWw2BYvtxLLzWYGY7+GqvDUVzA93W1AiBbiLiJBUKye7btLvylDP9K21WXj2G9ya1jEHwZWQmrkcJ6IT3xUOFBc+2JOvXbB/1aNSY02+rKaOwSm4l8Ev+vEEjeBl0DpOWpQa4J4fQnkRmAhSm+4mHHN5SrMPEwLkxhzdlsCsja2JtuCcGV1lLuJn6ATTwNyH+f2vldrW7vBpiLWjDCuwPi8bwV0QVXacFE7E28FV1/Sr3y3WVkO9Es+SzacEgZcdV1+M9M+ptonEcFHlHTHCiAGauZ3vaKn3vBzRkGoYiiSew9tEA/N5u6zqoHLjNQ1cZJbyfs0PwtvnCR6ZexbyONb/ktnRC+BeGdOxxj/NcwQqbs0b3IilF4ywbUx8MHHYCtuhZ4hBUCym9y5tquY2/78HEA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gx2TcEaFQZNjoB4TfKEovps01+sKO4qYFmi7At3z4rdZg5HG6S0DDjX5iS6ZI+1qSgLmwpNrjx8LfYnhGQQ0YQfiLqVSb9+LBTtgUVgWrUjperiW/GfPvlOb5bOteKvC1Qyyv5JHs6u9YiSDT7TWfArr/8BGsw3RF2t3M+EfXIV9iKm5CMoIQQZP5xa1AiFJmkLo9WIH1IImogCx4k67cZlatS+CjiDdHcQKs7vzQT/w7KIdg83SlEQmX8YKrqvG81gkecG8UNT8Ppo0jCQpxrdMt8vKvRyJja9Ev8u8kt+TWRTTu4j5uEb1wUWcmLwei3wrgJX8UAbTpxK+uriHx+WYnJunWlelS/Ib9thbiRI12QaxJMUdu5Qkz+0qE+Ikb5i+aQw20CA1tKg45RinBNnY5E19YjAuTqHzTSUy9+bxTg2Hu4+YvngicbcfzmDgvgIApOxQJNAAXk0CxkswGL6ClJMTOAJbd95jDKdtJuDMhwI7nuGgvmX6oXd/kk868Y1euO2wWNCU3ZOKvDTkl0TWdDe1G0ZOZVhX4cWt/7zoenPWSKjr0D/1fvTYpC80nx0C81d6PjKaYpx2/vOW+jMOwhqeuXuImJBNsuTrUZEXxB3mg3XfcSqWH+EaI4y8bpY11vJLhQal55/rDLF/2EPhP4eqCkO4C7AUHVXnJQzPfj2IklZ4VW/iqfEGcre5b6rZ8LaC/Q9NgpP3QwLTKCVTj9hye2Xs0DWE4LmE/hM3EvxD1z+94XGgkPOMGcx2lwYfKgqSwxPrXaAmjhL+NNDJfPFVd6dTOvuTZ7pM8kfwep++nGdf/E45N0GghcyPyh+cOR4H2S1Xl+klg+LSRfhhoWjY3VtfCRfL1XQq0xh0r6yULhV35X9frCOU1YUNKnXh9KNFboEtE87sMsQmrcsAFx3MhAcU55nfERhl/+NZNnL6BV9hgy2xVqhn0BT+Xr7KciizqlfGdnOdJglDfrU0hX7YgI59OzhBFSNwIWyF8texXLiglIYZ9TRpaOpEDPkou0whWuPHTYfzaV6+57WNiQRDLBni+Pjl8Tb17VizLjpaao1tz4vIGuIN/ysTMvYykVqb5bnbeTJqwSlNTeJnf887MxpbxnBcWdRbWRzuW0As1Qm2/OMbhBwB51lVWQ5oGB+NbFp2v1mJG9S54o3jjnhoWEH5YLVAcvQXSb1Rvw7mWIxfGSwgpD57Zh4f2QGXM6CrtB9ktmVR2SMtck+NAAlvw/PeGAlxw8hKr3tlM0M+cDs/5ZAVqItICFAm+5hdbptUgCjvqtjJve7/FjKb1g/SzsUnp8JRjD89wgfWKpB/q8CmtfxECLi++6ycDUTI7C4MtfxwaBa1kYgqjhzhZ2d3L0VVM9VApSaNpy5j3M8LDBdHUzjgWyTmApg1Qm/MuBhm7grdvBMfI6EGTjW4hg+ruOrhHgtXpuHOPRJHGlBEadIQC4BZ3qLiaXTlSVmj1bg6Q3JWiHIkUFhMaddfsQ7ii7jLIDRyFCcrIl4hqLHGZL8Avhou9ZWiBe1bcKUrZrAW6teqLymyKMx80dVShqr9k7onEARi7hmdQqgyL25ANcfwv4ZVdnswB6xtVmtNbSQhp1RO/QdkyUPESqHLHNokDl1nCwjsktqcYpo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9f06f06-7932-43f3-0091-08dce0f5a83e X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 02:14:47.4861 (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: 3sggcjDT8NhjYuauZ4GKDmslE5ZbgWdrt42dVjXx8uPrWVNmFm/N1C93cht8lY2Jgr2NGILnbtGuz7DUP0ckIXVLqamHceYI3Yoc0/IscqtzUPlY+/z/qsF2wfk4QLEk X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB5798 Message-ID-Hash: 3JIINAIPK3H5G5ODA6QPLQEDKA7HACHM X-Message-ID-Hash: 3JIINAIPK3H5G5ODA6QPLQEDKA7HACHM X-MailFrom: kuninori.morimoto.gx@renesas.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: DPCM and non-DPCM validation check are very similar. The big difference is that DPCM doesn't check Codec validation. This is historical reason. It should be checked, but it breaks existing driver/behavior. Anyway, if we uses dummy DAI as Codec when DPCM case, there is no difference between DPCM and non-DPCM. Let's merge these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 62 +++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 27810f6f86302..76cfb6b115445 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2838,7 +2838,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *codec_dai; struct snd_soc_dai_link_ch_map *ch_maps; + struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc); + int cpu_capture; + int cpu_playback; int has_playback = 0; int has_capture = 0; int i; @@ -2848,40 +2852,38 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - if (dai_link->dynamic || dai_link->no_pcm) { - - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK)) - has_playback = 1; - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE)) - has_capture = 1; - } - - } else { - struct snd_soc_dai *codec_dai; + /* Adapt stream for codec2codec links */ + cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); + cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); - /* Adapt stream for codec2codec links */ - int cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); - int cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); + /* + * see + * soc.h :: [dai_link->ch_maps Image sample] + */ + for_each_rtd_ch_maps(rtd, i, ch_maps) { + cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); + codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); /* - * see - * soc.h :: [dai_link->ch_maps Image sample] + * FIXME + * + * DPCM Codec has been no checked before. + * It should be checked, but it breaks compatibility. + * + * For example there is a case that CPU have loopback capabilities which is used + * for tests on boards where the Codec has no capture capabilities. In this case, + * Codec capture validation check will be fail, but system should allow capture + * capabilities. We have no solution for it today. */ - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); - - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && - snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) - has_playback = 1; - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && - snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - has_capture = 1; - } + if (dai_link->dynamic || dai_link->no_pcm) + codec_dai = dummy_dai; + + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && + snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) + has_playback = 1; + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && + snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) + has_capture = 1; } if (dai_link->playback_only)