From patchwork Thu Apr 18 04:12:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634104 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2089.outbound.protection.outlook.com [40.107.113.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24CC14F1F1; Thu, 18 Apr 2024 04:12:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413536; cv=fail; b=ZjXRTLsDAcFTIefvxGc9GgUu+Tisfx45+3r/m9OhFbOjFo3Y4W5NJcDdKfzpbm/eheJLrMmyLkLwi/Z1soH7bMmazMdEblfxoB7U4JENuSWNNaiuThHUEzQ5Hgw0Tp9Cfk5K9fo7soJ0glSkd/4tBUNy9A8geaCg3ljOSYG4Qa8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413536; c=relaxed/simple; bh=8jL8LB86T7eGJ3Ate7/tzUbSCGIzS+L7OFFIkIXc//k=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=rEQLgbmczxm2MNBKT+DrcNJ5jO3uRVNgMUCPzrVi5LyzBVsBKHk2wlTxODM1TGFemzTcmI84tah9IuGoiEdlK33Rrcp1YUdtUIqdcSb1RziY76WRT3wjSfwnGwfjT3146ydNHjXTbobYJDFmy1CZb/jMlLT98p/uMSADiuQ2VtU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=PCjRuzRT; arc=fail smtp.client-ip=40.107.113.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="PCjRuzRT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eQ5oHstxBsuyFSpD1XehuKio5vuERWXN1jBbsxMEPYv/R6zMpePegdPDJ6pVUEx4wzl7iIgObeHPG1iZu99bYep/qVPrCoFQiuGTmOzE2FqrNdyz78YIMWP58iCNq0cW6zJZXTDOOjCOAwiZ+N8rry7ADdo7DbWpZKwmtsD9eMH8ORB1IHhEjoVl81r/nUzc0vj/TnFW2k7qaTgjPCDgnbTPAM7vjWyO/up65dU3in0eOCqHcDlIjXXgoZ0dlCLOr9F2PfL3eQp5djcjezKFh3uXxk1+wve5/WhABu8d6hKSwxHvmPfDv+Od7tS4zPnVYuCpjtnT5K/bbdjtK5PSRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j2Ycdojn/t+pCLYQ2A05TL2e33ISobYZ9pUaIxMnqmQ=; b=CsdGJZMJUQUxozPLg+Rj5l1MU85OMeufOv2DpeaBj64A9JnO6iAZv5Q9KTh0firdxltVN8XNkC69CbTsssA8L9+uxDUrL1hnZXEJtD0J6OyO/Z6oW8WefprzTGbZHl3IS7fSfhDlr7sj+oO6//V5GsiDHP7WljHqup7uDFTfoRg69GPRQJQaoEamXJx/l+fm+NYq5VD3PIfERKj8RgXIH1ldgWf2mEiNQn5FdyHDkLj9xXR4k5q16fYqblwpovC2eq2snrCEJJMfKa92Ou/i8VYx/xTdMbXc7cTyzm5bpuSt2GZ6qweQpSOxGiGVOiZqmxzTwi364Q8pHidtrWX+cA== 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=j2Ycdojn/t+pCLYQ2A05TL2e33ISobYZ9pUaIxMnqmQ=; b=PCjRuzRTo0aG+zqTqLk8/lSKNQXDcDnjEdRbD0Rr+37DuD5EbYRFFTmUiS0wTUxDx8JN06yZvqaiPqvRmgInQZURjkoJllcvmkycz+y7AhQvww4zrapT072NwAPrzpi84mkmaM8EEaVDoXNFb7TQLg8PqAoG1GYiwzZBIkBk95I= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:12:10 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:12:10 +0000 Message-ID: <87frvj8g2v.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture() Date: Thu, 18 Apr 2024 04:12:09 +0000 X-ClientProxiedBy: TY2PR02CA0044.apcprd02.prod.outlook.com (2603:1096:404:a6::32) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ebada18-eb05-4631-e9aa-08dc5f5db7f3 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vu5LHD/Q3VFxzmjMmmdwmWFcl0cR8TmtwU/b+VfExP3a9MTM0bdfHL0lh6PBsZX44u9SkfoCYvWciIhDmCsnhK8ZQJHPFQ7bPtB+3T/uxBwjSJHQs/7/sG175LeTuMboZHN+JdLldzjYK8+/EhkYpNSX/rkik9Y2JhjqA4obUYpvS52+F0rfN+gsbz40Wmw+m3C24QKhdnRp2wmsa1NVOvC0dmiC5LmA7M/zf+uDzKQP6ZpBA+2vIkF5gNS49XdfAyZgBE7h+Sw1BMmzaAeiJUA3eJlDYL4s8DqRo0BKfjcG8QEE8VmGRdkYKu/AqX9ssG3T2/D0T9+7zlrZHoBxOExqS8V5uJYNXNA0ULDScbdzTG2v9acIyJf7m4BRn2q1GgJWyWU4EXlOsFCt6NXvQ0KAtc8f+rBoVkTy3q+f5uAyeZlEswfLH74iPGCUpzDzfbcE9MU8vkL789tL5MjCLd5CcKdlkcKIk5IL2xYFYWf4XR9fpN4IdNgm55KtCBfk1C0PA/sD2w5XO//ldjSa80O8+g0MvTaSZuRKRTyT1CYACIisgFQ6FyS29hw4DKt4r2aQXGExGdZavHLk/IxqGXsR111jgb2VPnCAkqcLoAuSRBJ7Q/DkEsVwjRfjg6FhVo2VMEGCEBGgttszeL5Vp6kBOOh2MZOnXrJvd0t37kw6CN22q1IJps8snqGc0gemN7dkiQBADd840jHYX3x1AT5y0Asj3ceWrSjr6KQ5O+k= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r1djbpAYn7B65pg5iTsi5lLgZ+k+C084i3w+ZVge/rHXBdVVjanUGFV6LuWw3WX84b8Bs78wmzuHgPXwFVaGMIFN4p74E5fpCo45te4jjyiGDOcZ5H75fU8TR9Ijhom7vFwzglpvq8dlXLGJzf5odfQaUrQBU5fOg/T4KeoLGIaAkxTDAtbe5aDl1iq0doZCxAdumHVtS7z2siM5A2lw+95nu37MqlYMumi3hpLU3GX7YZUK3XqG4vs2ne9kh2Hx+OuHfEWhLBcWyuK78/AdrZHYoB+FKgbx9c2DcZorKA4rMLZW7IJN7L7ctP7Teh1OOYPrYW5l3Vi/RzDAoPkCKF1lZMCU4kxaTg/RPSWhZkYAqy5yyXz5gpvXzCYV1Vz1xE67ZF33YnD7A+EiC2IcIgHFqWtrdSdFYX7hitLCF7WgnYZuCcJovVhVbQW1JdKEoznEwz+jl/4ooCbL/dPuuJOgheyBVEzxqIDZktOsu2xWebCmsGqospMQ26oaBGWvsUuDhFtyXNb18wZvAZBd1/WQniMiKvsGz/8NXJRarDw1k1bfPqz9w+46PGMFHPyUZMJNk5XeKzF8ZZoqoEuiuIKHDYqOpToiLsz8sNGqDCaRIqh93aGa+DELgbvdEBItTCXwj2PBIFmE0Phs1A1je927lIYdrLtOAPXy8N+VzWPhg5u2n/ICEca9CvtfAv/5RyclXTeG89mOOlHpbmrW/GSgblDBeOllDtNhrwNDVNWvvF9QKdhKF/qlDVVrGlMt8lyCAOlGxnmtumOSGJJ0LBJFh79el6SbgZRGEnDIHQkhbzjV+xnt+M+qDfB2hY6LEjbuUp3R9rEpiqDROpcrQr/3ObV3jcY8oM7uly2jJbVu4qjvWFj/kLPzElnPluyuv6iXVhEauw/046BdksJlrI7+1P0+quSmdPJty7uk2pDYTQ+rZRENYR3VLvjMBuL1JDe2ARWYqNDmpw9ASmkfC8eklUzSbxsMU1T77fn2gi56iYQejGYA5DkB9KbB4gcubQesLxOkgPXylp0q5HA2fp+R9DQo6kmeGERJCfcQ3i9SrwrSaereLXUV0M9LioTkgwjwou9gaONzGNeYmzFDU3exSkUdDgogGAIHONfU1KrC0s85PEMUuJirTDxenJK+yTxdIZd6sQVu/Gg24ZZ6Z5bhNb3ZXCORG1flxfulIrlAtbI3QkqayE4WHew1Zlemlu4VMcnpjRTdcTOLlV3dt5PUSz44lVxOLgJIKhP9lHWvXItWyfKzTW8plD0oB7MMgN8+ctSesFyYLiaOE349R8LjRTo3bkdCprQyZExls6wjLn7gB3GLVZlGNH7KlRMvyO4E5sk5yPtYakO0vxm2/w1WOvgo1VGGIk2VB76lSszOoNp8MSONKVI/QEe1tqh9PSgc+Hz6evdKX7zsVd1SOOEvFasnMZMq4YDiKiynOSAHtoYEzi2Or+WtS4qU2Ow89r/XMPeMGl6PKGGcdmG8TPhOslYY4hog16VJwHCCHUN5qWGu1UQdkcMoH+xHlI2QEkWQWSspb7b3XHsfJPBDp/NtnSdI/3JOxi2U6w6vaMdI6pzfyZgd4X2pZIQJoFnx8lp/o37mx2rvsS3+YQAyYYqQR4SpIzIMYSymNZXBQCw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ebada18-eb05-4631-e9aa-08dc5f5db7f3 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:12:10.3571 (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: c7vv3DvVldkh+/qGU9ypvX6rsvTK/EmVEmqEtHX2CYUxq7k3ZHIPIvFEQk2acrXBzaN0KJSpIfRhX/+lvYvshACQDPBCKUJgVcQzyu2Sst9dIRfaptOk6ZekNUPSrJyz X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 Current soc_get_playback_capture() (A) is checking playback/capture availability for DPCM (X) / Normal (Y) / Codec2Codec (Z) connections. (A) static int soc_get_playback_capture(...) { ... ^ if (dai_link->dynamic || dai_link->no_pcm) { | ... |(a) if (dai_link->dpcm_playback) { | ... | ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) { |(*) ... | v } | ... (X) } |(b) if (dai_link->dpcm_capture) { | ... | ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) { |(*) ... | v } | ... v } } else { ^ ^ /* Adapt stream for codec2codec links */ |(Z) int cpu_capture = ... | v int cpu_playback = ... (Y) | ^ for_each_rtd_ch_maps(rtd, i, ch_maps) { |(*) ... v v } } ... } (*) part is checking each DAI's availability. (X) part is for DPCM, and it checks playback/capture availability if dai_link has dpcm_playback/capture flag (a)(b). This availability check should be available not only for DPCM, but for all connections. But it is not mandatory option. Let's name it as assertion. In case of having assertion flag, non specific side will be disabled. For example if it has playback_assertion but not have capture_assertion, capture will be force disabled. dpcm_playback -> playabck_assertion = 1 dpcm_capture -> capture_assertion = 1 playback_only -> playback_assertion = 1 capture_assertion = 0 capture_only -> playback_assertion = 0 capture_assertion = 1 By expanding this assertion to all connections, we can use same code for all connections, this means code can be more cleanup. Here, current CPU / Codec validation check relationship is like this DPCM [CPU/xxxx]-[yyyy/Codec] ^^^^ ^^^^ non DPCM [CPU/Codec] ^^^^^^^^^^^ DPCM part (X) is checking only CPU DAI, and non DPCM part (Y) is checking both CPU/Codec DAI Current validation check on DPCM ignores Codec DAI, but there is no reason to do it. We should check both CPU/Codec in all connection. This patch expands validation check to all cases. [CPU/xxxx]-[yyyy/Codec] ***** In many case (not all case), above [xxxx][yyyy] part are "dummy" DAI which is always valid for both playback/capture. But unfortunately DPCM BE Codec (**** part) had been no validation check before, and some Codec driver doesn't have necessary settings for it. This means all cases validation check breaks compatibility on some vender's drivers. Thus this patch temporary uses dummy DAI at BPCM BE Codec part, and avoid compatibility error. But it should be removed in the future. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 9 +++ sound/soc/soc-pcm.c | 143 +++++++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 60 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 0376f7e4c15d..e604d74f6e33 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -809,6 +809,15 @@ struct snd_soc_dai_link { unsigned int dpcm_capture:1; unsigned int dpcm_playback:1; + /* + * Capture / Playback support assertion. Having assertion flag is not mandatory. + * In case of having assertion flag, non specific side will be disabled. + * see details + * soc_get_playback_capture() + */ + unsigned int capture_assertion:1; + unsigned int playback_assertion: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 b0e1bd7f588b..412e7b7d97f5 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2794,7 +2794,12 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, int *playback, int *capture) { struct snd_soc_dai_link *dai_link = rtd->dai_link; + struct snd_soc_dai_link_ch_map *ch_maps; struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *codec_dai; + struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc); + int cpu_playback; + int cpu_capture; int has_playback = 0; int has_capture = 0; int i; @@ -2804,77 +2809,95 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - if (dai_link->dynamic || dai_link->no_pcm) { - int stream; - - if (dai_link->dpcm_playback) { - stream = SNDRV_PCM_STREAM_PLAYBACK; - - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - has_playback = 1; - break; - } - } - if (!has_playback) { - dev_err(rtd->card->dev, - "No CPU DAIs support playback for stream %s\n", - dai_link->stream_name); - return -EINVAL; - } - } - if (dai_link->dpcm_capture) { - stream = SNDRV_PCM_STREAM_CAPTURE; + /* + * REMOVE ME + * + * dpcm_playback/capture will be used as playback/capture_assertion + */ + if (dai_link->playback_only && dai_link->capture_only) { + dev_err(rtd->dev, "both playback_only / capture_only are set\n"); + return -EINVAL; + } + if (dai_link->playback_only) + dai_link->playback_assertion = 1; + if (dai_link->capture_only) + dai_link->capture_assertion = 1; + if (dai_link->dpcm_playback) + dai_link->playback_assertion = 1; + if (dai_link->dpcm_capture) + dai_link->capture_assertion = 1; - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - if (snd_soc_dai_stream_valid(cpu_dai, stream)) { - has_capture = 1; - break; - } - } + /* Adapt stream for codec2codec links */ + cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); + cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); - if (!has_capture) { - dev_err(rtd->card->dev, - "No CPU DAIs support capture for stream %s\n", - dai_link->stream_name); - return -EINVAL; - } - } - } else { - struct snd_soc_dai_link_ch_map *ch_maps; - struct snd_soc_dai *codec_dai; - - /* 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 BE Codec has been no checked before. + * It should be checked, but it breaks compatibility. + * It ignores BE Codec here, so far. */ - 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->no_pcm) + codec_dai = dummy_dai; - if (dai_link->playback_only) - has_capture = 0; + if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) && + snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK)) + has_playback = 1; + if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) && + snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE)) + has_capture = 1; + } - if (dai_link->capture_only) - has_playback = 0; + /* + * Assertion check + * + * playback_assertion = 0 No assertion check. + * capture_assertion = 0 ASoC will use detected playback/capture as-is. + * No playback, No capture will be error. + * + * playback_assertion = 1 DAI must playback available. ASoC will disable capture. + * capture_assertion = 0 In other words "playback_only" + * + * playback_assertion = 0 DAI must capture available. ASoC will disable playback. + * capture_assertion = 1 In other words "capture_only" + * + * playback_assertion = 1 DAI must both playback/capture available. + * capture_assertion = 1 + */ + if (dai_link->playback_assertion) { + if (!has_playback) { + dev_err(rtd->dev, "%s playback assertion check error\n", dai_link->stream_name); + return -EINVAL; + } + /* makes it plyaback only */ + if (!dai_link->capture_assertion) + has_capture = 0; + } + if (dai_link->capture_assertion) { + if (!has_capture) { + dev_err(rtd->dev, "%s capture assertion check error\n", dai_link->stream_name); + return -EINVAL; + } + /* makes it capture only */ + if (!dai_link->playback_assertion) + has_playback = 0; + } + /* + * Detect Mismatch + */ if (!has_playback && !has_capture) { dev_err(rtd->dev, "substream %s has no playback, no capture\n", dai_link->stream_name); - return -EINVAL; } From patchwork Thu Apr 18 04:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634105 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2074.outbound.protection.outlook.com [40.107.113.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 235974F1E4; Thu, 18 Apr 2024 04:12:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413556; cv=fail; b=oBAhGP0RzdS69XMLvvGVIWTALNcgBQAjVv0IPMInE+6FNaPS4J63OSA2NuqiHIgmjFCOgxMM9N/oDlz6Dq9miPE7oiR2qgztk/Q0p31U+1wBymhjMGbHEwIVpX90DmwDxI8sQpdAxU8HJ3W+nrrAzmHHoNvdqmWKAd7kzyD2sWU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413556; c=relaxed/simple; bh=hHaNyYlnhCaM8uaABNfNFiPDmdxNfDmajYy3TVHCny4=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=j4mszQDYz5GL0KszJ4Z+zRr8SJmS6z88z++Dk9Vk53ot/EHeNCj5tvbWq1TFflNWc1mK0HMqFFbkO3KtpEC4Fcjh75bnnnJ6FbA3exFmRpjYWBUKu7aVpt8dQztwsGisAI/88q/6wZ+HrMTRENo9ENYjkIhejUyjCumrnnYQ9Gg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=F9aj57qp; arc=fail smtp.client-ip=40.107.113.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="F9aj57qp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dLqDjKTvwzP6i472p39GYqfSX9xmCctm4zPgVGfoc1vftUc/vP1ghea2FUddzgEP+QV1HqryD5B4DA4tqkeHMKWzxiYb1VBDY5N+0RTWBEgIpwBQCerZmS4P9NFyvWb9wD5jryqrX6oKjInF/Od5mBZiPsdqWovQRubuOTnVf52btx/djSVBX/P9fWaOjLosrKQdAeaJUZBDtUgiJxTV1eaNwJSCJpv3xduzYX7of1YJA4LZfjpdOGZ4ogmq4Ik+ZEYQXuEC5Cc2AWxhuJNwUrW7EJO8c6K7a7oX9w/Is16GVgF+UPR4MGp7kAdWtxfQBNkMoivrQViY4Cd+4UBeNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ig0emtaAXpylDYN9VLfVhDO5DaX/xxl6u/U7wbU0iCw=; b=Qt79OYDdkUaxVSPrAUWVIOfzVIegFm8TSXhgjumem4rjn86E9FqnMKPLwuomuxaV7Rb2nHp3f1DuSgUX7tr/cqmiU4V0rO2YBRmINFuBd5Z5+md6EdP1cbj55hkzXr8i1H4UgKkB5QDybXJH1NFfxD53SfMMYeOF5fmqWHxIP8C+AX62Pwa6nQ5z/mBqe+wjUEi1At+xOV1JL5tgXQKrVfM9s/wVZQYfdtE1pMB/CHhwj5PsH+NM+rTFXXKZuJ2eT4ADPN0Tjbbkk8oM68+8TaXSBiV4b5PVdUDtbrt0hcyMvMR9grM40vns42/ge208iztKxPQourFk+C17JyJbgw== 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=Ig0emtaAXpylDYN9VLfVhDO5DaX/xxl6u/U7wbU0iCw=; b=F9aj57qp+Ch+NqT0j4jceECqBk1Pphd5QYXPwGtO9U2U7acN9dXg/zO0hzsKTL9W0K2kElcXhQvv61Ps44EmDvJHmvuoNqWjlfN9toP2GATLfIi5Ur1qgNqdFHDhvfcEK2c4VxlkoYWy0I3hSUIkz3hZ3yy84u1PSU17gW0qTcE= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:12:31 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:12:31 +0000 Message-ID: <87edb38g29.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 02/23] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings Date: Thu, 18 Apr 2024 04:12:30 +0000 X-ClientProxiedBy: TYWPR01CA0042.jpnprd01.prod.outlook.com (2603:1096:400:17f::13) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: a49aea4f-c43e-421e-6736-08dc5f5dc457 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e2opS+QrRWzf8zjT2sz2bwQqM82PBUcOdUptx5oX2Lxyh+rqiZbWJdtN42TwGGAeXb6TLV06cFVGkfmUc7cBMfuNchNJ6sPc7Uo7j4G/hR9CeI304/qAaBVByp4NB9zfsIsl2I6M8rA5FQ6L2rY9SlzwFgaDyl3aiRoczHzPwjdTi9D+oBJvgajGY7RD7Tt4phX0sSCyLRLV5Y3P/5QeB0jvFmZ3w3Lvq/Gf3HLX/0KbJp9baTkd3TBzYsPjeDXQmmH8ZMoVNXzufH0TV3yLejiXhLHszH3Z+urSNJ6077kNFdFUe92HROZz7Mgn+6q87iNRG7R6aEddNR3f0pyia/i7tqN/6yPIVOoP7iHdFyVc2/vAJ3Ew1QLkqBrbyH7fTTxSqY0U6fDXaYcOXuwtaV+Sa1j5A1ZaXgZUePpRycIVSSyEInJXOvMEQQMgO8gkq14KGq2e35hlKHc0o137OOKEvcfL2Pw1tdJtOXEE1UbdSNz9yNQp0MUK6wninb0XqVnuNSaL9xORx1ieIMnJ5pi9SO/MBtjyeOyCHUhPkrsMT8aSNYZBVpKMFF/HNaheUMeNvrHr5GssQFp1r2u7VYq0XS2tDje7v7y5Il3T/yVx61RAWCsmZn6t571yaEm7nQ+Wa8m8piPrjl38nic9DlxyOxfThxHdDx+tZvXGODYtnkcxy119Kmj0OElCqMUCmbTSfFt7N8qmBNCXdhsTWN2XVd2t3SBS90OJLMRflRc= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-2?q?ShJ2m8cVRmZ+8IeksyCO5oJ?= =?iso-8859-2?q?b2706i5NoBwIoy2w1AwRx4lVs/Ub+s/XtciMj9GWcLezJceXAaWNeLp3ke8M?= =?iso-8859-2?q?pST4DjYKOqvGL03uLdE0zdarTydWGr6r+O7HjVC5w416PeDeqcBDWMx4Zv4W?= =?iso-8859-2?q?AJXSla8I/pkDqCG+b+7C4d7Jv53rFQoYdSki8u05TK1yGVlCcif6uqQHVoW3?= =?iso-8859-2?q?CZIam0ZBkKiKM+yIvtNQuiqfYtzmvBpdbrOCxZOHNsnTfDJ0w0QeuZWtGHlc?= =?iso-8859-2?q?SZr773DRu5kNYcS3lQcxfV/TaYBjWFgIWM7p9Eq2R6FcRetFwi1SyiY7N40u?= =?iso-8859-2?q?DxIicKQdVE7TPDKjMFZeSaxWRAM5hVDfRin2T9zR7cRPx11/1X2y5WQG5F91?= =?iso-8859-2?q?SSBtnG8hyJwrTiTZsequ77zKoAFHZuUBihgozdMlL+8Q4gaAczzh38luw6ct?= =?iso-8859-2?q?9Qh0Cn+IygPl/I140dvAZc23Usf0mujlnTYhyWlT/iN/hedbB2TBurzCIheV?= =?iso-8859-2?q?fkvovpqCDXHeJFQlbkLMSLj015R/g7azdfLpNW0XEbZuD/CMtoHJr3U1orln?= =?iso-8859-2?q?trMS9MqSMOdzMFHom0W2f8Y9C77c6JxtK+3dnWFQ2BML7diykZQCXwsodjtJ?= =?iso-8859-2?q?e4IVtWlOwdp7PfT4ht7vPvEKdi254bsmdyaqrPB3ELRTCAxjQJhEYlTtoj63?= =?iso-8859-2?q?3lkLMN7JzypdPHFwuQ60jv5dRAkFzOHTxL7KW4Jm1xswaPwy2hhiSB1P0s2a?= =?iso-8859-2?q?WTijrO9T1rgOSuq09pOIH6I2ITY/CZHhy9gylsf5PI0wum43IZbMGjKiuRi4?= =?iso-8859-2?q?R0z8hJTRfqYJheSHy8Y4c/pXwrpvCq+gochIgG0EdC3DvbLocPrqTrK7QUh/?= =?iso-8859-2?q?AO7DVGE5s0bKZXVuSBGpbE5L2gdvBlrIt59NbWLRYzR9ZVDRNT/PXg6aMDML?= =?iso-8859-2?q?n4hQpJ+3iB4rJScuBfhXfiB9+PYt9ZPTGd69Jmu7S8EYhm+PxBp+wVnBohxV?= =?iso-8859-2?q?k4SDTAbcO20If3J0rg9HkJ58vp7btokxFVkfGZ0Hk37H2sGVLsXFqztCq3y2?= =?iso-8859-2?q?KwRs7XU2xLKZGM+tsU24N1IXQwsdHluFNvLaWmax4xatO7zy4sjf33XjdhUC?= =?iso-8859-2?q?B0ZRCRN6bTAPZ874QQP+FWdwVrlrVi7N+Cn5kLs2NtMgY0lXhNAi5aGfYv51?= =?iso-8859-2?q?HYfD009zdkbjYAzvjeogs0PDjHmGjZtkipK7fXsoZ2roRE8R1qKXSm4w4FdG?= =?iso-8859-2?q?oI7jkwotIC9GskQgCyCChoIciR93qxiMeLKHzsmSax4zuD1CC3MgdhCMGfS5?= =?iso-8859-2?q?0Ckj3wKC4ikz1VOfsa19kYLPRKWxLBWMUHESE2nf5G0lpbND9e1lYBBz7BWL?= =?iso-8859-2?q?SrCKy4L2/WmlIHykJycWOAflPJpjKz+L7aLGky0vlgZIkHPe2twbtepIUjzA?= =?iso-8859-2?q?LKxsWeevQ2YV8dtWJru4voJArW0Rdbr3bofi/4XDZ82VhJw7zzF5dmgB2tFz?= =?iso-8859-2?q?tq32rlrTD+ICYZx7xqH/NqX9mtVwLirxuRwvXDDb4gAkBcJBLbWdQXlnTGtd?= =?iso-8859-2?q?sHl0X5YBgmAckjWgXyCyIYX8eQslMkKPgPv5B8AXI/5jJ0gw4vIs+MscduV0?= =?iso-8859-2?q?f6187fvyTtINzei7PIkTL/9g4U0KHVwvua5T5E3kWMNfr+mB+f63u4YbNGM0?= =?iso-8859-2?q?=3D?= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a49aea4f-c43e-421e-6736-08dc5f5dc457 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:12:31.1708 (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: RNCRaqTAamW1fu3IfQXswKch0luZwt6q7RiFlx0QjxojJ73lDXrvW8UGz8EazXnP2VeOwyIBGWd8EXDnmtk/Aa3Qe+/4Eq+jGlqcNPYHfexdZWs+ki+BqslLHbVMdMGJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 Historically, ASoC doesn't have validation check for DPCM BE Codec, but it should have. Current ASoC is ignoring it same as before, but let's indicate the warning about that. This warning and code should be removed and cleaned if all DPCM BE Codec driver has necessary settings in the future. One of the big user which doesn't have it is Intel. Below is at least already known settings missing driver. --- sound/soc/codecs/hda.c --- static struct snd_soc_dai_driver card_binder_dai = { .id = -1, .name = "codec-probing-DAI", + .capture.channels_min = 1, + .playback.channels_min = 1, }; --- sound/pci/hda/patch_hdmi.c --- static int generic_hdmi_build_pcms(...) { ... for (...) { ... + pstr->channels_min = 1; } return 0; } Link: https://lore.kernel.org/r/ab3f0c0a-62fd-a468-b3cf-0e4b59bac6ae@linux.intel.com Cc: Amadeusz Sławiński Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 412e7b7d97f5..a79ca115f4e7 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2797,7 +2797,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai_link_ch_map *ch_maps; struct snd_soc_dai *cpu_dai; struct snd_soc_dai *codec_dai; - struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc); int cpu_playback; int cpu_capture; int has_playback = 0; @@ -2836,24 +2835,36 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, * 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); + int cpu_play_t, cpu_capture_t; + int codec_play_t, codec_capture_t; + + cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); + codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); + + cpu_play_t = snd_soc_dai_stream_valid(cpu_dai, cpu_playback); + codec_play_t = snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK); + + cpu_capture_t = snd_soc_dai_stream_valid(cpu_dai, cpu_capture); + codec_capture_t = snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE); /* - * FIXME + * FIXME / CLEAN-UP-ME * * DPCM BE Codec has been no checked before. * It should be checked, but it breaks compatibility. * It ignores BE Codec here, so far. */ - if (dai_link->no_pcm) - codec_dai = dummy_dai; + if ((dai_link->no_pcm) && + (!codec_play_t && !codec_capture_t)) { + dev_warn_once(rtd->dev, "DCPM BE Codec has no stream settings (%s)\n", + codec_dai->name); + codec_play_t = 1; + codec_capture_t = 1; + } - if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) && - snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK)) + if (cpu_play_t && codec_play_t) has_playback = 1; - if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) && - snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE)) + if (cpu_capture_t && codec_capture_t) has_capture = 1; } From patchwork Thu Apr 18 04:12:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634106 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2060.outbound.protection.outlook.com [40.107.113.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F32E4F1E4; Thu, 18 Apr 2024 04:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413570; cv=fail; b=resFnqFtuHUjxMPkIlaVxqRyxgulMzp3stf1a979O79yGPtspYnATfgTGdTKY1bRy8y9ZjFxZPn0RiF/Dknw5NatoeRJidzRvUuBxs/mlOvuCjKwi4HIQajeLBjvZ1Vni6bHuADxfQ4LQs63rooxec35Fj5EgJroyY6SwM6mT1o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413570; c=relaxed/simple; bh=YVxxdhcsHQXh5VL017QkFral1s7wACj+4XyqcnB9fW0=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=d6nKIqTw0GAD+tBMZ7fyI3L3ThpaofkkEjXimgfgXBlzmTyo43OxCFKboenn3BBl/vZwGgmkEtFLbyVxoeT2UvNd1ak9o8FrcWWrFxgC5vgG5+MgpiOSTexWL5fl5z4Js5qEb0rpV+DJ85DPvGInM2+3mv2kWXKzloogZARNfFQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=YejqV/Ys; arc=fail smtp.client-ip=40.107.113.60 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="YejqV/Ys" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d842Szy3u143wZd/ckgDiwnr7f4IM+/fhM/nSvndHnH+nJ/S4t4vpr9jAYvaXJqS39WcDv5YEDvKJAqTqPwsP2HrRoMmHxCeIkoNhDLFH231J3b3ZaUaeQciv12k3iGjDXdpzT4mEE2r1aFJ/EhqTfGdeMfN2G9amtLTEXk5xqyVCpI1wVBzfSYTp4IR8AtRBLyvlVdv1cHyJQsVyaETi6Aimc0ZgFhR9MgETMdP/eQo0uTkJxu7J7PHn3+SG0MXH6EdH2WBcDYP9s3GC4oA+oz5a8AHZztWHanm0nfZOCHtTYnosNLJFZojvfv+fYmm9Feqm1SblH5OHdO42gYE6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IBlL+5+aQgORxspXuZ3PMztQjyniD7+zmAzY/t9sA8M=; b=ikK22jzXoeQb39WGRvPwxHuClYbDX39Sw8RkgKBU+vM7TXG9BV3IiTrDNWnz3h/AhgyhK91j+7cBvosUT+QTmo3convZAubYOBUwQ9gPWR5B5qG4VsHpMPCyjlEYZVhUsk9EqOAOSSfIRv0KK9vlKv/8bNtYTxdjZRcmzlHE5vx59atrUDZ1FF7bQ3ruNfhQoqfosGC6QRRjRsoGRHQ/uR/Mbe1yj57wlFHJvoJuDh+GX9PkENRQ+HVjfMVdvLvfhpoUOy7Mox1PMfDe7njhA4dJWp0kXJQsxRJctcTb3P4T2z2gCIFPvLuQs0RgPCt0M3gyvRUfU0QtrsZt7czZlg== 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=IBlL+5+aQgORxspXuZ3PMztQjyniD7+zmAzY/t9sA8M=; b=YejqV/YsHGjOhE6FQp6BKjvrb0X+aNyBKQB1n04tSwffmgKlZrA0iTwJv6vljwEDVQzBaSKqaiY5kArmLzHW++Hn8cWU8dw9rOrcf5Bsr1JsAhUINQcZnHE2xqC3LCuimd2aOS189HHchci+GOqQJDmFp16ChR258b9uWuuXBGs= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:12:44 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:12:44 +0000 Message-ID: <87cyqn8g1v.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 03/23] ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities() Date: Thu, 18 Apr 2024 04:12:44 +0000 X-ClientProxiedBy: TYCP286CA0361.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:79::17) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 8343c1f4-547a-47e1-b097-08dc5f5dcc6e X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fuYgztyETMSi8xfPt2uLtRU2ZQhvrXU9LX2vdGYMd9kh5g4gaoUHnFAaVoViJK5IFeeaTUDjRD91Ozu5JAkAMbpop5g3tCJGzP7zt7RUgHkB92/Pl3zAV0evZ2yy1o/8cr76ABuLszhQ7mPD6+LiULZVl5oWE4VtqZ264pIOQRzBTdwDzp7PZ8eQUXVNlgZNVO7Mq4dAQbUyTDuA781f9eDtFoXX/G/8KcOLyOY4ocDuLgUzbTJZUOaHjWA0a5bczp7FTPmUilouTOISQq4nAmObOSXZLdBhKbHMNUagRczkVylssOOY0v/xRjLcvxVsT2COXagAIY8gyHovF78uglBTcN4T+BamKz/e+FqpteYawTc6lX6wMA7W042pPovTyjl4VKL/BAcNK2448hGMHr/U5gIv2NQTS8FaBlo+zcFrsCC9Msq7acYucXWqHHodk5FeKW4QzHPUH2ahyG2cIfVmLCk7S6s0KW5I2Q054+YCY1EDS8nwQ1du9GcQ1PoGKmFyZnHg4PnanVif/ux/Z9QmzparWMhttqG067qj9dr5qCgB4s4+t7SEh0a83NCNVNHkzRdRSs9CiBceNzB5cFM78dLkTi6CiGgUux8HqFKQVlKg7bIK9iBObQ8DHysDDFg7ONbm42lVtma+sPXJNRwocGVJ1Ke/BSpY0bJQ8qsEnIzPJ0dXJI0EDkAAY1KzRcW2rpMNKQpVaGr9+yGURshRnC/tFe/Vi7l6vRqpdAk= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ngl3BgskdHY5Vl+UG6d28TTr9Q4xThr2JlTVvm2wNa6ItVS0VejOG2ZZ/auj7eQImZaFSPUv/zqXwn+Qqhue/0O+DBOpi9CJC6F4putIvW1LPR7t/0M/YBzcMl9lE3eCYlH9gNA1Xl+fZYZjfa+QoKlsXO1TRj2SuGOsakx/CKwBYC0hg6o+31Tqg/vQvP7q0AQ5mtXutgov2SR25oQ4B0C2b7uxrPjVCC+NOmBdjevfTn32t7iS++NVxEMEO/qlPGPLFvkHr+5u/HsBmWcEJjNS+Qrwb+osTVRjUlX7vkdI1S9GlLoWR4beZCcbcF4xk1Ch2d56WE+t4Z6B/5i+j+vrGa/9c7MZ32iiXdBiH9IUEoEEI6im5aDtYNc5t9Y85wqCsKbPkZoxGrWMJos4SD1SAdghxIUJ1ukrLkZcReQSbSreNu5ITZ4beTvaGmbID293C6iQ8v+gKIf/nc3hVE0U1EW5fnXNo8N6Wz7fm1Ch05CEZMjpVpyPaGxzsPV8TxquKTSEOPGwlKbSbu9orUeEJ/3TmTeEyheq4vKEsymZrstvdbUgiN2uz3mfZDDJSP9A6Sysc6RtcFh4Qalgyp9rB3vCI0hlCg5s6QXyJUOZ1knZ8rdW8B41gFQoDs41dWQTgrfkA0zEyJ6V6nx3lttjjsj9I3iL9yEMX/9aycp7B8wmq0trFIM3vQzw0fE8zCxUnskAnNvna7NEE5c67zwHc9axrVegxLl6hAmguX05yIflqiSlq7E/A/0zoLXWOQegiQ447QKTX1AWKLlS/htypPfsVSj7bfA2LbHtX/Yer3krKA2BvydEv6PZzUz0qhv3t+yH/PT+F2PA3WMmHvfcWm0r5USAyGx9Vco2CDj2etDq8+dzHJVA3vOG2er3Ok0k1rQKJkccmEDxER0NjtRLrXoXwN+fDBydcton6m+Mm4lLwzdAK2Pab+imk4X3FuB1KuPjVr+mS0PcXnMmakrTTspPzt1ddEjdCEiXsGl1iC80Mo2YTiL/oepy0iBKKNhXLlUOQ9wbbu0Hg8gX7e/4dTCoGgwXMsJtEV1zFldcYR0DdsQG/o1mJxaUZ+UKuoODMzURFbbyBKHxc1B0EU59rqqRaHdyOhlU0jAH8gWxGqaSSaOsVnG+WrE3CJZU3M3NJQeB0bnNd2/bO4P3W1AcKWEmCzuogQkWocxSjnW2XpnvAL4GxS/bZ+cZDSuC6VllJOfZitbjrsIwIpF1l90kz0SC0ZEu4gKZQisR5V4v/vHaCKvNlzc6Lx+yS2sVwrUz82cRYONv4L8V1dq9jct/zZC8tzr6vzbmf1tvpRZtZE/6MmoH4hTLYnSSLhhb+mKqNklJnLf5ACIwSpXjiU0TG1Jb9KgBgiaVvIL3Nnb93Z/XLcLv55NBeENek+fMO+Ti1188PnVDSf2SDcx/eFO92aNGRAWLTVEEtWVMerr0EanH11vgkurznCZV/kXkmukeH6lP/3U5OoLYatrqb3HRmIgtnZPSJNIGFYlw22TVxMZnbV6uczPLvIlmfre4nYTKoABJ8L/3F1wsjYhNIVS4V2FvjYoKn9E30ls/nZaLsVFHTn23tDCCRRQ6VzDNf/OXfZ+UalFe+UsOHpiVoqhKWyRgWWq/kC8qi1L+pII= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8343c1f4-547a-47e1-b097-08dc5f5dcc6e X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:12:44.7103 (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: PxPJbOwKJhg1vJS+Sp76oNV164sQpXLd7WxekRe+1MKzXKOD7jLAS7x26YLu2BvdxA55vIAcZp2oyj+uEtO7Af7CXQkaBDY1m+HAkPZmvevwaQKC5bsoVnaq8QSay13R X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 snd_soc_dai_link_set_capabilities() checks all CPU/Codec DAI (Y)(Z) for Playback/Capture (X) and checks its validation (A), and setup dpcm_playback/capture flags (a). void snd_soc_dai_link_set_capabilities(...) { ... (X) for_each_pcm_streams(direction) { ... (Y) for_each_link_cpus(dai_link, i, cpu) { ... (A) if (... snd_soc_dai_stream_valid(...)) { ... } } (Z) for_each_link_codecs(dai_link, i, codec) { ... (A) if (... snd_soc_dai_stream_valid(...)) { ... } } ... } (a) dai_link->dpcm_playback = supported[...]; (a) dai_link->dpcm_capture = supported[...]; } This validation check will be automatically done on new soc_get_playback_capture(). snd_soc_dai_link_set_capabilities() is no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc-dai.h | 1 - sound/soc/fsl/imx-card.c | 3 --- sound/soc/generic/audio-graph-card.c | 2 -- sound/soc/generic/audio-graph-card2.c | 2 -- sound/soc/generic/simple-card.c | 2 -- sound/soc/meson/axg-card.c | 1 - sound/soc/meson/gx-card.c | 1 - sound/soc/qcom/common.c | 1 - sound/soc/soc-dai.c | 38 --------------------------- 9 files changed, 51 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index adcd8719d343..69ba1a628eab 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -219,7 +219,6 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai); int snd_soc_dai_compress_new(struct snd_soc_dai *dai, struct snd_soc_pcm_runtime *rtd, int num); bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream); -void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link); void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action); static inline void snd_soc_dai_activate(struct snd_soc_dai *dai, diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index cb8723965f2f..9c7e24cebd7b 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -650,9 +650,6 @@ static int imx_card_parse_of(struct imx_card_data *data) link->ops = &imx_aif_ops; } - if (link->no_pcm || link->dynamic) - snd_soc_dai_link_set_capabilities(link); - /* Get dai fmt */ ret = simple_util_parse_daifmt(dev, np, codec, NULL, &link->dai_fmt); diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 83e3ba773fbd..714ce1f4a061 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -246,8 +246,6 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, graph_parse_convert(dev, ep, &dai_props->adata); - snd_soc_dai_link_set_capabilities(dai_link); - ret = graph_link_init(priv, cpu_ep, codec_ep, li, dai_name); li->link++; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 62606e20be9a..0d2ac4c9ba3d 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -925,8 +925,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv, graph_parse_convert(ep, dai_props); /* at node of */ graph_parse_convert(rep, dai_props); /* at node of */ - snd_soc_dai_link_set_capabilities(dai_link); - graph_link_init(priv, rport, li, is_cpu); err: of_node_put(ep); diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 9c79ff6a568f..5e66812ffadf 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -276,8 +276,6 @@ static int simple_dai_link_of_dpcm(struct simple_util_priv *priv, simple_parse_convert(dev, np, &dai_props->adata); - snd_soc_dai_link_set_capabilities(dai_link); - ret = simple_link_init(priv, node, codec, li, prefix, dai_name); out_put_node: diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 3180aa4d3a15..48f14c28f79d 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -338,7 +338,6 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; - snd_soc_dai_link_set_capabilities(dai_link); if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node)) ret = axg_card_parse_tdm(card, np, index); } diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c index f1539e542638..7edca3e49c8f 100644 --- a/sound/soc/meson/gx-card.c +++ b/sound/soc/meson/gx-card.c @@ -107,7 +107,6 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, dai_link->num_c2c_params = 1; } else { dai_link->no_pcm = 1; - snd_soc_dai_link_set_capabilities(dai_link); /* Check if the cpu is the i2s encoder and parse i2s data */ if (gx_card_cpu_identify(dai_link->cpus, "I2S Encoder")) ret = gx_card_parse_i2s(card, np, index); diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 747041fa7866..24862002e82b 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -145,7 +145,6 @@ int qcom_snd_parse_of(struct snd_soc_card *card) if (platform || !codec) { /* DPCM */ - snd_soc_dai_link_set_capabilities(link); link->ignore_suspend = 1; link->nonatomic = 1; } diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index fefe394dce72..f8e46bec6f80 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -479,44 +479,6 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir) return stream->channels_min; } -/* - * snd_soc_dai_link_set_capabilities() - set dai_link properties based on its DAIs - */ -void snd_soc_dai_link_set_capabilities(struct snd_soc_dai_link *dai_link) -{ - bool supported[SNDRV_PCM_STREAM_LAST + 1]; - int direction; - - for_each_pcm_streams(direction) { - struct snd_soc_dai_link_component *cpu; - struct snd_soc_dai_link_component *codec; - struct snd_soc_dai *dai; - bool supported_cpu = false; - bool supported_codec = false; - int i; - - for_each_link_cpus(dai_link, i, cpu) { - dai = snd_soc_find_dai_with_mutex(cpu); - if (dai && snd_soc_dai_stream_valid(dai, direction)) { - supported_cpu = true; - break; - } - } - for_each_link_codecs(dai_link, i, codec) { - dai = snd_soc_find_dai_with_mutex(codec); - if (dai && snd_soc_dai_stream_valid(dai, direction)) { - supported_codec = true; - break; - } - } - supported[direction] = supported_cpu && supported_codec; - } - - dai_link->dpcm_playback = supported[SNDRV_PCM_STREAM_PLAYBACK]; - dai_link->dpcm_capture = supported[SNDRV_PCM_STREAM_CAPTURE]; -} -EXPORT_SYMBOL_GPL(snd_soc_dai_link_set_capabilities); - void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action) { From patchwork Thu Apr 18 04:12: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: 13634107 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2077.outbound.protection.outlook.com [40.107.113.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3267C4F8A0; Thu, 18 Apr 2024 04:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413583; cv=fail; b=J9zl0H60VkZOXWKYIuNrMBvnvHaKJYO0yghk8MhdLnSwr0LrwCmaqtQjIzpMV48db/06Xvl670/1qy57Ve0GsL/QbVnlHJCgUkxnWvAAnpQ363I3k37f6R0bTe01VDLzQNWs9PdfM2/nIzFBS8R2WyjjpCdlrK6THykiDmZ1vp0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413583; c=relaxed/simple; bh=JnuVnk0Z9minA8HniiO1g2nAXIo6aIenJaNDRrsFfkg=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=rAy1iBJlUM0E2jP4vSqGzCixvOOwSvwHeh+QRT4yIgDa6Jnr1lzXEEeuFj8xiPUqSbW3IWkJPP2Tib3ColrwPAKR+A88ssB5gHcXk4Sm/3G6C+8+DRhz+wam+/cBXZ/B0BMZaQt0dmLYo+DEddbf2fvpHtAMXJ2bogcwVAiYVGM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=BCHi0LbC; arc=fail smtp.client-ip=40.107.113.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="BCHi0LbC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZVEucRrX+na59gkv0YuKmonpptfYagqgT7K1KcRC/6eDbQuqW8vSo6lO0gdCcL17LzONVqA1TGPMFJaRPrac0UJ1AzrZB+62v4gVRyfgu/rDxwFNXnqM/djAQWECKB+nKLRNZ6bSJngCDjtBQqxaAaK7GcyYrD0Ppkxz2NZkkoVNLo4k57LajhybmjsL67tUkW7DgNxuZYDcDh/hEp7SkhvRw5Cr9w/8eX7EeUu3xoh0ssvUoEwtUmk3oCuSqMt9oE9jkNMdU0baa//IrR2fdrtXMtOUUZCVbE6518EmOH9rHPBV0YY9se7ANcR1iP8sMFEWjQd6BS29JMfVy29o6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+ExCgHEOfbbHNJhJRximSp3UYcePnkswBUYV7/yJmQM=; b=bEwkOxiNUu3qAHrCrHnwhEps/2jyT47mJRu6wY93GSOWwOh30YnUJSXo6M/KPxQ7Y/SrHg5kVZW8TMRmxPcAmhw+4Z33cCvXKDlUBF1aGpqeHo/Waw8hpf5oudYImRPJMJrr1vOO0Uavd21OmaoTHIHuS2KyuM1dmAZmP7PszvyxdUZdERH2LsOdeWu+JuIvIkhlh57ZROUlgktQiDnyFMLOYOKuTX4zdfRdTPiZ3kU5rV2NRfXUURSAQFGlDJIDa5kxSkOCvGudhjxDjjcVaKCQ8RAbbK/Azbztv6f/rzAr5W7i72+6/3Lhf5iDF6Ii+x/CbwOsxTJJI/VSBu7Qvg== 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=+ExCgHEOfbbHNJhJRximSp3UYcePnkswBUYV7/yJmQM=; b=BCHi0LbC/uQRbVNPoqlRse01oDJIbFhgcvM1Wajx85Cbs3BNa5meykUQ9bikn6OwUe1HICwu21lDXl/UcbKubPb11LMn/kd75ANRWBQbXX5Nnv0RgpyZVDzCnGC+YfJFZCgo0OWL1e/TbcR3NgUzJpAtiJmQ9g9tktgUL7KwjvM= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:12:58 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:12:58 +0000 Message-ID: <87bk678g1i.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:12:58 +0000 X-ClientProxiedBy: TYCP286CA0354.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::17) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 5044d146-6e62-4901-dcf7-08dc5f5dd496 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1C8kDe5Ji0aHgjr5K5xtDLPar6cfRcJGAdCZMrSuhSJIv6KP1kV/cZa6K3Q9PVkstV0LnGvIfgtio3/kdYXiruA3bcSg/EOga6twKj+Iv517tu05jwzzn7QYAhAXz7AKRo8qsS/PKRWJRa4sPvN58lyyfBS10DtwOdCzb6KFKQxsyYS5M+EKVDrq7hFfXJnCBJ2ey9S8vV+Il1E42JOrVdqMGtm+F34H9+99/nrRw7v0njUZdjfXmK/f8IOpB7NiGWgQvv2+zGCDNHnyCtW/WBsUV7SQ6zkbkXJG9Uvr6CWS5+vk8ZwS0Dco0aOp6uOwUSC1XCZho7nDXyVu89Df+zK5YgYytsnDy8EbqNmmoerRY2iuOeJNFfcVeHJJO2w5iU7wp5qsSiO1pePR6il2vsFIdtoebNGrwpWlWbq3CWRlQB7GctVLhJgJCrUeHmlvl3by8tdw6O446S0E7zHOeigbCo+Hmgds8ZRUuEKKwaMDqRxlcen9Ud7nEndoXPTB90IlvaUIwvw72j6twolWh2NgmAkuoS2xYMGGCSLbblZHnjZd79/HPmN/FHWyPKqO3HgBdCIbCkiOgFLGpn8fQQC4fQ1bXaaG1fYzeiWQ3x52L+Mpd8MJfR+ULKpF3XPxpvWnyivRJxW7VFYiglscjbFIgvQsdd7u02PI1UdWQcykzcNEQHaNYv7DWNykBgKVIJgBwmxBM30GWptHNA10w8xeU820Wqrbf80cq7v7wOk= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b/QPaIeyVzq6CZNbX0JxTKCScCHQbnMh4WAvAUyRa3cQxE4sXv45KUpfiPyUiJpw+dJ1190dN3fd2Jo/4ApkHL2h7iBwi7TKfcwBGympuh91DakK0UO57XnUXJVeLLNeaFK6KoTJ8kZZyHGBCQ/6jqzFekB7LS9SqJyMJI2fsAmJo2Of1HYrXgsBIsHzVtM4M5gG2su+rFyEdGnwZoFeQDyxZ6DblNDYIhww1Zjo4ykIzrPFtMZ40IQX3fjrOF5iCfWelT8dJQwykEs+9csnVB9IwG6/qlZp8vhkvY4lp61WO2slhVdCVchZnKSV2AqF+Vqyaau/gnqgjmQ3sXbFbGMYzgZViF3y9zyGYcNuMhTns+SA32QGBVKy/IFdICvvoxFjz/Uuf+mb2A2o0oWRxAKZtSCsu/VheiK/eqWtXxqBqrEbmzOB5KGQZcjfTHkXkUcvssqxLlYV5sRvrPtVCpR85ybc6AwYAdIB+LJCdnA0RCl1eUt0dgHPwkX9MfwG2tZrqaAtbyAShLKspvt0gyaiavc3sv+sEE1A7PmdA2s9XWwbec4PQpFoTWpLLR2VqSOoG6Bin11XSW9eic1Pf2aWsycFHjLDdXCvhDC6AS5Isi0Cxo9nBk2HZTjvTWCc5RFs0kmfS8nZBDxPH85K4aQEsLsG6cgvfLFQ9sC2soupe5h5CKsWdXMhfVJGgVdEDwutgF9oYgA5YWGsuBdevKU/jCLuSDzJG9CkE03u/6uq0fYOobLDpRMHotNkOU+Qz6DXoTlx64MSUq3RUGN3NfVH5AedHFTfsCAW4/Yh9UVFikTGpAV5W/4Baqi0QzOkIElzzyAVUnnOU7aOHCZBqonNBIktv23T9OV9oQrFEszX6Y9WS96juSlx13aAnZsHyGvcFqHrmRE9zcWvWfqd8fSlPU4usPjTKxt8Oyre2oTePjkqNicJo0mqH58/YpuNxFHDmRMfqSuRAG015d5NaKG33T9kfsdz1AHwxBdmEZWvaq5Nj26UxuW3KJmcZq0uTMchJhNmA5zjGaWZmKsZkS5tWrurAfGy3rmx4pouJQ79YgsScO/mLy5x8Q3tvklH3baxieR5EVsglf0k+hx5L89S1Dj+ENDu8rwoGEv/Hiljdg0C+TVZUcWTnXVCIDR8TMY0+L5jusu04swk60QIhdr80L/Seg4R5oGanmWEjyckk4KjTq3IfBdkI0++ICE4zG4RiqAwrC2LGWVNP+AqKtCrrs6PiUgrbpTSn8/u1a6s8i/7zCEo+BiEFEPCXqqZlHZUaC5H5aIotXrxMdaUX2j8FrydDVvuZWKZJKcHA5D4h++yRudeIFkvyypvZIqJXtT9IJzxefb29YbOm+//LpbpWaD2rRd4oNeE+IoVxmB/dt7smnHXmjTeOZgAneX3gBEmHOvxcowYaZFD7hQiBGQ7FIuMktmRxFX8/Iic1cc78EW0x1mkVqdHc8R4vRlFtfuZjOSsvlfln1vkiauWy6U0JLQteut7aeaODZ3wGI1Nz4M6EkYtxJqIOXJTgWnO//zUUaovsJ/b/K8/w9rI/oNMxKOZ3/31ySpqt6Y4a3lWzltlZvOqj/t4gl20A5aGz5Wa+9dOLgbrWksRij1IkQZecqHBtY0Mr0+RH6uKocI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5044d146-6e62-4901-dcf7-08dc5f5dd496 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:12:58.5317 (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: 6iOVDH7YaytnSK9qoHNvE/eAm69KmT4szsyyYzIUbSb01TfjSEZs3sez2fkf/nydTJ9VOuimPHx3Ez9/FZgQ0W95KkYEXi8YCxVtCBN6eQYOdXJ+hxu3eVc8ClxrNq/Q X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++-------- sound/soc/amd/acp-es8336.c | 4 ++-- sound/soc/amd/acp/acp-mach-common.c | 34 ++++++++++++++-------------- sound/soc/amd/acp3x-rt5682-max9836.c | 8 +++---- sound/soc/amd/vangogh/acp5x-mach.c | 12 +++++----- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 77cf72082e73..b7ff9c12634d 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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 e079b3218c6f..ccd355cf3703 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -150,8 +150,8 @@ 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, + .capture_assertion = 1, + .playback_assertion = 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 665a6ea0a2a8..23172b84eb34 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1407,8 +1407,8 @@ 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].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1444,8 +1444,8 @@ 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].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1480,7 +1480,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_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1512,7 +1512,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_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1527,7 +1527,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].capture_assertion = 1; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; @@ -1553,8 +1553,8 @@ 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].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->bt_codec_id) { @@ -1574,7 +1574,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_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1613,8 +1613,8 @@ 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; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1657,8 +1657,8 @@ 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; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1686,7 +1686,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_assertion = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1724,7 +1724,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_assertion = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1774,7 +1774,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_assertion = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index d6cdb6d9fdd6..dc329f611f34 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -317,8 +317,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), }, @@ -327,7 +327,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_assertion = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt), @@ -339,7 +339,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_assertion = 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 7878e061ecb9..cd5b075d4b7e 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -276,8 +276,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -288,7 +288,7 @@ 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_assertion = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), @@ -375,8 +375,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -387,7 +387,7 @@ 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_assertion = 1, .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform), From patchwork Thu Apr 18 04:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634108 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2052.outbound.protection.outlook.com [40.107.113.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E9584F8A0; Thu, 18 Apr 2024 04:13:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413593; cv=fail; b=CpNgbKAskK5Lcf78oDmIKOtkVXUegDdhHU2gaciN0Idcoa2/1BGvn1j1QZVUflBku+w4T5OLMaqce3DlOfJ0YCGhm2D6jFI2wElDC2HjCMYod8UaD0RYOD+8+vuH8vQKp4yFzZNdkEyhOVVZ5UUYcJ2paGt3lIF9cMiOUoY2WvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413593; c=relaxed/simple; bh=Kxnd0H32+e6C7IlRBgHhSR7C2uOPz+1yIkoySGVqFOE=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=oyReXZ8A76o8rAfLUaSun0ZUvoEJGUKrtL2aRbXVW2FbgyC0UKe7N1Fni+NC8/BTG763Vqym0GiwLvMzSSRY3t5RyoL7YETQw7YU1Afb8r+ia6Kc9BThX6uatPN/Qpk3yMp30AubqwZi8PhLDAS1LCsU8jwtevyVWITlKp7UxOo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=ezLExBLU; arc=fail smtp.client-ip=40.107.113.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="ezLExBLU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dNUcba1jkJ10WF4D7hwNQJHOanL9ZZMWY2+VAnWfJbaO+J+I3IdgsFDO+ohsuUjXx8p+y0PPwBihrOX/Fp9nJgaBcyXF+VT+H5+/3SKhdJwpiDJk9kAYNOrPYfPSS2luxW5We+3NgBCicO6YFiWIH2Cr/Ed1sPd6KeQ3IvscXOcGY17Y88j8m88v9lmNcJ6HB7k8iGydfwTQa6zxbxYujQABBTMVlgyvJB2TUQMfzBkDD+rnMY6AK3veu6LUcLHw2lAu/t8lvV3JFOG6eDrGUuWU9oarBbG6Mrcfz8Aev+NtNllJVRAe/P8Al/Fb2mscUFnqUy5k4q8msaTAt+/A6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fsy4flBypaWLZ/M2nrPYJYJ/3wDyjmftOvHiS1GzmgM=; b=UCbNYyITfZht+FJsQFE7MheYv5JPdFXcYpdf7vdMX5y4jDiT8T2ikWK/fDbsiqao0cINtoOBed2z8971ynSmo8USfFWPXq6lYHEnI8xZ4AhV0opB97B0fqawWumNlD5lWqkPAFpG5lheU7T/3pR0RcorqHUAafF0NeNZPcDA/vL6x3yHRl/D6I/ckBLdPEu8b21uFRmN1mG9v2D9Pd9Gbs1ilC2yTeBDoceSQDZB/o0aJVQs4I80s+tjX8zVUDEaYcwZzCLyD81Jr5ivSVFphrTgbmaX1ltljnkhetVpMXAOwwlNza4jGkJqZPYkzwz2rQ2oVcRq5xGGw1og3EweZA== 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=fsy4flBypaWLZ/M2nrPYJYJ/3wDyjmftOvHiS1GzmgM=; b=ezLExBLU9sSYXp8i3QecoaVYNwRq6D+h+zCv/Z0evlTjhxgxOfWgOmBo+NfffaFdMEUGaXZ2XfidM0dc9PrTxYQ9A9nNhiPayWlDiL/unJ53isdPV52mYmmm+K9vjHMOSCdpPS8UhnyIS78yGZIM+2Aq1/tByoQBClbrXVR4Ih8= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:07 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:07 +0000 Message-ID: <87a5lr8g19.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 05/23] ASoC: fsl: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:06 +0000 X-ClientProxiedBy: TYCP286CA0348.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::11) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 2af238a9-8d4c-4c8e-aea1-08dc5f5dda20 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KGex6StHamwj2njPRfJRX/Dyi5MOA19GF21+18bsakn2vLULxE0ER7iKlx2nJMZe09/822GWZkS2WBgDAO+3IZwqrqVZtRJeJ3Pmo0IyzWIVagDlyOHkVIeioKxTrgzGtdOTERtlHcAfe8kymWvuUZltoMJr9KxGfBZ6Zyzu5sKC48400hr8kKQ6t/xIPZxav6Y9Z1FIS4z0inB1cqgHidnj+xaGbr0cUvz+r7vgKyZXwHiD0qBw7F76A4FLJVCYUDrA/e/r2eCQDl+AQpcpxWRGp8FEmwUiwsMRUjvts0ba+yRjhz84krxvjE3mPC2dy8r3hzCFxMP9thPh0g3lbr/cVQaGEEylH1+sLNoU173Rl6cBN3qHKS9RTsxZVoV/B2bGpd3b3Xb4xiMN/R04QlmvUVITuTxwyUNSpWKghl6LpDxXQAaN9ihqdVBCjHuOK/hKSHt90XlmAVTIdP3GOKF1Dn0s9m/Me0Yxn63UA/bbXm/kWeR9hH0P1eOSY4l/KAbik48mFntlB8W25vmyWSxqMpI/f8T2R1rpGNAtgGXVAMh167hKd8t2wUmnA/6/7QpX+6e5jZ17yNnRnw3Ve3ngk/HAnKP3kxny5jIbiiZeENsMy74JO1ZnZ/dfUuwiuXk6vq+rUFHxadTYLlT4ndJb4BaUhp6DlBObfaii42RL6fg8X/xOUqDr5HtHSKC8IcbuDYFSte9SZ5XeVuLD3obW114jKT8ECR2vgc3znW0= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jaJg+teJeA4AHzODyg+/bUhpva2t4Lf/b/nwu6LoN+Hh+8I/C6GUOcGwPZBHGEIU7HVge0t6qwxwYhG72dDRBfgsznW4u5otMqWuAVEX6pv7PeMkYFv+affQRnl4UASIQRjEAUzlCqoS4VufAAk49Zi1T19vcYECfXYUeHjBNjxFzASCYGMrqaoN/6qPr87/LBCkcczWC2Vkr7VKvox/BzKPBMFGb+RL0GaaRyXIDG57YttHhBoagGH6T3hKZa//8s8pBZfdSMa77uZYeKZYP3sqEfEiXeKhcxpYq6zz+QbVgq7nPO0VnNMoYQiZl68xXoDZhXi7Kxz/QwU4OFPGToK1Iu/noGlF3h0zAEbon49XQ3tmwkaTdKo8bYzuVgvDs6sd7nw59nCHLetwxDMuZUYdUZhmGuAupzhqIZMOqXKqzOM5KAVE3IxyUu1IOYtZQZ+wkLXUd5JSE8r7mlfsc169x6YnuWnz56Iqrat0z2yf/nzk8P4MBYAQfPj+FpeqtQV5nE5b33dW7WybizIXXapzLt8YCnKsxlkS8hf2cOGM13lIo94FvmhfJRb36GQlQnkjMiouQT1rqIyH6JU0oRCO6Mk3xo6lqoeRme424UYIZvlpJqG8z4SqNE8qpKVW2cRc6xW56IOpHlBaXQ58lp7xlngNsQt4K7n3lvE0RkvSx7ZpFC8WpwyoRAaNxH+6r6tMpYOYsEg9UNrKRyIXGMKXmuRwNRCQpumm/Yx5km3B1cgSz4YzZ6p3PRK3SVh8RMCLXi1w3nr6HOhzE/UsYIUupWcrURDsxz26yw8rsq30xv4qlVYKnF3Vo9Aj3E9Y3GWSED8WTDZVOsNAY2S20hfSs2RQqg+MgRdgIocwvlA+e8JkPF1DrDxoAPv2FuiwVcd0Yubz7CozNR42RZKS02l+s6ylKLP1WxzerEd4/TQgHngcuKsQ9wmo2JQ+X1gG745NNiwE59QSVen92LA3p12Uwpn+urAi9w/FB43aNP1jtGhdcl8UYO0u2+IkNlBzUfuHisCjXNe91nJSploJunwhU9VPsxk6WaMGcHi37I1NbwunIyy+iD54Hy/a8IER45Y0Y5gF6w1vhhVJjIOJB8v9BEKiuE2jS7HEV2jaeI98SD5g8uDXKFPqb79tSez/dTKGeGyEUEDtKbh63MorcN78dge+i1ouRq9SJiyzaBK1gZQrV4cmYO93l8wAURIJ74K8ca65NMaIrh+XUHmLjMiWoykHnSuFAqxQqCLeYHzxN8k21oIpHHlTEjWjUlXOIvmeT05L0lIAqCe2fiZL6KCmxPezkgZViaz+JxcZ/hsKv+MErVGFTkgR+EVQMDihWABg14VfJu7wn7XA+/NY5qnCWGSAJLQIqkFnqknk9Xs9nZFxC16NxSfimv4O+GDHwZYsDd2OfR51ARmVnoPboHkrYhpOo4s/AnAhmXH9kKChYQxTtQWiUKDloRNuh+nYOQulfwKrbrLJ5BcbIRhvttN0qaaav+EjNLTuhliJ2CY+I25HfnsMBmZk4xH1QFq+qn9ySGISTsUwjjTgXLl0afEeO5OJPWtjCqHPJ/sYvRFHGqzsrQ1jKGDBQcGaOOL/yvlg2r3qWPVLnUZL2pTaPdUKr/zSeCyGI8yZgCQFKU8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2af238a9-8d4c-4c8e-aea1-08dc5f5dda20 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:07.6763 (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: gbHtBae41QmCvDMgmc4qBXRWSsy1KuXY05fzaN1rTBupzvWRiJPZ6qcyR0PpXv0WHFF1rN5M23Y4tUOCCTEMHUnzKEmBK54HzEMsODhXi8EVEaZKX2fRf7CEEYylWmaZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/fsl-asoc-card.c | 20 ++++++++++---------- sound/soc/fsl/imx-audmix.c | 8 ++++---- sound/soc/fsl/imx-card.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index f6d2564864c6..50ca3e72eb21 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -320,8 +320,8 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { { .name = "HiFi-ASRC-FE", .stream_name = "HiFi-ASRC-FE", - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .dynamic = 1, SND_SOC_DAILINK_REG(hifi_fe), }, @@ -330,8 +330,8 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = { .stream_name = "HiFi-ASRC-BE", .be_hw_params_fixup = be_hw_params_fixup, .ops = &fsl_asoc_card_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(hifi_be), }, @@ -649,8 +649,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) } else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) { codec_dai_name = "tlv320dac31xx-hifi"; priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].capture_assertion = 0; + priv->dai_link[2].capture_assertion = 0; priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT; priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_OUT; priv->card.dapm_routes = audio_map_tx; @@ -676,15 +676,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBC_CFC | SND_SOC_DAIFMT_NB_NF; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].capture_assertion = 0; + priv->dai_link[2].capture_assertion = 0; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx); } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8524")) { codec_dai_name = "wm8524-hifi"; priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].capture_assertion = 0; + priv->dai_link[2].capture_assertion = 0; priv->cpu_priv.slot_width = 32; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx); diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index 2aeb18397bcb..ca768375e7c7 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -258,8 +258,8 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].cpus->of_node = args.np; priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev); priv->dai[i].dynamic = 1; - priv->dai[i].dpcm_playback = 1; - priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0); + priv->dai[i].playback_assertion = 1; + priv->dai[i].capture_assertion = (i == 0 ? 1 : 0); priv->dai[i].ignore_pmdown_time = 1; priv->dai[i].ops = &imx_audmix_fe_ops; @@ -283,8 +283,8 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[num_dai + i].cpus->of_node = audmix_np; priv->dai[num_dai + i].cpus->dai_name = be_name; priv->dai[num_dai + i].no_pcm = 1; - priv->dai[num_dai + i].dpcm_playback = 1; - priv->dai[num_dai + i].dpcm_capture = 1; + priv->dai[num_dai + i].playback_assertion = 1; + priv->dai[num_dai + i].capture_assertion = 1; priv->dai[num_dai + i].ignore_pmdown_time = 1; priv->dai[num_dai + i].ops = &imx_audmix_be_ops; diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 9c7e24cebd7b..873f6f89dcf5 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -814,8 +814,8 @@ static int imx_card_probe(struct platform_device *pdev) } for_each_card_prelinks(&data->card, i, link) { if (link->dynamic == 1 && link_be) { - link->dpcm_playback = link_be->dpcm_playback; - link->dpcm_capture = link_be->dpcm_capture; + link->playback_assertion = link_be->playback_assertion; + link->capture_assertion = link_be->capture_assertion; } } } From patchwork Thu Apr 18 04:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634109 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2040.outbound.protection.outlook.com [40.107.113.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CF2E4F8A0; Thu, 18 Apr 2024 04:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413600; cv=fail; b=Mq/6BoF+NDXfwyoABTBsJGrG3LQWJdB7P7aDV60LbqZj/O/px5Gcn8hn4NlnFmnmZ7YCI0R2a3lD8eA3xs0tY3DCPaKFeEuI3kkrgr9ngVuUxfT/U3hZ9+IyTdUcAfYDtooNA5qBoKNXf/HixzU0Xl7AyMLd5TMyYFVWfHRVB7I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413600; c=relaxed/simple; bh=4QQPf+rNak1+oyb6tYMuChsK5JTYWSp9fqFMWjAXjeY=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=sGMgenyZFhoMg8OMvgfcHCNhJI/emaV+rbzl6/sbnAezXuGOWdOLrE/EoaUZO3azLjp/uzg+r1teGz6878lqqr83HLBAOZsyWGj+oP/zVSR6M1FWDURK38wCxgM+3+lptWTwOgFY18SIsFE46jtpSO2FrQ6v7BO4JpY7htCSlWc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=hJpP1xNi; arc=fail smtp.client-ip=40.107.113.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="hJpP1xNi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cUvL9p5IcTD2UcVWOvEmujpVZbUykjUOGBirq22Gmces7IRyI6NGLM97fAqg6t4fGcRIcT+AacPYyJqJni1JvJSeIfXACxEmy5ysS85E8rcf9H/HEptLH6Ysutmf8z8ZgftyldZ7Xq6DZ+kLq+pId+cduakChGJ3+NP9VNjIPT/wIDV53hjR+mI0zki1bQLHOWS6WvENin6Nuu1Nym/fSmgykhoG8mG/WKwamGNdoJaxlsdVRelhDTcna1Hy7FhLkeKN+A4DK7pYRp+n1pMYfYPfJiHuEffAGtuG/aX+yJ1mMQ6JkpWYGcWaJnDYepLR5Lt20a/jSwe/wb6lPy1wBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6V+ySoxy1tlVAenMQTwnKcIWflZsPX4CFCnRWWRohvw=; b=kvwR3BVpAp+JGsiMb4bu7ITclarp+DZwwzHaDqTFKseaqwKP6rDbrfsOTMtfDLlTqC0HC2Z6cTdrXtJ+8OQH9c91Tl0l5uizW3JKMQT0ssXwk171I4BO7xcIVkv93lerHvKNMGyCwdOb+Syjshg5MrlUcQzXXj/jJw0OBDue6eYNDmXG4ysfeTmCpAnTMkjwe0wgiQ9FgIdsZJl+iu/3cGWgEPKHxVS5wf1A2iO0PpU/aBm1TXlcrT3UqDAcUZR/DNmfiMXp9JB4OQWm6I1Vt7oxkZG2Bx4XuoB2UsJJn318UjqxeSaxKysvwXyiDSELpyMMfNrqFiLeVKKRKyIH2Q== 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=6V+ySoxy1tlVAenMQTwnKcIWflZsPX4CFCnRWWRohvw=; b=hJpP1xNiXvGMr9usa7miJH2YV0EFleZIWB8HpMYIwrxXtczZl2HZVKQO7FWa/iPpOMICxDR2GluZJ3RP2ueymsR3hjpaKetd8PWwgxsGOFk8uak5n3nZJb8w/hgoZ5epTcuopQzfBc5z2P8am6Kpm9xLgsnKGz3hzwXCb2qcjAY= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:16 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:16 +0000 Message-ID: <878r1b8g10.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 06/23] ASoC: sof: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:15 +0000 X-ClientProxiedBy: TYAPR01CA0119.jpnprd01.prod.outlook.com (2603:1096:404:2a::35) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 5179914b-33fb-4d80-0b39-08dc5f5ddf18 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iTxC/Vw5+9Bvv9lpe0WXhMtHbDkVNs3vL9JghtcqK+s3gi2hndQu+mpUpW6Gitr9QMwkNg71KHVeswwuKfcTnpRy0dLfz7RrWE/9Xv3qcrQthiA8jG01v/gp+5PJuN6JVCvnuV0YoBG1dcQG0cpspjwU/GNSx30DVkyn8azmdgBzx1ur+gP/OFm9c8siq1vZf4S4K+apt0S1uFfZM1NRYEWsRefOsUGqm8AHI15SJ+g1wJquky8vR0gM2D6brQ3wc2g1eIXwIwONfIRdzEWGQH9BuWltVaUTi6B2EgPc0qsVXTYAOG+1Udzpu41iRyCSxQJg1UsPbzy1OPg6HWDVeFY4xw+cYPOFvf0Jf0Vf2rMXPeqHw0J5HUh0spTOddsKAqZBpeWooIlWwgssnWpk1FDssb7BQ2obrmVSf1EUBSTyeqBnpMAz2a4GjYn+7szlBRBeTgT22cApHdEM/h3u13TM2GWYKZJNuWez885lxemlWh5irCK+zgUehLHjQt6HHQVg3gwAgZ/WNxYzJ+3SsztP97qbPKymSJJczjTtA0Atq1jLOhyIRKj+GGr9qw6R7pPrME+D6Hk/bAqtbncu2m9j7QRzlsobm3OiFvr0rWZN6UPr/C3VIbv/pPSbJRNbb/E5NLdSbh4zy+5JqnzGSw50i+LUpWWzWpaLj7uFzhNulabfNcbOXZxQdswfbWlfufS5O6ThWsHB4oLHZq/wIf8xuIKjD44d0hoUChV8beI= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: phPtYoVxE7t/1hFhvXDaN34h15wDO4obTQNuBK2k3BWCmOyX5xVHjDggwXC5eajDH7IA9TBqYhg6XxtqxrYXHfRFJLSF/ikMEOtQPTt95z/PsNqUZX8BegmqYToTjaKHyUPLZ5yZrFp4ZqXh34b+KwiwGodKXMGrxWwU7aZxCAXkEp0b0SJcK/ZStmNU82DObDSOqeTbuaQK+lhC0JLeEfMX6qvlIxplWXwmJjaMejN3aN3g3QWY61I49Zl7qvMjRvq4OLaOTFrhVio+0TMAp1M608uEii7P7rOJjt7riCvQmh4sNz3NUR5BoA+MAbpd7fkLIfd5jP4wL4ozTBDvItMPHd1PB+vz+UqkwySzgh7Mz15S12Q+IJKerlIfGh4HNBFBpaPVSGEPA98s066x7riuDNizhK8VrZNbb6dbIV0zJP03J2SMmacOrI+th/K20tQDNKKXG+/bBX6kK9xHKNgS3s8mlwmFcCp9i/GRxSwf8KSFlw1y7+XkiDbogVYczL/sH+BDNNaATFp+XErCKMwzHqRNd7KY+mfjTQyS61Z8rGW8kM6qj1DEC30rf21N7Y0b2iBr0JoHNwhu3jqFpoOYYmaFb3Q75mDp27F0NRusCj8NkD0Xc0T/3kUk4C9SByLPo5YeQ0rk/yaFvnt3kK1KrmzFwOg+mlGtIlGUnSeDoeqCp5F+Y/xCbMv71D8P6N1ZfIuqIa/aFluYAYwICxge0iyzrKydDdRLFxk9EhrKbiWFZZ12hblf4oULzz+cLbQP3mcwVTWGyODZRcxekCJEMAx+OwhoM8+rlRFlyre3iTnhOcfSjxsgVnNea1bk+R7HxuQVpHS8FyY2WlMFStJziGuLfc/mEsqcfhb55IqDKHvJs544DM4Wk/ylQnQ6zPnyi2FFpkiVldQzKp/uP2cDdQt7UWe4fyvOfrt4wKsOi02gY+crhg03IHyIMbYAkYo7dJxoME2UhhZ+l+OMLOJF37JhG5h0HhsphlCvYJy9BXqfOZGswGOSZR53vfRSEfCytOAR9nTYI1pBtXn2ZPqDBB2wb54D9Jv5/DfCgTOXcmiw4MefGIyFZzVgabZLuZWXteGkDPenrltp3XsyBWbK90ea6Nbqm11UOsoohhoY2eYO0CfrTmyd30ELxfgDDZAvJYZ4Jo6inKHlTtLa42g8o99w8y4aQiDhO8mHQXmjQdJG/pNV4m6H1oRHTzC23GH6tJT2dQa64eTpw72TkDqqGKM+ZVG+ej/u52D6hNFsSLNSIeKcHPddOozPsvAC/r4OwhnJRDGKpECq9Ykz7iODBzudXaXA/2sYGdKy+mfmQ2pyCCf4xRisUV6q/zFZuhalZUNCIdguce3droMXgEo7+k15AKPESaMvQrmXhKT1vDCzX/Jvpue7xD14Ewi2W3TPsrmTooeITr81xIRCzJtKH53T9Pg6waiKC+GrNn9MlHmxGjcJbe9fkWlJj2ir8Duqsqis+1W1uGq7blilcemd8qw8RakMMNXDKg2m1EDi5CVxL25FAGuL+SiUMrkkbySc2D3VDFtk9uEot/a61ICh3Gvh7P5gI+6CL+UGOpKN1H6T4jSI3NUMWZ+UMYnrmeEWJ3JFtMd4jA808LGBcfEEsNGohJb2u7qu75Afp08= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5179914b-33fb-4d80-0b39-08dc5f5ddf18 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:16.0144 (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: mJY1nwjt3RBe/NJNN3q+UMaw8TRDb2g85XhEYs1Rozh5lwAEdwS7puh/TO2CJeRgf60Mjkba8NTdq3lInRUwEndN4W+QOW7Nnkc5MOVCeQIyHgkUBsPp/dcOwiv8bVrv X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/sof/nocodec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index 34aa8a7cfc7d..0f0632456398 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -56,9 +56,9 @@ static int sof_nocodec_bes_setup(struct device *dev, 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; + links[i].playback_assertion = 1; if (drv[i].capture.channels_min) - links[i].dpcm_capture = 1; + links[i].capture_assertion = 1; links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup; } From patchwork Thu Apr 18 04:13:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634110 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2045.outbound.protection.outlook.com [40.107.113.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64EBA4F8A0; Thu, 18 Apr 2024 04:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413612; cv=fail; b=uuvAP30W1aA1n6HgaR6Rc8P42v4+dcVyz43tYoNTJgHGKrJEBxP35cf3bII85UFrsgwCdyAGaCqK/JyieHcoj29Ycc6fu0qgEW4q6wEoQ6VppW6VDSGNxeyVWj9JywqnXIN1TjRSae4Z9tpTzoKAaKIDYXvcH9GJWLa2P0oszsY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413612; c=relaxed/simple; bh=sYh8jtTawX/FkpfDHKWeTJcjO4NaJLHkZc3fdH3M0KA=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=dBmt4WWj82iQUNah8qWU01jMdPkPugANVy6KPh/Y6H0YvrbxxLNTlJA/oZWk6uJlQuQC9b/nf3UZFQ7cUhO0B2kWgBeKCvP3ANri2YU6CyT4nETEKC3vPnMHmiAqHt6KDt/KLHyJ4zyU7KGtTY76yAjZxH1jNojs+clklE4+iNM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=klU2aU5h; arc=fail smtp.client-ip=40.107.113.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="klU2aU5h" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kUVJ4rZLwJROm/W53VmJTyM0F76CBkXZXe+nAfGgMyVGIaBsO7ZvLe7zPFCXz1xjEw7Ywaj86wyVLq/cybF9qh5ojWsd6ABrlUwD1VaJmafgHrypou01ypmyab4E2W5fYTk8z/rFkPstzKwUeWAUo/ije4Z7T/j3Jl8inMUIU9IrgppAv1CACU8DC78iMX+JzP8aJQQ5iLgBOlclhMbyLkIblW7gGMNIIa9vEQGitpbJjqJdlrcfALdV1PrVOH/ncVcVNdjfARYWHxCS9N1McH4WUsd8+iW++DcLw7+HIZkxwh+z4DqlD73TW79JM288vyYKRRrkPQB5MKHIRfrutg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lkQXMt+6YY8yxS+T9XCdXja22jM+cVphmJQGitbX2vY=; b=PSl+VLf/IPhenWWfmRErpg0BuNWWHqae3wkLBn1yYtgfwiwButAX8kZx/hNAQxcakSx9GZGQQcuNX02upiGwyiPBhBhn5l3o+jJMjh+mjqAiQHqJ6G73HzgjcWJqx8JHO9gb6RYz2/dLdJQX9PeGf1NnT+XQXOnx6xFuzWql14Pg0dMxWPbem6gY9wZ/N5NlPJk+ETkwLLAJOPzoLhUvVslNWCN3vGdoZdu4CvUbunZY3VjrZZw6IHqVlluKUIenuvLmG8zEZHXc+Zbta0qIbnWR2twDomJUOfGPvT3JUAcMqStSIm+zVmtjY+jvCtfB+cMxgsbl1r/MNvM3bSDk2w== 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=lkQXMt+6YY8yxS+T9XCdXja22jM+cVphmJQGitbX2vY=; b=klU2aU5h6L1AIzCPcYyJ5Lm3fUAZ64sX7KJezEAK9kNF0pADo3EbOxSGk3pxN9mlApLRwY7G0yB/rWVFaLntPY2XfXqs8r073BTcFoj8n65kw0jmezgIeGLF92rBg8tUsXaFwaDmJyOLFf2hhygXYDxB5zOF/n3MxO/P4i+/Ldo= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:27 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:27 +0000 Message-ID: <877cgv8g0o.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 07/23] ASoC: meson: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:27 +0000 X-ClientProxiedBy: TYCP286CA0251.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:456::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 93960a2d-ff5a-4ef6-a831-08dc5f5de624 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: siEXAoDhF8pdgA4lCAGoVsY1YBWOPgUm0/deJ4WoGGpK08L/9eeX6TG0IdZU4hQWLu4j+UIV6u4NTd7Pnu0Z6hAHanU36DVNAa+2H5CgP+UiU8iPCat48AjIRNnH1TX7HibYvzUtN9N7sBUYuwjo4xrC7LIooTqk4X2Pb3J1p6cp4+nOlT/z7tFTdz+tSnYWfZ4Uc+VMwYl5b1dbx/aX0kkyzkiTON+vg4ygZThVv9cSmO5rVj6ntgru0I7zth5hCb0LD2wB6WsZYVcBtdMu+bXPGmvgKds4BWngOPAPQJ18e33Rpl9TEZjlNCx0pDr6Z7F0T/XzGGagO9s0GTI0vFnvawne3yiw0Rbc9JIPuwc3+q3qfqQzfR0P6HQvG650S6nVyYa24pimNS1We7q1if2d93ouiuF33KhkL0MMZsPJtCv4NKNzMYmIh326GSznfBl+BT7ExSnJiG2lFjn9q3hAmlZRbm7ZveTH0VovrBa5j7hDxj+DfdrBmJBjE1xqAXczvfxlTQwss+jTWpCGa+UfDEaYd1sKi+DByETxK6BAKooIs2ZJwiAbUkixVh6xuoIicQh5HRJ7dFSSyqCZhI2TZdXvjx5lorFk4Hgxw+iW2gor4UikjIaIDVLjt08T8RQmzsu2cA/cN+aiPMgE5G9LFF4Ng+hDyHYnS18H5j1EcJtFYpthuRM3tHzoK8vYZpc0EugTu1m8EZAhfGemkFoq3+dsisw/co4X7YVpEYM= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gc1Qyx5woil9XLRKSWUgBs5Y/aIspLpLcHXy6HtwPlSSpM+HAA3TbnYSpPGXNz6AVUhlYRgaEC3vqlZwqq7/hk4BRoPYQ9DUtdo7dLmxhCKXGGwd2okF0DwkxJEu2DWK+ALVIdt6+GOqhzBR3NnGbMCCygJ/l+hDMRCWwseHY+ZcQhg1u/qo5hNWPhdUoKk4fllLIiT0mxVAQQLVHP5ZfudIAykKWUfA7aBxBlFFgQmmjXYh2XFFW1KGcji7szgiE3QxyLO4bLBXvzqAmxRQrPh29wbQKJt5wIWbEFBdGoSKwKtW13TGJCWVED5OfdkEPAm5dx/7DbdeQoLHSlqoVZPrn28DAnNB2ZmAzz3Fter6Md7jp8OMA0K72oV1xI2l01UX42wyD8lk4YIUShO5gIeb4UAdZHWHzTFOKDBwlxUdvPo6nDifYwDJ7i7QWo9U2hGREkZY02lMhKeQJECgKGoR6TgGrsIED2NNWgpGGCzmN+oxIWunolMMm+nlMSOG4yaHRFwquziMnK5WZ5Dq2q+HV3YFCdpkSjbhPfNQBX8j/3a2tKvWEsW14hsJNlapbDgQo0/rRFos3AhKP8hrPKCtKi8Rk+UCrn0AnpStRsj3zEGEO8Zx4u92T71l1yIJOql+IUDVO2T140dzK4UqlUMTTLeCNUTqD4Djl9rwFv+rRM/ErNOT7bhuyKp18hNYfpQnzjGg5qqA6DW9Q5RKDYqiOWlH+yhGUoL9UucxyIT9KE4y3XuWhzi5CfBC4vphV8aEKd9QBfo6N0VAnTzANufuA0+DQSHZmu3Za1QJfI59iKBQ81G0MciQ1RH9AtD314Q6cvTS9ZIsMW6F7/UvFIzAkkzH5++HPk0fnSXZIrZ33Tqec4p5Rz5q+RvEPQ7STx+oVlikJBP2HwfJoQZcmy6E+tOpjiMN09JcF5gUzBoZuFyQ/J7D+JOke7mRs0w882SFIjD84uySB0Lmaa96Wn8Dn/Gl2v2MrP2PUYn+dwZVAFXwhp6Eq3XQ/sOJ+p5xyhPngWoFDbKXNZFt4SChIIwzMcRe5HXTKO2ayFgh/OHFTVUu/8qfbrpAn0ofcSmx4D/1s1i+krZyL1VIUhb9WIz9ZCV10b8zlydzIQnIpgvhD2esoeNmEJy/ONiqFdRP19wSdTW711H0mc7IaueoYr9p/u3pZZU0YS/66F1R5HeWDTbKdlkI9dNuctPOc5nkDjUfejFl3ZxkgphtCutu/wPrFtHkOITnp4bzMilp5LjppK9H19b+ITCrTAo0mXdS9KPfphKKshWjN/jY2LnvZSMT2Lp7UiV4iqzL6pAJkzvFDWwG7skS8E69eGAIkuxydq0Ac/XR5vYMimTEi+GEOYsoFlF1u3pSjBvLWGU0mqtUNK3eR7bRGCTzYZ+QGIDERfwPeyZ0qgfW/vg64T2IamZn7+JDf5V/O4uEQ5WwkXg+O57pLPBG9TVcyAffGKwArXYawb4CMWEMwO0ajrYGKkB5s82qw/y87kXxMgFPp8r3IHNI7Ht43yslDXlqbse+aazT6FsrrgIChSQTp9NddhwG0oGF4dUBOVS58pPlkhMFEO8R92nFy7Pz4XRvZ2aiZDhTLjrdPXYJF8HDTpKUCmhwRp+9NariCps3JdQhfzM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93960a2d-ff5a-4ef6-a831-08dc5f5de624 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:27.8298 (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: wTYDRqts5wrqRwI4Y0/6rG5ZOtHp34cPJX6RYHybpfp53AU6xQPzv0Iv9uT1ppWT9Dihfw0I8AcqKARvuCLXxHRfd9IG/AlYptCNQEpgSVxSCPcFRdZ2hZcqxw2P8xZC X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/axg-card.c | 8 ++++---- sound/soc/meson/meson-card-utils.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 48f14c28f79d..55198cdc6daa 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, lb->stream_name = lb->name; lb->cpus->of_node = pad->cpus->of_node; lb->cpus->dai_name = "TDM Loopback"; - lb->dpcm_capture = 1; + lb->capture_assertion = 1; lb->no_pcm = 1; lb->ops = &axg_card_tdm_be_ops; lb->init = axg_card_tdm_dai_lb_init; @@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable playback is the interface has no tx slots */ if (!tx) - link->dpcm_playback = 0; + link->playback_assertion = 0; for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) { snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i); @@ -186,7 +186,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable capture is the interface has no rx slots */ if (!rx) - link->dpcm_capture = 0; + link->capture_assertion = 0; /* ... but the interface should at least have one of them */ if (!tx && !rx) { @@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card, return ret; /* Add loopback if the pad dai has playback */ - if (link->dpcm_playback) { + if (link->playback_assertion) { ret = axg_card_add_tdm_loopback(card, index); if (ret) return ret; diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index ed6c7e2f609c..ac417e673951 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card, link->dpcm_merged_rate = 1; if (is_playback) - link->dpcm_playback = 1; + link->playback_assertion = 1; else - link->dpcm_capture = 1; + link->capture_assertion = 1; return meson_card_set_link_name(card, link, node, "fe"); } From patchwork Thu Apr 18 04:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634111 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2063.outbound.protection.outlook.com [40.107.113.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E940354654; Thu, 18 Apr 2024 04:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413625; cv=fail; b=rxBrCj7HcG+WUQKYTss6RNtyQHePDaIH1FnoMSnbo27UDv7Law9S7P91wnIShm4YzFUNc54M2MYB8dt1//l2ScWT1OjWSNlfeKoAqwrqH3X5TFqDRYdrw2YVIOX/vMlCze6bC9uLMfwm5RKLdSN4uPJLxhr+HUvlk5NmxhXXfx0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413625; c=relaxed/simple; bh=hRrR3ZKkq7p6nbk1CuYGX/kR887vgtP3gPJexi1sApU=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=HLbBn8QS2MgR0S+jc7EKItC390hpmALVR2+LXbPqDw7ruy03PtkpvV2oF1uN0Mlpap5Oat5aZ7HboZQo3d0AENuO/oKxDFwi/rUquKcSkDVvpwvSTyVKUibz90fsSdrUoBsTBc83zcx3xF5lw5JU/cw+lXIsg1SPHQR3Khdnt/4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=f4Tk2jkj; arc=fail smtp.client-ip=40.107.113.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="f4Tk2jkj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cmZJYqIvDb3G9YKO5lHA8Njb9dKGX1yZ42aw+fylejkiB4czdAXjc4k6/Nh6hu5l4QgKYoKWeU2i7ZQG+wy9si5Aead4Ab3DP/GtnoRhRMrjLzS4W3p94ZEj2x+Tw7+tv57WKA5h60obKY1Bzjvirhc8Ab9WM83U7uWWkzCE6HpmEhUC7QLVQCjXdfoOZhUFGX391GZAUp4aOxn64Cjzm7+Xn2hzFZzydK9wscc6uxbdjgzAP4x9dPu9btn5yKr2AqfMW6LO2kZJda0NLRbgrbst2GplORTS2QviElUf1BaiVl2viCKquAC6z4GEQVVHb+8NKZZkxd38/++VnCmuWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dcGuKAM1ej5PkL543oeduwHuykUiZYyY2wL7rzukYRI=; b=LiJPcPiBg3LKtf+NtQH+JYzdj4vLDkcEYtOi9EE3imJvtJX5D2QgTmN2s1Qe3VLJiX2WLP/VC8+2agiGbbRRprXc9uecKJJ5urYAp5SPlyh97TTLVKaNcCKE8g40gjSDTXQNy/IfhUQExWzC6j4L9x6q9+M2sCv4JpJH7/qwJSGVo5Vp8MqgqIZO6Bbq7RuIUys+Scv8rkjhAD+taxj+X3LKizxsmgk6zUh5FxnCjjEyLDAPw2ZHpXMFq6q4Zn34aWWZgiLppTdgoTtBs44awXUUJMWV72nN9OOQCcXISFHrL3TddYAAoQpdTUOjgpWvsy2hkFCpXXMnNpJg8hWbOg== 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=dcGuKAM1ej5PkL543oeduwHuykUiZYyY2wL7rzukYRI=; b=f4Tk2jkj8BjE1n7zJd9xwdht69xAtQzsEwk6ljQDmm7Fi/SAR6/wGEGdyv0ftASdKYc7vu5FNXMb4XaZTd6KptCl0FycMneY2L7lY8/sLubsVpqrTmtnYjQKhsfLjgighdXX5xnj/zfJ6Hi3YH0e49WQqTj+GCIpjuQh8GcLxQI= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:37 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:37 +0000 Message-ID: <875xwf8g0f.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 08/23] ASoC: Intel: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:36 +0000 X-ClientProxiedBy: TY2PR0101CA0007.apcprd01.prod.exchangelabs.com (2603:1096:404:92::19) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: befb6150-537c-4479-555e-08dc5f5debb0 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Us09WoGjiH9gOvPCUuFjSkIURdSSteLBzY1/By3NR7VBfsRcM/E45Wn0wgY/M+cyjER6yyw5Yj1aZaiuVDXPwkKfidqzKe23h+5gflfdoHr/D8APXL6pMdhTJ0R1Tn1hxnHDW9NPnKE3a9A2LCTgt2fJQ/d4tooHfzS0fFAAYxo8shF07yHLH6uYhb1uP9rwt0awd3xpT13KdRoWHE+F6XHRfdS9Duc/kFyPWZMnpFDcIFq2r8kmsbsktS7bvUW0s3zKx76zS5jRxjHb8tTfIpDhF35wCsQI/f85boiVzhRifVDXqOnNxF+E9pmlm+1YAnm+iHjBeI7zqIdGkfZRs+aM8UsOZw455A4ZvaBsQw2cM6PF7+5pFEQJFYWUOIhCuV9+sfZZMmOk5R/7KaWZP33949C/I5QvO04rjOOWYLfjZRnD9rCbWMUNuQu9kqYPJ3kxwaisgpGVpgvrM39O3iwPmQYLB0u4XHPXPxw6ZtXCXBnQQn2wSwHwXHnjt2BSIM1JaqiaZBpM0v4xIFb4MjdN2qhnY0Psa3FtUWo7EHsT8UAksvKlNg9VbZFAN32y1r3kTw7h5fhtjD6E69CkCcCWWRYyOEZEwQsmcq8GorRumqQqQfdPG2LR3CGNucPADmk1e0EUmU6K0a7bgX05jw7diynbuJAuKatY/iUSbsdv5u6ADYKBv9L99WxErMPY9iY7sTuSOOiktmbVltjdil+uVt3oHYqgSkO3Sf9XG0s= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DMbwfGJLW65YnS52YsS0GhA63tH861PSrlGaxoPZZXflbiVmrOZV1c/Wl/qYtnD00YRMXeFI7m3x5AtBkEJEzgPdsIvmhITHYinin/KTpHZcgd+jCVz+Iox/gr7ABPGaciG4scs9wTJOBauJn3jfzGmWsaRrtwbR1oGSijTA157z4b+xVLAygE/R+Qly11XOTAqD0ntIR1zwMTeIu9WPWl2NJ9KGeUP+fJYX97naFW24b8/5Kv5lJowOGld+RpsI1wJ5rmI9v/HNQCn6LpaiGuCxoDeGCWmyhNzhp39fYXPozwx07jqnbuaE5oGPrj4b4sc2e8H412uc4K3jL0YixQKUeK9kYtu7nhal60axmZa8+u2h8H7yioiBGSTUufWTz2fHf2iFe9Q7piScFf+StzheXI+EcuZ78kwRcAtzfw0kxa5vWuQwOoXD/3yDtCfDMab8/KkPR23XjUKS/zl8oQtreLWXK6G2ojflNHicC5k/tJPjj3KL3uB4wxQuC/DIVPRWOxlx2ZFBsyOuk1ZWfwApu97u/JhgSRnMYzJAA3bzfXYUMgaaKwm3CXNEPHPVPfCEjJQZyrLKnnXzzo6DzL0Ot6lRPfAYUu33LjH/KjTkz9sbNLBiu1iRW69WmkPc/4ZFUzRGTg+QKTHUzazGlujeD3ENv34wf8gP798fAnVnB/eFB1qgY4eSanIUSmPvZKZLkiYxRNb8HUNp+IDFjWx47Xn9oLMLGwgO1TLjbun5ckjCR/FnXHh3Nb/AX0LUqKWN/4Q0jNdssbo1CiX2U2uzuM+TcKR7SNxRVYxJq722TFnLh6lxjD1NUyC+Gp3A54gxwq4m354OY1cFWzNSZIq58ZLU9PslizaJID/bgh0PQnw/hremqO0/ifAssOenxOQWiHTe6Dy8O0eDhqejuqeQbGOqNBkC8QldOkDR+DmulLHfv0T/A4JfpgGYgM0ea5kHSq5w6GcB8jbpTb502ki6SrlLaMCWv2QLpWD0uLbbRDeS0FJs2C887DPrF6Vo1u1wYdN1bBKUTGRdmONrqKSFU+sW2xJDsmVrOGoFySN72nc6Nhg6grCkN4YD78PazA+gBNNDYt8gZjw+xP7XNR7Mme9mNAIkWKjpg2rjGa+oru8TBtnL0la/PZKt498lTUdabtqKUQRwoEW7p07bdiHNgxbu1DEN9a97V0M0Tm50qAiBCh7amFYkjFUyTVpqIPH14xkcSgCYF9/q07dq2kAniF2Z+q04o9NQxyJqOvd1ngxroStwtbDi5cVtGpvQ0o4o9kV0qpleP2XDpzuACHFZ+PxLaYqHDvchxI0Y3k8YLx+8WIFHjtaf3WVSrTfHIkWMa9TqJECdkRzTdsaJXVo3AuuzUP8EfsFHpCcPdvaRdzC8hH+jsbf5Pe7mZkJjQQyd+ia6bmGMLDwCdkgMO5gK+DWmzixxccOQoUnIZdvKRJttmJwVnmASo1NDhNa/baiNUrozoTcWrCnZh3gEdT4Jmq+6sVfa/nvg6pWnfH+RhjU8zAE2iwlj3Dfm5smBGAqKKv2X0pvByFFYRUR9Ig0GwLnb1MrhkXUDNU29KiTNtIen5K/4egDVIMErKv1k2gSSg1HXb3y1u9KKO/N9fHHPGvwjVnzlUz6Jz2pqlEk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: befb6150-537c-4479-555e-08dc5f5debb0 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:37.2486 (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: Nsk2xsYq1Sc9nlhM4cfexeET/ZBxc/7r/OL0WDA+yYL7d1z2ieZT/Hm8wYleLdfox3WRfF5EStSK/1Z7lzEtH7/pqDG0ryedbJT7SlitqhTqFh2LL7xfMAJ/QvarpTOv X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/boards/bdw-rt5650.c | 8 +-- sound/soc/intel/boards/bdw-rt5677.c | 8 +-- sound/soc/intel/boards/bdw_rt286.c | 14 ++--- sound/soc/intel/boards/bxt_da7219_max98357a.c | 34 +++++------ sound/soc/intel/boards/bxt_rt298.c | 28 ++++----- sound/soc/intel/boards/bytcht_cx2072x.c | 10 ++-- sound/soc/intel/boards/bytcht_da7213.c | 10 ++-- sound/soc/intel/boards/bytcht_es8316.c | 10 ++-- sound/soc/intel/boards/bytcht_nocodec.c | 10 ++-- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++-- sound/soc/intel/boards/bytcr_rt5651.c | 10 ++-- sound/soc/intel/boards/bytcr_wm5102.c | 10 ++-- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 10 ++-- sound/soc/intel/boards/cht_bsw_nau8824.c | 10 ++-- sound/soc/intel/boards/cht_bsw_rt5645.c | 10 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 10 ++-- sound/soc/intel/boards/ehl_rt5660.c | 16 ++--- sound/soc/intel/boards/glk_rt5682_max98357a.c | 32 +++++----- sound/soc/intel/boards/hsw_rt5640.c | 14 ++--- sound/soc/intel/boards/kbl_da7219_max98357a.c | 28 ++++----- sound/soc/intel/boards/kbl_da7219_max98927.c | 60 +++++++++---------- sound/soc/intel/boards/kbl_rt5660.c | 20 +++---- sound/soc/intel/boards/kbl_rt5663_max98927.c | 48 +++++++-------- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 26 ++++---- sound/soc/intel/boards/skl_hda_dsp_common.c | 18 +++--- .../soc/intel/boards/skl_nau88l25_max98357a.c | 28 ++++----- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 +++++----- sound/soc/intel/boards/skl_rt286.c | 28 ++++----- sound/soc/intel/boards/sof_board_helpers.c | 18 +++--- sound/soc/intel/boards/sof_es8336.c | 10 ++-- sound/soc/intel/boards/sof_pcm512x.c | 8 +-- sound/soc/intel/boards/sof_sdw.c | 4 +- sound/soc/intel/boards/sof_wm8804.c | 4 +- 33 files changed, 297 insertions(+), 297 deletions(-) diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index 3ae26f21458f..7f0544203c1f 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -239,8 +239,8 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -256,8 +256,8 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5650_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = bdw_rt5650_init, SND_SOC_DAILINK_REG(ssp0_port, be, platform), }, diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 304af3d06d01..54e3c5d3c251 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -329,8 +329,8 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_capture = 1, - .dpcm_playback = 1, + .capture_assertion = 1, + .playback_assertion = 1, .ops = &bdw_rt5677_fe_ops, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -356,8 +356,8 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broadwell_ssp0_fixup, .ops = &bdw_rt5677_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = bdw_rt5677_init, .exit = bdw_rt5677_exit, SND_SOC_DAILINK_REG(ssp0_port, be, platform), diff --git a/sound/soc/intel/boards/bdw_rt286.c b/sound/soc/intel/boards/bdw_rt286.c index 7f20159c23e5..ca2a19fa1c19 100644 --- a/sound/soc/intel/boards/bdw_rt286.c +++ b/sound/soc/intel/boards/bdw_rt286.c @@ -133,8 +133,8 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -143,7 +143,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -152,7 +152,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -161,7 +161,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -177,8 +177,8 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index 3fe3f38c6cb6..0efa9d5f0fe1 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -504,7 +504,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .init = broxton_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -516,7 +516,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -527,7 +527,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &broxton_da7219_fe_ops, SND_SOC_DAILINK_REG(system2, dummy, platform), }, @@ -536,7 +536,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_refcap_ops, @@ -547,7 +547,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops, @@ -557,7 +557,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -567,7 +567,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -577,7 +577,7 @@ static struct snd_soc_dai_link broxton_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -594,7 +594,7 @@ static struct snd_soc_dai_link broxton_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp_fixup, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, { @@ -607,8 +607,8 @@ static struct snd_soc_dai_link broxton_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -616,7 +616,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = broxton_dmic_fixup, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -624,7 +624,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -632,7 +632,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -640,7 +640,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -648,7 +648,7 @@ static struct snd_soc_dai_link broxton_dais[] = { .name = "dmic16k", .id = 6, .be_hw_params_fixup = broxton_dmic_fixup, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k_pin, dmic_codec, platform), }, @@ -838,7 +838,7 @@ static int broxton_audio_probe(struct platform_device *pdev) if (ctx->spkamp == SPKAMP_MAX98390) { broxton_dais[i].codecs = max98390_codec; broxton_dais[i].num_codecs = ARRAY_SIZE(max98390_codec); - broxton_dais[i].dpcm_capture = 1; + broxton_dais[i].capture_assertion = 1; } } /* DIALOG_CODEC is connected to SSP0 */ diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index afc499be8db2..af817dd6ad78 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -394,7 +394,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .dynamic = 1, .init = broxton_rt298_fe_init, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &broxton_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -405,7 +405,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &broxton_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -414,7 +414,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "Bxt Audio Reference cap", .stream_name = "refcap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(reference, dummy, platform), @@ -424,7 +424,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "Bxt Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &broxton_dmic_ops, @@ -434,7 +434,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -444,7 +444,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -454,7 +454,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { { .name = "Bxt HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -472,8 +472,8 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = broxton_ssp5_fixup, .ops = &broxton_rt298_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, { @@ -481,7 +481,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .id = 1, .be_hw_params_fixup = broxton_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -490,7 +490,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .id = 2, .be_hw_params_fixup = broxton_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, @@ -498,7 +498,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp1", .id = 3, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -506,7 +506,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp2", .id = 4, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -514,7 +514,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { .name = "iDisp3", .id = 5, .init = broxton_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c index c014d85a08b2..6f4158772ed6 100644 --- a/sound/soc/intel/boards/bytcht_cx2072x.c +++ b/sound/soc/intel/boards/bytcht_cx2072x.c @@ -175,8 +175,8 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -185,7 +185,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -198,8 +198,8 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = byt_cht_cx2072x_init, .be_hw_params_fixup = byt_cht_cx2072x_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp2, cx2072x, platform), }, }; diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c index f4ac3ddd148b..046b191f79e1 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -174,8 +174,8 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -184,7 +184,7 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -197,8 +197,8 @@ static struct snd_soc_dai_link dailink[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 2fcec2e02bb5..d6f65c1a30d9 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -315,8 +315,8 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -326,7 +326,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -339,8 +339,8 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_cht_es8316_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = byt_cht_es8316_init, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/bytcht_nocodec.c b/sound/soc/intel/boards/bytcht_nocodec.c index 4a957d1cece3..d16468583b03 100644 --- a/sound/soc/intel/boards/bytcht_nocodec.c +++ b/sound/soc/intel/boards/bytcht_nocodec.c @@ -119,8 +119,8 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -130,7 +130,7 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -144,8 +144,8 @@ static struct snd_soc_dai_link dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = codec_fixup, .ignore_suspend = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp2_port, dummy, platform), }, }; diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 05f38d1f7d82..a498375bb536 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1533,8 +1533,8 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -1543,7 +1543,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -1555,8 +1555,8 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5640_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = byt_rt5640_init, .exit = byt_rt5640_exit, .ops = &byt_rt5640_be_ssp2_ops, diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 80c841b000a3..dc1c0eb29277 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -770,8 +770,8 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -780,7 +780,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -793,8 +793,8 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_rt5651_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = byt_rt5651_init, .ops = &byt_rt5651_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), diff --git a/sound/soc/intel/boards/bytcr_wm5102.c b/sound/soc/intel/boards/bytcr_wm5102.c index cccb5e90c0fe..22d31008642a 100644 --- a/sound/soc/intel/boards/bytcr_wm5102.c +++ b/sound/soc/intel/boards/bytcr_wm5102.c @@ -462,8 +462,8 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), @@ -473,7 +473,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -490,8 +490,8 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_wm5102_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .init = byt_wm5102_init, SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index f43bc20d6aae..cb9b0c19192c 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -351,8 +351,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -361,7 +361,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -374,8 +374,8 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 7651b83632fa..b6c2851afd29 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -193,8 +193,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -203,7 +203,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -217,8 +217,8 @@ static struct snd_soc_dai_link cht_dailink[] = { | SND_SOC_DAIFMT_CBC_CFC, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index eb41b7115d01..d6af19e77d6f 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -448,8 +448,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -458,7 +458,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -470,8 +470,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index be2d1a8dbca8..fd2430405f10 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -358,8 +358,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -368,7 +368,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -381,8 +381,8 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .init = cht_codec_init, .be_hw_params_fixup = cht_codec_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &cht_be_ssp2_ops, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, diff --git a/sound/soc/intel/boards/ehl_rt5660.c b/sound/soc/intel/boards/ehl_rt5660.c index 686e60321224..651c7cc26f20 100644 --- a/sound/soc/intel/boards/ehl_rt5660.c +++ b/sound/soc/intel/boards/ehl_rt5660.c @@ -178,8 +178,8 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "SSP0-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &rt5660_ops, SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform), }, @@ -187,7 +187,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic48k", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -195,7 +195,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, @@ -203,7 +203,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp1", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -211,7 +211,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp2", .id = 6, .init = hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -219,7 +219,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp3", .id = 7, .init = hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -227,7 +227,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp4", .id = 8, .init = hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform), }, diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c index 4098b2d32f9b..b5b01fee719a 100644 --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c @@ -413,7 +413,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .init = geminilake_rt5682_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, [GLK_DPCM_AUDIO_CP] = { @@ -423,13 +423,13 @@ static struct snd_soc_dai_link geminilake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, [GLK_DPCM_AUDIO_HS_PB] = { .name = "Glk Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -438,7 +438,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), @@ -447,7 +447,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio Reference cap", .stream_name = "Refcap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &geminilake_refcap_ops, @@ -457,7 +457,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "Glk Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &geminilake_dmic_ops, @@ -466,7 +466,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { [GLK_DPCM_AUDIO_HDMI1_PB] = { .name = "Glk HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -477,7 +477,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { [GLK_DPCM_AUDIO_HDMI2_PB] = { .name = "Glk HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -490,7 +490,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -507,7 +507,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = geminilake_ssp_fixup, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -521,8 +521,8 @@ static struct snd_soc_dai_link geminilake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = geminilake_ssp_fixup, .ops = &geminilake_rt5682_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp2_pin, ssp2_codec_5682, platform), }, { @@ -530,7 +530,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = geminilake_dmic_fixup, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -538,7 +538,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp1", .id = 3, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -546,7 +546,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp2", .id = 4, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -554,7 +554,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { .name = "iDisp3", .id = 5, .init = geminilake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c index 2a2fe27dff0e..930c09205516 100644 --- a/sound/soc/intel/boards/hsw_rt5640.c +++ b/sound/soc/intel/boards/hsw_rt5640.c @@ -85,8 +85,8 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -95,7 +95,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -104,7 +104,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -113,7 +113,7 @@ static struct snd_soc_dai_link card_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -127,8 +127,8 @@ static struct snd_soc_dai_link card_dai_links[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = codec_link_hw_params_fixup, .ops = &codec_link_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 9dbc15f9d1c9..ac5abde7f6fa 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -460,7 +460,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -471,7 +471,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -479,7 +479,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -489,7 +489,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -498,7 +498,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -509,7 +509,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -522,7 +522,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -540,7 +540,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -553,8 +553,8 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -562,14 +562,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .id = 2, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -578,7 +578,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -586,7 +586,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index e662da5af83b..42c4ad52d181 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -686,7 +686,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -694,7 +694,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -702,7 +702,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -712,7 +712,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -721,7 +721,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -732,7 +732,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -745,7 +745,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -754,7 +754,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_assertion = 1, .nonatomic = 1, .dynamic = 1, .init = kabylake_da7219_fe_init, @@ -770,7 +770,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -784,8 +784,8 @@ static struct snd_soc_dai_link kabylake_dais[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_ssp0_ops, @@ -801,8 +801,8 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -811,14 +811,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_dmic_init, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -827,7 +827,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -835,7 +835,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -852,7 +852,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .init = kabylake_da7219_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_da7219_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -860,7 +860,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -868,7 +868,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -878,7 +878,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -887,7 +887,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -898,7 +898,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -911,7 +911,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -927,8 +927,8 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_ssp0_ops, @@ -940,14 +940,14 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .init = kabylake_dmic_init, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 2, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -956,7 +956,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "iDisp2", .id = 3, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -964,7 +964,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { .name = "iDisp3", .id = 4, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c index 894d127c482a..ae1259c0fc2c 100644 --- a/sound/soc/intel/boards/kbl_rt5660.c +++ b/sound/soc/intel/boards/kbl_rt5660.c @@ -377,7 +377,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_rt5660_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -388,14 +388,14 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_rt5660_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -406,7 +406,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -419,7 +419,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -440,14 +440,14 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp0_fixup, .ops = &kabylake_rt5660_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -456,7 +456,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp2", .id = 2, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -464,7 +464,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { .name = "iDisp3", .id = 3, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c index 646e8ff8e961..b59773d61127 100644 --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c @@ -687,7 +687,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_rt5663_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -698,14 +698,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -714,7 +714,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -722,7 +722,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -732,7 +732,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -741,7 +741,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -752,7 +752,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -765,7 +765,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -783,7 +783,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_ssp0_ops, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, @@ -798,8 +798,8 @@ static struct snd_soc_dai_link kabylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -807,14 +807,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .id = 2, .be_hw_params_fixup = kabylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -823,7 +823,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -831,7 +831,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp3", .id = 5, .init = kabylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -846,7 +846,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -857,14 +857,14 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_5663_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -875,7 +875,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { [KBL_DPCM_AUDIO_5663_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -896,14 +896,14 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_5663_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -912,7 +912,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { .name = "iDisp2", .id = 2, .init = kabylake_5663_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 924d5d1de03a..2721dfe9a579 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -575,7 +575,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .init = kabylake_rt5663_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -586,14 +586,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &kabylake_rt5663_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, [KBL_DPCM_AUDIO_HS_PB] = { .name = "Kbl Audio Headset Playback", .stream_name = "Headset Audio", - .dpcm_playback = 1, + .playback_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(system2, dummy, platform), @@ -602,7 +602,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio Echo Reference cap", .stream_name = "Echoreference Capture", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, SND_SOC_DAILINK_REG(echoref, dummy, platform), }, @@ -615,7 +615,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "Kbl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &kabylake_dmic_ops, @@ -624,7 +624,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI1_PB] = { .name = "Kbl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -635,7 +635,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { [KBL_DPCM_AUDIO_HDMI2_PB] = { .name = "Kbl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -655,8 +655,8 @@ static struct snd_soc_dai_link kabylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &kabylake_ssp0_ops, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, @@ -670,14 +670,14 @@ static struct snd_soc_dai_link kabylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = kabylake_ssp_fixup, .ops = &kabylake_rt5663_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = kabylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -686,7 +686,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .name = "iDisp2", .id = 4, .init = kabylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index e9cefa4ae56d..7fa21bd51ecb 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -84,51 +84,51 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { { .name = "iDisp1", .id = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform), }, { .name = "iDisp2", .id = 2, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform), }, { .name = "iDisp3", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform), }, { .name = "Analog Playback and Capture", .id = 4, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(analog_cpu, analog_codec, platform), }, { .name = "Digital Playback and Capture", .id = 5, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform), }, { .name = "dmic01", .id = 6, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "dmic16k", .id = 7, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c index e4630c33176e..a6dcc7a5312b 100644 --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c @@ -474,7 +474,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -485,7 +485,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -493,7 +493,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -503,7 +503,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -512,7 +512,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -523,7 +523,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -536,7 +536,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -554,7 +554,7 @@ static struct snd_soc_dai_link skylake_dais[] = { SND_SOC_DAIFMT_CBC_CFC, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -568,8 +568,8 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .ops = &skylake_nau8825_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -577,14 +577,14 @@ static struct snd_soc_dai_link skylake_dais[] = { .id = 2, .be_hw_params_fixup = skylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -593,7 +593,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -601,7 +601,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c index fadc25a536b4..6a6aaf1cef11 100644 --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c @@ -513,7 +513,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_nau8825_fe_init, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -524,7 +524,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .nonatomic = 1, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &skylake_nau8825_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -532,7 +532,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "Wake on Voice", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_refcap_ops, @@ -542,7 +542,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -551,7 +551,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -562,7 +562,7 @@ static struct snd_soc_dai_link skylake_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, @@ -575,7 +575,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .stream_name = "Hdmi3", .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -594,8 +594,8 @@ static struct snd_soc_dai_link skylake_dais[] = { .init = skylake_ssm4567_codec_init, .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -609,8 +609,8 @@ static struct snd_soc_dai_link skylake_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp_fixup, .ops = &skylake_nau8825_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, { @@ -618,14 +618,14 @@ static struct snd_soc_dai_link skylake_dais[] = { .id = 2, .ignore_suspend = 1, .be_hw_params_fixup = skylake_dmic_fixup, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, { .name = "iDisp1", .id = 3, - .dpcm_playback = 1, + .playback_assertion = 1, .init = skylake_hdmi1_init, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), @@ -634,7 +634,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp2", .id = 4, .init = skylake_hdmi2_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -642,7 +642,7 @@ static struct snd_soc_dai_link skylake_dais[] = { .name = "iDisp3", .id = 5, .init = skylake_hdmi3_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 9a8044274908..bf20a1188b35 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -348,7 +348,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -361,7 +361,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -374,7 +374,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST }, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &skylake_rt286_fe_ops, SND_SOC_DAILINK_REG(system, dummy, platform), }, @@ -382,7 +382,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "Skl Audio Reference cap", .stream_name = "refcap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, SND_SOC_DAILINK_REG(reference, dummy, platform), @@ -391,7 +391,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "Skl Audio DMIC cap", .stream_name = "dmiccap", .init = NULL, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .dynamic = 1, .ops = &skylake_dmic_ops, @@ -400,7 +400,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI1_PB] = { .name = "Skl HDMI Port1", .stream_name = "Hdmi1", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -409,7 +409,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI2_PB] = { .name = "Skl HDMI Port2", .stream_name = "Hdmi2", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -418,7 +418,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { [SKL_DPCM_AUDIO_HDMI3_PB] = { .name = "Skl HDMI Port3", .stream_name = "Hdmi3", - .dpcm_playback = 1, + .playback_assertion = 1, .init = NULL, .nonatomic = 1, .dynamic = 1, @@ -438,8 +438,8 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .ignore_pmdown_time = 1, .be_hw_params_fixup = skylake_ssp0_fixup, .ops = &skylake_rt286_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ssp0_pin, ssp0_codec, platform), }, { @@ -447,7 +447,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .id = 1, .be_hw_params_fixup = skylake_dmic_fixup, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic01_pin, dmic_codec, platform), }, @@ -455,7 +455,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp1", .id = 2, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -463,7 +463,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp2", .id = 3, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -471,7 +471,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { .name = "iDisp3", .id = 4, .init = skylake_hdmi_init, - .dpcm_playback = 1, + .playback_assertion = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c index eb140e13153f..8cc7ca21cc57 100644 --- a/sound/soc/intel/boards/sof_board_helpers.c +++ b/sound/soc/intel/boards/sof_board_helpers.c @@ -144,8 +144,8 @@ static int set_ssp_codec_link(struct device *dev, struct snd_soc_dai_link *link, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; - link->dpcm_playback = 1; + link->capture_assertion = 1; + link->playback_assertion = 1; return 0; } @@ -195,7 +195,7 @@ static int set_dmic_link(struct device *dev, struct snd_soc_dai_link *link, link->init = dmic_init; link->ignore_suspend = 1; link->no_pcm = 1; - link->dpcm_capture = 1; + link->capture_assertion = 1; return 0; } @@ -253,7 +253,7 @@ static int set_idisp_hdmi_link(struct device *dev, struct snd_soc_dai_link *link link->id = be_id; link->init = (hdmi_id == 1) ? hdmi_init : NULL; link->no_pcm = 1; - link->dpcm_playback = 1; + link->playback_assertion = 1; return 0; } @@ -293,8 +293,8 @@ static int set_ssp_amp_link(struct device *dev, struct snd_soc_dai_link *link, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */ - link->dpcm_playback = 1; + link->capture_assertion = 1; /* feedback stream or firmware-generated echo reference */ + link->playback_assertion = 1; return 0; } @@ -334,8 +334,8 @@ static int set_bt_offload_link(struct device *dev, struct snd_soc_dai_link *link link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; - link->dpcm_playback = 1; + link->capture_assertion = 1; + link->playback_assertion = 1; return 0; } @@ -375,7 +375,7 @@ static int set_hdmi_in_link(struct device *dev, struct snd_soc_dai_link *link, link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; + link->capture_assertion = 1; return 0; } diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index c1fcc156a575..f713de8721e5 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -455,8 +455,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].exit = sof_es8316_exit; links[id].ops = &sof_es8336_ops; links[id].nonatomic = true; - links[id].dpcm_playback = 1; - links[id].dpcm_capture = 1; + links[id].playback_assertion = 1; + links[id].capture_assertion = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -496,7 +496,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_assertion = 1; links[id].no_pcm = 1; id++; @@ -539,7 +539,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_assertion = 1; links[id].no_pcm = 1; id++; @@ -569,7 +569,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_codecs = 1; links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); - links[id].dpcm_capture = 1; + links[id].capture_assertion = 1; links[id].no_pcm = 1; links[id].num_cpus = 1; id++; diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c index b01cb2329542..b581fbcd9b86 100644 --- a/sound/soc/intel/boards/sof_pcm512x.c +++ b/sound/soc/intel/boards/sof_pcm512x.c @@ -246,12 +246,12 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_pcm512x_codec_init; links[id].ops = &sof_pcm512x_ops; - links[id].dpcm_playback = 1; + links[id].playback_assertion = 1; /* * capture only supported with specific versions of the Hifiberry DAC+ */ if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE) - links[id].dpcm_capture = 1; + links[id].capture_assertion = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -294,7 +294,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].ignore_suspend = 1; - links[id].dpcm_capture = 1; + links[id].capture_assertion = 1; links[id].no_pcm = 1; id++; } @@ -341,7 +341,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, links[id].platforms = platform_component; links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].init = sof_hdmi_init; - links[id].dpcm_playback = 1; + links[id].playback_assertion = 1; links[id].no_pcm = 1; id++; } diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index d65c5da49000..2bbffbe06156 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1152,8 +1152,8 @@ static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links dai_links->num_cpus = cpus_num; dai_links->codecs = codecs; dai_links->num_codecs = codecs_num; - dai_links->dpcm_playback = playback; - dai_links->dpcm_capture = capture; + dai_links->playback_assertion = playback; + dai_links->capture_assertion = capture; dai_links->init = init; dai_links->ops = ops; } diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c index 4cb0d463bf40..d276690b85f9 100644 --- a/sound/soc/intel/boards/sof_wm8804.c +++ b/sound/soc/intel/boards/sof_wm8804.c @@ -167,8 +167,8 @@ static struct snd_soc_dai_link dailink[] = { .name = "SSP5-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &sof_wm8804_ops, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, From patchwork Thu Apr 18 04:13:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634112 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2048.outbound.protection.outlook.com [40.107.113.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9ADA54F8A0; Thu, 18 Apr 2024 04:13:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413631; cv=fail; b=XZlEGjV4P8gwwd5ObpveY8fPPAtdK8yUS470WlsvVzvVrCB8qYfdZ1nLHVtk94dfXljx8wHN1UuylikesONHivzT4SDrsqiWjkYhf4l4oJJPSCUphdYQbuDLmtgUnhYyQ1W4DwEzAH4DBtqi/9IZRi2hBf90M/4b9si4dzNH8fQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413631; c=relaxed/simple; bh=7a2UR+VFjyxbPmjZ9OyRxSHtapUfY10c67t+xHNjYhU=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=rm4BeLgPZR2ZD6Be85dI0ZvRrwNiYMCNipZPiGyo/aiS/sUs+hdRhNIjXflp/NADu9I2i14S/2qP4tdqH81Qhac1AbZKQZxoQKTgH906XzJ3VKUIFT1hk1ZtodzXELhU5JhDmlcqxbdKvy2nLXbcp08U1V9zOpWpuQtZvUJBKkU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=Er8So6sr; arc=fail smtp.client-ip=40.107.113.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Er8So6sr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HidHUPappKnR6lwFvTAOBUOCwsh0X6UzB5kSjHwydUkiQ3qCOA/RmfpdbYLby1B9osotDJuhEPmko9BCIIfW1IyDsp1H4qdTPRQNLfTt8se9nnGvrmF4b6qG/4dS6TvmT9EOXHhaJlBbyCHsFCwgsUOtuXJLkXjvZzzQDmi6oxVgJQACvXy5zyc2zIxhGaGuKcl2yKDCzaEWGQLCG9GgQsxJAI/WVuw5difba4zzhSZ61fqQFQ4QNMOVuDVvLexf8SUwfQb1VJdf1zkUxITUn/B+TAChGi5qGLMXBaKwrPB7sMAYVXmlKBOb3XltstmE5lpAKWrJLRMT968LZunm0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v2nfqWRw3fTwvw4977PC3ZDjW1AUbJM78Nlg410vZCc=; b=KtZC8ojam+WecqEnhCLEa4KXAzwXPBz94AMVDJ/vS4q+PmJcEtUUiGjfvznm83MVOXYDcbuX/454P70CSwYHzvA0QnMiWTjh13itCKLw5WCvFgcoaRTrnMo8hm+xHi3wKedJSFyXRtulf9FqeuW2Laj6Q7XAhqb/CGqbq3tbjr6RzL/WuItIXNjkB77tv0Bpt39+jOuxsj5CIXmYFjdQQiNbJkXQFeEOsWZsUFhar0KLkm+XQ9Og7fZocT+UveBIwkQp6XwJtYmAjbEJkAx4uIPU9TUPFEl26AcPFgoCvnACbp9eOvhDfI9LOzqXB43QZNU6gKhhd9l5F9opnVnU1g== 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=v2nfqWRw3fTwvw4977PC3ZDjW1AUbJM78Nlg410vZCc=; b=Er8So6srsJbj0xtyaNwEbIy5asSpFoA82xj24hbeevHnib0mdecFalyBzjW8W8luCreAF6sRRGiG/TYs74tduacxfnQrbgIIyhIy46Kvhp5aXgta5RaKw5CJjxUMSveELiSKOxeVx28ZyDdYlmiJAR6jV+aNmnHGtQkWFU+SHAY= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:44 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:44 +0000 Message-ID: <874jbz8g08.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 09/23] ASoC: mediatek: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:44 +0000 X-ClientProxiedBy: TYCPR01CA0168.jpnprd01.prod.outlook.com (2603:1096:400:2b2::8) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fd33997-76d5-4b89-95b4-08dc5f5df004 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 73zSLjpgZvJRopX9YwZVtzyufSiYUSPJQMP+K9essm7mE1F8FdpsenGpz/1HsB6FcXjHZ7bkv1R/B4tqtVRCjIx3mECsBjrXHpWr/6mCHy5KCp/U0aJ41xSUh2tr2J6hT5TfqxF97Q3dr2kFxTnmHT2+s3Xs3pUe1aeT0jw6PVafz3YizBfav+Fi95a3K1vtiT9/t6KrZjXD+/y9oxJ1xifj3yqvqi5oDm1HtFR3KZoOix4pfh+rr04ZrcnbYiZMt/GolTkqviAcv+CeOVfnsrfohcCJ5vT9hLp09d9FdAyyzoylwcsmv76iojX7AVlW9mgaqmvw6C4LEra6op+qyJ0WviWTvU8MpqL0mhXdr8fjllsgIJnOrSX1VcP0OeO/CJFWGFF8Hdkc0it4dpvqZfYX0sDuVNvszQxWMB4AQV4qso62mwpAAxcI2BOfLKflwu/FB2xpCr5Upy5Cw5Nw7rekSNfSf545mn3TQBDE/tzNx3Zwg7/hWU0C1zRiVqSXo4VDrbgpII9qdiXcj4wF2nN0K8v5/7jmvmoiVfkfcIl9idNwU/8FAWvxaBaAvestPlG3R5WFDPVIYKA7aEkLRi9DHB5Fa0ztM4/8Y/HCCN36n8s6QttlSrvj4nyBM9JVISIXTCQPlBWBf4pGNYpmimiicokXnGmozN7WcfKJzF2eJE0YsE6Bw7/OMx23QE41djtTUmdtFhKjpihmxUqUxJPhnYhHbb4ZQHK0rQCb5b8= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 90CVcqgWlrz5nulWzWHenDT7M2BYwPt6iV8gPVfeN9ZHnH+lJHRU0h+Ys1z+KVoFrar2niEy+73XJLomkt5WvbfMxN1fYmA0ykxdqsVdFFRfx32zbNGploYjCp08MzO7bGfyaVHI2njvDH9hZFkst7A9ncHVMrvGdogn1mA9Tj4d/ho5U6UkfCtXkqOt2Exxg+7PA5jRdcoqAstk7M8kToBjcb/9A4S9c168RYGugNUsCPhJXtuCaj4F/UtasR+slsoJ8vDa6qKXDklFUHhSVfFnTjt/cD4z0YgDzYaCq60rPGcXY4DiCDGHV21ryihb61AQ2sB2+BdWkaATr6wQxKVO7FK9qVwrdFCdDlB8WhKWCSsZcTORZALDrr/jCBG1BuWdThnOe+BJCoMynrka9ZztlfgJpfhaeLe23HrWp3M/NuXlsWIbvJIRwsSfw9FmBndUKdOdUdL2TfEc59nthx/FyjPfZlqhwsRk+7Y/wLopOWikvEOf8r6uXtCGpMXxEi5vPr6rkGBx6TtgFISr9tyL6wQ1ZSNKPx/deB41qxSGbPg+JeyvDN/mmBeC25aaH56voKAJKPAm+b+D+qMq5LOvq+NRCKHpODes6k8cLurJ1Rwx4xnrT3jATlJNsfp86CJ3R53KNW9IlCG8RbLt6oBvbLE5ZMC+jXA02++d3ZkeblmFXYxXq7kt/+u6UuOV6OW/hXCSaObx4idnon6NozRiw1L61Nk7WdPVfBRzZRT5HpuzR/6WuYZdr5tWK4DmgYIO5QjrkOuctb69lSMsL/AdsE68/ssN3WSHIU5PCvEVjfmaMnIBv+1iRanydAPYUc9kVAk1iHLVSAQ8ZDD49nLjTI/EE6sV5aq9saoaUTkdIikQe+4jXVdQcmbQJFYLTQOI8pyZgya8+hZcR3Ku0aK1nfuE9jY7VA4mJIVAznXTz+Kq32mOUARhcBlaeiyukg86aIkgCO/56oL5+faXEqR82PUuQ/6UmlCXKztBotFl/dbWtU3njWJCshiX5lQZlxjjbFXZA7yHpmhWjOvrCpNHZWWaXtolazBgctVvT0tdV/K05bIR1GhMoSNs7eLyc3QEQATMJk7JSDAM67zUM8dpRTeX/p3nSe8KIuIBAEURRjNsGya4+LBoLpsPrB2sYASVaBJnTmAslP6+SUOFY6WAg5xNYB8vQDiMXjuGdNyY9Hg/6G/68JnN3FTbrNU3AuhVNH1RrR0LMqWutp5rZ9LdGfnltCM/2SuwvE502yqy9n+i+Wmeyo6BTPl1Nne0akbpn23rz2thz/YPyn/Hx09MaCWS/RjV/Hs0Tv0kECI56FBmc8dkBShOl0muymJky9ZMFlPXzhjjhpjolvihAAmq/KRcoEBbdnrbMvaucJtxT3KjsCog1E1pvT7fgCEfzMLbjxvsHwxZMB1cah8pQBhrI8jkqxYdB4zvwd1svtFzNyT1E5dyOLSy3q6O+mhk85RNtivKu+lMFRY6NkG3CXYpeOuMY9IlatUp3r7sHm3PPzsCOITdgria0rynIUyQyW9Nz0Bm0CI3oxhl7/Elq2zcsJ88VE38jeFemJeSDAOML8d97s9EZ7W2irXiakxGGgoBQx421YJKJ+JzntNUsvP3Rq+mRAATGPTKTLqnv1w= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fd33997-76d5-4b89-95b4-08dc5f5df004 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:44.4920 (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: aNrVRJNULx3sc7DC800S99zMCdy3rocBUXdMRXSUmMyGKd48SPXsW3luvli6OrePF+FRjttUZx2Tk8TKbK3fw1t90sWgEYNmC3dO1reyJwygIvHSeJfYwKEKenbcUUxS X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 30 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 8 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 34 +++--- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 8 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 8 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 8 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- .../mediatek/mt8183/mt8183-da7219-max98357.c | 40 +++---- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 40 +++---- sound/soc/mediatek/mt8186/mt8186-mt6366.c | 108 +++++++++--------- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 60 +++++----- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 86 +++++++------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 62 +++++----- sound/soc/samsung/odroid.c | 10 +- 15 files changed, 263 insertions(+), 263 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 1262e8a1bc9a..b447c7d6b85b 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(fe_bt_in), }, /* BE */ @@ -269,8 +269,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = { @@ -279,8 +279,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = { @@ -289,8 +289,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = { @@ -299,15 +299,15 @@ 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, + .playback_assertion = 1, + .capture_assertion = 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, + .playback_assertion = 1, + .capture_assertion = 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 8a6643bfe830..c7863f11aa1b 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -86,8 +86,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 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 784c201b8fd4..eb22796e144f 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture_mono_1), }, { @@ -141,8 +141,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -152,8 +152,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_speech), }, @@ -161,24 +161,24 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 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 6982e833421d..14a98351ed0c 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -65,8 +65,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 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 0557a287c641..8da014cbdf98 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -123,8 +123,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 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 4ed06c269065..4abaa13b39a1 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -159,8 +159,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 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 763067c21153..747d9d10bd9c 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, @@ -200,14 +200,14 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 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 466f176f8e94..5b185420e0aa 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, /* Back End DAI links */ @@ -238,14 +238,14 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 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 acaf81fd6c9b..f928dec23bad 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -492,38 +492,38 @@ 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_assertion = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -532,7 +532,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -541,7 +541,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops, @@ -551,13 +551,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -570,7 +570,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_assertion = 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 bb6df056a878..bcfc88551fb2 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, { @@ -513,31 +513,31 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -545,7 +545,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -554,7 +554,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -564,13 +564,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, .init = &mt8183_bt_init, @@ -582,7 +582,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_assertion = 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 8fd31c52b077..938d440bc187 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -813,8 +813,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -824,8 +824,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_fm), }, @@ -835,8 +835,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src1), }, @@ -846,8 +846,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_bargein), }, @@ -857,7 +857,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_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio), }, @@ -867,8 +867,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_aaudio), }, @@ -876,8 +876,8 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, .init = primary_codec_init, SND_SOC_DAILINK_REG(adda), @@ -888,7 +888,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_assertion = 1, .ignore_suspend = 1, .init = mt8186_mt6366_rt1019_rt5682s_hdmi_init, SND_SOC_DAILINK_REG(i2s3), @@ -896,7 +896,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .ops = &mt8186_rt5682s_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -904,7 +904,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .init = mt8186_headset_codec_init, SND_SOC_DAILINK_REG(i2s1), @@ -912,46 +912,46 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(i2s2), }, { .name = "HW Gain 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain1), }, { .name = "HW Gain 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain2), }, { .name = "HW_SRC_1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src1), }, { .name = "HW_SRC_2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src2), }, { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, @@ -960,15 +960,15 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "TDM IN", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(tdm_in), }, @@ -976,35 +976,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Hostless_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul1), }, { .name = "Hostless_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul2), }, { .name = "Hostless_UL3", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul3), }, { .name = "Hostless_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul5), }, { .name = "Hostless_UL6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul6), }, @@ -1012,25 +1012,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "AFE_SOF_DL1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL1), }, { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, { .name = "AFE_SOF_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL1), }, { .name = "AFE_SOF_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 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 f629fc6bbb53..6fe3c04ebdf7 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -923,7 +923,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -937,7 +937,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -951,7 +951,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -965,7 +965,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(playback7), }, [DAI_LINK_DL8_FE] = { @@ -976,7 +976,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(playback8), }, [DAI_LINK_DL10_FE] = { @@ -987,7 +987,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(playback10), }, [DAI_LINK_DL11_FE] = { @@ -998,7 +998,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(playback11), }, [DAI_LINK_UL1_FE] = { @@ -1009,7 +1009,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture1), }, [DAI_LINK_UL2_FE] = { @@ -1020,7 +1020,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture2), }, [DAI_LINK_UL3_FE] = { @@ -1031,7 +1031,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture3), }, [DAI_LINK_UL4_FE] = { @@ -1042,7 +1042,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1056,7 +1056,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1070,7 +1070,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture6), }, [DAI_LINK_UL8_FE] = { @@ -1081,7 +1081,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture8), }, [DAI_LINK_UL9_FE] = { @@ -1092,7 +1092,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture9), }, [DAI_LINK_UL10_FE] = { @@ -1103,14 +1103,14 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(capture10), }, /* BE */ [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(dl_src), }, [DAI_LINK_DPTX_BE] = { @@ -1118,7 +1118,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_assertion = 1, SND_SOC_DAILINK_REG(dptx), }, [DAI_LINK_ETDM1_IN_BE] = { @@ -1127,7 +1127,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_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(etdm1_in), }, @@ -1137,7 +1137,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_assertion = 1, SND_SOC_DAILINK_REG(etdm2_in), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -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_CBC_CFC, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(etdm1_out), }, [DAI_LINK_ETDM2_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_assertion = 1, SND_SOC_DAILINK_REG(etdm2_out), }, [DAI_LINK_ETDM3_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_assertion = 1, SND_SOC_DAILINK_REG(etdm3_out), }, [DAI_LINK_PCM1_BE] = { @@ -1173,14 +1173,14 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(pcm1), }, [DAI_LINK_UL_SRC_BE] = { .name = "UL_SRC_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(ul_src), }, @@ -1188,28 +1188,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_assertion = 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_assertion = 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_assertion = 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_assertion = 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 8b323fb19925..6ef5d0e9c015 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, SND_SOC_DAILINK_REG(capture_mono3), }, { @@ -790,15 +790,15 @@ 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_assertion = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* Back End DAI links */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, .init = mt8192_mt6359_init, SND_SOC_DAILINK_REG(primary_codec), @@ -806,29 +806,29 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "Primary Codec CH34", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec_ch34), }, { .name = "AP_DMIC", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic), }, { .name = "AP_DMIC_CH34", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic_ch34), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s0), @@ -836,7 +836,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s1), @@ -844,7 +844,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -852,7 +852,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s3), @@ -860,7 +860,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s5), @@ -868,7 +868,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s6), @@ -876,7 +876,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S7", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s7), @@ -884,7 +884,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S8", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, .init = mt8192_rt5682_init, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, @@ -894,7 +894,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S9", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s9), @@ -903,23 +903,23 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, @@ -929,7 +929,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_assertion = 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 62e4e34cffbb..c9f4a2d5c52d 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -912,7 +912,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL2_FE), }, @@ -924,7 +924,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL3_FE), }, @@ -936,7 +936,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL6_FE), }, @@ -948,7 +948,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, SND_SOC_DAILINK_REG(DL7_FE), }, [DAI_LINK_DL8_FE] = { @@ -959,7 +959,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL8_FE), }, @@ -971,7 +971,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mt8195_hdmitx_dptx_playback_ops, SND_SOC_DAILINK_REG(DL10_FE), }, @@ -983,7 +983,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL11_FE), }, @@ -995,7 +995,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(UL1_FE), }, [DAI_LINK_UL2_FE] = { @@ -1006,7 +1006,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL2_FE), }, @@ -1018,7 +1018,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL3_FE), }, @@ -1030,7 +1030,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL4_FE), }, @@ -1042,7 +1042,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL5_FE), }, @@ -1054,7 +1054,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(UL6_FE), }, [DAI_LINK_UL8_FE] = { @@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL8_FE), }, @@ -1077,7 +1077,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL9_FE), }, @@ -1089,7 +1089,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL10_FE), }, @@ -1097,13 +1097,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_assertion = 1, SND_SOC_DAILINK_REG(DL_SRC_BE), }, [DAI_LINK_DPTX_BE] = { .name = "DPTX_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &mt8195_dptx_ops, .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(DPTX_BE), @@ -1114,7 +1114,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_assertion = 1, SND_SOC_DAILINK_REG(ETDM1_IN_BE), }, [DAI_LINK_ETDM2_IN_BE] = { @@ -1123,7 +1123,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_assertion = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_IN_BE), }, @@ -1133,7 +1133,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_assertion = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), }, @@ -1143,7 +1143,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_assertion = 1, SND_SOC_DAILINK_REG(ETDM2_OUT_BE), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1152,7 +1152,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_assertion = 1, SND_SOC_DAILINK_REG(ETDM3_OUT_BE), }, [DAI_LINK_PCM1_BE] = { @@ -1161,48 +1161,48 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(PCM1_BE), }, [DAI_LINK_UL_SRC1_BE] = { .name = "UL_SRC1_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(UL_SRC1_BE), }, [DAI_LINK_UL_SRC2_BE] = { .name = "UL_SRC2_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_assertion = 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_assertion = 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_assertion = 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_assertion = 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_assertion = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 110ae14dd7ea..35b284897d85 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_assertion = 1, SND_SOC_DAILINK_REG(primary), }, { /* BE <-> CODECs link */ .name = "I2S Mixer", .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_assertion = 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_assertion = 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].capture_assertion = 1; + card->dai_link[1].capture_assertion = 1; } priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); From patchwork Thu Apr 18 04:13:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634113 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2081.outbound.protection.outlook.com [40.107.113.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E77254679; Thu, 18 Apr 2024 04:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413636; cv=fail; b=rt857NWIXc3RsvrBTb3SbU1DaBXAjeHZO2e+HqkmRkbR/A6jvIMQV1j7R38YUhMyBaT46Vl0qugM21zUz/E2MWtlacW31on5J8WDL1QK9hBNKfkLPM3XgC2fHbP0mDPEED/cG6Mv6MZF1PidaephNZrgw88zbGML876I6RF0vBg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413636; c=relaxed/simple; bh=gZqf9EppjTHPP4Ow84DWp/oDn9+B9H3x9KrdENjiYkk=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=JaKjIw811k55oIlVjR6GsI4eaWoNoDY1IYko8ktwu2hPBSlUoiXEC8ZEgY41vbuM04tryKPcV9fSh0W04aySe0fVw/IlAS8G1xJF4Fboh2z1sjXhVujEeIZjZmDcEgnyftGq7oCrqWUqDm4NliYHhJ469DtB0G6wGFDO4u1i4i4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=BQFUmqLW; arc=fail smtp.client-ip=40.107.113.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="BQFUmqLW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VaJhYpuKvqucyIZbrekoVlhzUlDpXxW27ZkcXjplxkb3e8zHSCXhBE9xdSwmjd/T/4HnXbhc6nDnVvHXN1haXyxI/eFgHWhtNykxOtYIXmnl7usCjKBTvs+MzvR1r06wyP4RfsAQ51J7eeAaRi2nvulCtv0scqxt+tCjoVlhsr5/VVHj3tmS2aC6l9DOzaZf96OmmGc/WScFzDvld1tzkx56pdhRoDvk936AmhQWjogNmCREBsT705RmPhBFNi6CENOQW/rsaPG4g89ZKvgiuYraPYcLAE7IsjlGiiyZPx3Ohwwfm3XUS5WJU9xHab7oQ67lT3oF0ThF6b3G+sNwag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uoEicjAS+10uz/hOXN9BxUnocEqrLZpA78+Om/TJ28s=; b=G4rvKgilYGnkiHGvIucf6P1cFAqOdxvtWNW+YqLv8A9/9+aFjOLtO/fR4+aqGrJU+bsTY2U+T8Ge9kRoMfj31g2etvwu5ItV+n9j7PcM7Fqxekm55r5yttZlU1rk3HAgF7y00OyxEo5yZni26dlrA5eY0cOjjx2ZV1jmUkvxPG9Hhf9UNI3Q9oSwu6OxmkuDHUuSTXDFDeDNkOdpbuMc9X366o65BYv0spIzM6nTm1A5gK0YpaYaV9jEVVVOYACI2qsnoGo9qjyWvGbuqzl2HN61H+WL/GdglYXGhpYK2helDpjUmt6/FdU7Uz+Ar5NUytL+H5Cp0ckckKkfZMeW1g== 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=uoEicjAS+10uz/hOXN9BxUnocEqrLZpA78+Om/TJ28s=; b=BQFUmqLWDdD5xf5lJeePjvHZMCd9KUYZNWpREaUJPlliePwjEfoypb3u/Wv9FjqoccMq2M5MMlwA9/XarUJRkktsPlnkSf9UlI7MGjT6KGYz+AhwaKx6cuy6dbmrRF0/x6iHDX5ZmXxdz8Y6vSLSlTmUPtEroQLoA+xnFmQkt6U= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:13:52 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:13:52 +0000 Message-ID: <8734rj8fzz.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 10/23] ASoC: soc-core: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:13:52 +0000 X-ClientProxiedBy: TYCP286CA0108.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::14) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a4f9140-7cdc-41ab-992f-08dc5f5df509 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XIs5A3tEtUygxGXd1n3gJP8rHLKmnHwl+7inFUZqCvkHwHd/klgFtei8O0ELUCK8uA+VbzBJK5RqeRBU4ubCrSXro0dzV4nVVXOLi4nhkjcZLPHp8CLbBnW1qeFyK22eHiNvNUBNUZL4hGtOdKNG5LMYB+gjt9C4gmKykBeamxx5ZAjGwGSvYG783RISu6udBNyuJBLZxrwG+0QdSUEuOvHqIrZ80rEcrdD3aWamoYnC3mpLgNBw1XU+1gcucjq4wHTl6cHzFMHjkCLCHG53NHb/R2qgROaO2mRW1D29knuro8RGfXmta1qW3Njn1NXihn5iuMOjLemzbf7UUOmw8zVKfGTJF/FFR9QCwQT2Kz+beBgoiwKluNXBBARkTXPv+otnNuTGHjqP0sCj/Bw2GpWG0kH/HHOwX5nVj7yrUhs97vqpc7iu9LeHo7YaTZowwcoTsrdGUSsNVdRo8QzpRil86x7C4An6E91iHLbrd77oj+sP4z+iO7uTsXCPbzb3kd3Lqg5ZItGbl1v8r/BRcJJf5JP9Xoz1Ke65s0FYVAY+FvIvIaHRHAUcbCd0LGCGGMVtY8lD1crSm71X07qrXtyqB100fow/TvkhtRG/xy3zjcQlFF9gheJfcu4iTbayiexmmxleGkcFS3gNxPFvxD9BdCeaaXacXzB8DjND8pP0DHpCLoXcvg26ny87FwXXAjVft2zhZY4LhbLNuufeob6t7RMsA0abeNcjIzUAPxg= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yE+uQn0F4v0X0Q22MSO3eg5MeMkyA9WxU3UiRvyygl/CXVjcbwcr/oaTIvkndrz4D7Llwe4rY0Bm0kPcmvWzTmUPaL5AQgeAOmuGTlU09DKQnniNvL5grCWqqJ7fR6L3Kt8WEvxjNA5UaRPgPt2oOYKlCQHK3EK+g85mo7SEzH3AstnLh2VtjBvE5S+8z61v7sGH91WgCLZV3m/PAHdzJGbHJAw6888mlYab5uRsmTzPDQh6WUWa1q9eyDl7PAM8bRked36Er10paMkV7ePNcNbrS5xl4ifs7w7B4/i1eGORZyF1aamn2sLu70CPoFIRSPlxlRlviBKNWFE3QgvUx1u38ofi23VPghYNt0dFrW/i8W9HB0JmGw1bzO7S8S1clF+guqd2xngn0tCpJYCfnwBXQA0o9LuWijovNIeUMrTZ/DO53GpRn4wQPTGvz2ccuJP9NLUeBfmWQJxl/WG1MAA4xiyJTQ+WXcsxZ9m4Ssq0+mKG4w0PsJOUsg0xxMN5gquhXZLGlfmYhBSxN0+tGx9Vvgkl4qb02s8bM0xkNcYPxdrirWJWnw1FwyS4hpoD96Sr+I9kVL1lt3+YYrXelLGu21n40wsl7sexZrpTUvKI0XV3wcLA+vtiZ8LpAj35WJOJRiESqlSq4BjNwQrulssiyc7iWqthSaEMKBvjfWSy0s7/GuaCf1RCI5DQ/nsM6ysr3ffcVSxDCDlNx9sfIevrFf2E37N9CJNFszl1GWOGv14Cx+xfDP/JsrNsdF2ANKzQJlzBuecqdLa2K3U9oJu1W5wnUJc9tipvFenEni7b+vIk50uDEA7TtIlYfJ913jpIAH7sTFr/9mlzpmxACufdxhgOh5pHKDcJGWyjS5dfxy5NL8/uHFMFKzzfGZ+VFq4sxYSdAxyNKb0v15a31DZcx4B6c2ZeqtmFSUddJDo0GcWpqkZC5D1/tkUeZDfGZEMV1C6EPauA2IWiZm6AGV+dCvlX7O4R27ZqUKfyP3FUEABCdZ+/yoHCnHVZOZxoPPJoRi7H1OA0/0OxLoVjUNOmusVP8reltGekxtzHrzO+UuPC68/uRp36aPuTYTlMIWwWiADTHHmDFXMBBXOZMkYLBbsemh6pZgvGTwRsSIS8ogYJeekwYA6AS7faynSAdi/pmkuRI5qpA83q0oXalN2TPhQFSbFolKsvEXbLrTxDVDM57QTzDTfeaP00/myTR2K2WuhZVGJ4lL4uFGsRpVnPHI0TWn8ZWFBYA0vm9deejPEqZxsK4MbH1lewiXtUfkTd36jtfeUWeoj9diwS8o6wuug/5ai0y0JcV31krUT7LyeOnKODLaRbs5GGOlxQE3v+YVycmH3bF47QmpfXyrpckLY+htArke/cveSKovbaFTOpgwj9B7HGxN/O1/ALhfx6OGFnyhCN5FJJ/H370C8k2lzQmGlKBUVNmNdr4oYyjZ+DkTN1iHu6Oudb3whJFNVYe/NZ3LoX3o+QDJYF3ZtalKWct2192taayu357YMhmwvjc+ZGbvdDwPNnR14fqvlqs7WkZ0iuEhepbFHzIhe2vQbWORdE3Qh5KzTLQwBlVBMNUUzAX3odG8INGZBXuq3hqI+afqHrp5cAPlK8lGdv7WWoCmIUf9T+daRqkQQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a4f9140-7cdc-41ab-992f-08dc5f5df509 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:13:52.8319 (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: 60a+B9/i9PsQ7JRYNDMSfH7Zgnvp5JzsO4EuKoCRNgSJCeqbzIE5eHl9E3OPz81kiOMC9mELbOHM4QfCoY8xBzP4GdKqNxaDH+tbyIsszjRdNzQBwdeDGwK0ly+lVc3F X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3ab6626ad680..6667f34e875a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2003,20 +2003,20 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) if (!dai_link->no_pcm) { dai_link->no_pcm = 1; - if (dai_link->dpcm_playback) + if (dai_link->playback_assertion) dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n", + "invalid configuration, dailink %s has flags no_pcm=0 and playback_assertion=1\n", dai_link->name); - if (dai_link->dpcm_capture) + if (dai_link->capture_assertion) dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n", + "invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n", dai_link->name); /* convert normal link into DPCM one */ - if (!(dai_link->dpcm_playback || - dai_link->dpcm_capture)) { - dai_link->dpcm_playback = !dai_link->capture_only; - dai_link->dpcm_capture = !dai_link->playback_only; + if (!(dai_link->playback_assertion || + dai_link->capture_assertion)) { + dai_link->playback_assertion = !dai_link->capture_only; + dai_link->capture_assertion = !dai_link->playback_only; } } From patchwork Thu Apr 18 04:14:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634114 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2064.outbound.protection.outlook.com [40.107.113.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A88EF4F8A0; Thu, 18 Apr 2024 04:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413646; cv=fail; b=rYdw0Fs1kyEnmdfWQupEON1djaYzhnDvxAIW4LoQorG4iTl2EYOH88Xw4Yj3tKANPnBRJzLbLVQe1ARd/eLNK7T8KrXAGWzmotFrU2oZFsSU2bi4YV5vNGsxUAYyuZrxdJssZ7/EOAZD9GD+8YU5j5q6eSn16hDj3ysGprVF4UA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413646; c=relaxed/simple; bh=1U4CWtBNm6EsGD94I847rm0io13JlUXTmWY9gWAeNVY=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=ez2r4k7g3z3dKtK/FFAyG49MnlLqdiwGjJoiWk02LIdQYXyRn/hwqbQxt5T8UtrHbkTdGANww1kuNPbPVtyYARBrm5SoHo2Swoh446QnSwk+e5Pru2+d39S5BWgIrn4/peXGNDYk8rGVnWvS/K77+EqVNCN/pACQMmv6Yrhc6ZA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=QBl/bVWT; arc=fail smtp.client-ip=40.107.113.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="QBl/bVWT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hIxU+qc5olPuhyQjo1s6FmMQqPFLmvFa3+J16wFURkk6prFPrud7lncjBvh22On/RVkH1zen+vrCiJdQjBLpATYGEiNuoLZVumwEgLM6CyKXCfRmrcOjtA9muwb9gYo4hKVPg0M4M2wknTJrmL6GVxAnUJDfRnMERTckHxmYHZ6uKSIKYq4QYgaTEohgb3lDumubO3IIoWbe0Ghdxgfe8AWKL1Y1WZ3mjb9jwYXGOpVjayQlVc85E01JTr+Oq/utQzCTC9bAjEd1iq+AjZAPVVSw5CzFnGFTTektXrAYO4NhCh8nySEjbZ6AMwvsNV3NFurXNoFAwPUKk4+I/PBd7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VO8PmWflB0Bcz6lVvxi0M6iYvJlB+g0FNV9m9DkwxGE=; b=asM2AEXMpGU/f7uxoNGNv0BRHiy0HQKn2O5BGCPpCOEKi980ObrEoLTbaUA/f18jWHaEQLxDobH+F4nDfnuhz1BtD4rVdOszwHdp+bPI+FdZQsEtv2rbAugvIKBU0ExelLkmLZZH4bO+Da8JWm+8Kni7qAKllOTn6tJZrFB/v/M+nB52mDb7sahkinySILrbU9v0SYO3yXAVfx1C4xaKPKQdRBUaq5k58nvGK2p/5ukVDcI7KzI3Rn307ZbZBbc/NLD3tHqCxzSMBJheoqwZbz9zpOerfVCeP2dCxtlwbm6BU954/xuUJZaI5xL4ATJ8TBybffR6b7JoLlqg8Xhklg== 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=VO8PmWflB0Bcz6lVvxi0M6iYvJlB+g0FNV9m9DkwxGE=; b=QBl/bVWTDuMgkKkqymCqTWjDYE+8DY9efjgXPpV9GwBaK+9l15K+61UKJdYUj/BjHiFBqCAmDOFEGvkj1L1tFn88H3dIyhS/fyEIUhjWxNCyA6maDEpjOkAUnKkI/SoK3F9jG8zn/r6l7wklNHuHBzhHV3M93d3bcYIy461I8eg= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:01 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:01 +0000 Message-ID: <871q738fzq.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 11/23] ASoC: soc-topology: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:01 +0000 X-ClientProxiedBy: TYCPR01CA0205.jpnprd01.prod.outlook.com (2603:1096:405:7a::6) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 35ae6a11-c506-483a-a0bb-08dc5f5dfa4e X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SXtwwyHFFD1vOYBZ+ebxM7/KOO4oTt26v5/dFImI+ntd1CqmAhWP49sJNKeRkdJulAqcLYa+814LyQDNTzhN3zEixyfkw4lCdtw4VcajjfZGfdiJ4vmDi4PgIpiWTnT2ZLPvSJxcG4uz7esOpBruTJLuFX/ucGM+POySEyGBSOaa4CaouEmTmHKsWp+2Jnb/KT3PAUA2dZ2AfY8zk9ckFWCHORpYAHcaY7QRJkp78oSYJvW+2+39H2DDkvL/UbQrRIti58duRZeboE95jfnVfgN91aqTzwQm1UKzy8j68J9a89fDWtnlgoqv+0AUYUFWKrInKI3vMnLNcn4FA/lQrAv1+sivag3UcNodl6zJkQKqylMI88vJCaO59ggfSDjdv90xTF5OwC92yAG3lpyB23zV7JkXMgldPXE6TnFPissT7pnl9VGF8Wjx+ZU1Vsv3OwcR/5i6w2z9Z0umHmWeSSXMGevcK8GKes7HvcVd0+W782lkt9pyk9mOMepGG+HGAxWYJcb02pkwhpMvob3htpRx89VYGsLkDlt+pGCIn5YkWbAbmzpzA8PX9HvTanfWdI5I9cX4qj9CeDcF7e5H1zBkQOFzoFjgoMZPlTNhJmLMK32OTP76W2S4FWFaF9CHNvYuTDPSLBpKMZtdn/R042prGJ98K18H9ltztzTcUzxIOosIWpXIMczPUaFm/IOHqDLbU9X+tigcVXpmi2+GhtEzfVOmjfhkf9BDJiZ2iR0= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w93jOkYvg5HlX9Rwo2wrURmybFmqFF2DjU3sNojTO23WeEafPavA/Oq1qL2ymcuhpWJWcZ5dzVUFiTeHhNTgmTkJaxUUVHBd/WqQKDTLbtqi4Fi8bCNBu2YtcJ0WOHc1sBY6sYnRCjzikFO0TnH0SWWsDalC45LbhDpN9tGckGee3nMUkwQwtYY4cwCIXR9rAvRuQK/4/oFwdKM6MKNV2hX6N4edHlyKJE2Ab1GjS3pcyCfF7UryEcV3nWceTskrxTXF7ltg3lp/ojdD++7VPLen+WYVs5fc7dTUSCPxhKzk2OSgbtkcvYHUoAm0VMpqbHGK0hRZI7FMnViENOmFRrbCYo0xAlh2XmwLOaiqdm20/Inyhs1nSpv0HnjCvex52//pKMmQx7YxXJe7uLKffJfyI1ATpHd0uSXvu1oXF4Uv9Zc4wFix56Knrtyd2PnUgbLBMOTFkCmdh6UnGcKc8EqDLgLc94G23O3BQkeNbC8xfkQL7HjDtknSomzEIGR/iXavRgD979pG33K8WTGxGjIXZleyosQswJcX2MaadJ28Rm7psn5z7vusiNph7k6MKdSZLLtm/kf7abR3h1+KQc81E5dBNMxX4v6K3TTaxkFBnoPMAZcz0TVWsXU64KhkttIOGiVty5TcahrLV0VnstPSy8tXDHC+nUCH5F1xKTeXDEomcPI3uK7JpngWL6+yRLA8CXqsP+qZTVg1VEAn225sXoxasYhCdeziTgoWfZUU0pdPYoutaWwN3Kugx51djDMxWvqoBSusHfA5AwNjZ0z420VtddCktWZcMLHJn3vrJwCOj+vXu0e3LO7qXJ2+7/vdPIJ4GMsUtsJjW5daM5h6BNf6gn0Z2mdyIEtyKhJD10Th8jkiFUEq85fWDyoppc1EXkubQPFeLbwvx0+6S5iqSsp6b6ypRmHq+5kP2tSkWGIvG4zFyFXdoiWg3xAvVdvprLqwC8mk6eB/tAZ6/siJA5AsP7nL9pEmC5Xn8T8e91lMPG8K/EjJxocYi1DnRFWUgSGHNGEmzRgIfzby+shVVYcE/6hM7PRA3c1Qx4c6AcmTwdBHAFslBqW7ataeqorNiabeHt7uMsut2JPS+4tOR/S7OWyqh+TxOzbdNGb/Uk3ffXaM+tCL9jfC5iiadW+3atqsYi0NPUovjyD/GdSU9SXuOiPZEtn8CxAcbCLMQR3Xiq38lbycWFEoXdnuHXYL5MICZbujyptXpJXjIf/MI+scHL3R2HDj3mcnKwBnGHFbnxshd3ELYlvKFfXrcDcaewJeHqKoRIGONh8vlOqMY+Bo7oUQ8ni67WA8AP6E2rb5ciF2oCvoey9wNRj1WBMGMbuYZhDbm1cfieCBtzo5kVlmn0tCsLot8IhkBrQ9TiaB+PYYPch3vBqZMW9xGgaDYpQGDKIO3Gxg/Lfn6jMAx0fRxJfrKn7mn/JfA/gHXK8tqUlc4hYPubJ8fwwuXRhh0TZRouvciCqZKo7cA+iQo0FYIlMkJTAtZqdPfLU0PKopMz6LayJhS6n8orSo2fS/MkssJ7ctcflkEVmQTZsfQOWbUGDtuxGpRjTRqK1sin5lw/Tfd5SAqeQSiIwnkkCCkTUXgoyHd1TNFJOVJn2qW3WXxTGA8RDNiegk7No= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35ae6a11-c506-483a-a0bb-08dc5f5dfa4e X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:01.7147 (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: 1q1m5EujjQrVyLRuieDk4JGs7AAX80cQpIUlyGgSXXiNLiyC7rlEfF4FaJopxkVGFGfyHJ5uqC6p9Yt6ppIY8dh/U7VFrUX2FwwzwRgv4F3JAEk+tU19c7Ahnk2y5Zsp X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology-test.c | 4 ++-- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index 70cbccc42a42..2740576cdf24 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -88,8 +88,8 @@ 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, + .playback_assertion = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 90ca37e008b3..7d356765d25f 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1727,8 +1727,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_assertion = le32_to_cpu(pcm->playback); + link->capture_assertion = le32_to_cpu(pcm->capture); if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask), From patchwork Thu Apr 18 04: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: 13634115 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2075.outbound.protection.outlook.com [40.107.113.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47F1F54679; Thu, 18 Apr 2024 04:14:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413658; cv=fail; b=PPvFIvwFVbk2AaORT0q/c1/bWGqsIgY9745XkaKhDGAlQWAx3Dh92Ygd3NG2hHPGjQRRTGr3eFbQbMW6BAHI26V76PV0gOurI1kuen3U4uHUFfnsgNrrn3VbpL/2/RdnKrQfg68ZpjxhTAHw8BNYL/yig3Fqy4EWfYQWmmOLu18= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413658; c=relaxed/simple; bh=93zGtpBHa207Ijy7uSdU7+d6fx8AEOISx8TYwaPaswQ=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=G4QfETKzN+dIdaDez6FG8turP6e3xzUb0aac5r7mYNIdAYQyFUS3AuW/5oytTHsUaYY/9SH+EwUAEkurxvAw3CMpAu6Y0/4qt+yZ8+l9J7DRpEeIbqz8KFIX67+KrgdBoJS66DPWYmZZuYyD9zc8E4ac0v3epB0XXt0Gzsb9P0o= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=P19UObev; arc=fail smtp.client-ip=40.107.113.75 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="P19UObev" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Use11NmyVKk5IYCx/y6ttl8FRcumxTLTfdYirJbVkIJ4TrKksHHVJNFQbtX8CIuOMp2KnYLQQ61JTYIhCv5COmp81oqGqT6s+6YcLeyCvqfekFHngh2M7ZG0z0aM3jfMGJYHRq74bd8SwV/bmHHUbyo3fmwY8Lt+/u1LI5MJhRv4MfwmEnLwoyJAcicqh2TCoURGeXaR18XeQekjIx9CPuxE9m91mw8F1YNppE97hAXOdryKeZ6l/AfSQ5ZChZN66UI8Gl6cxTMR+6GVUYxfafq6HId9ae0jz3OPEKDg0lcLDXICd0C0sm6PNf8snI+mTyYgUzdwWmwwOCLKpQ59PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a0dOwLQbiWSj/npH2cmb+Ck7k/lzeXjY0mNBmAUWL3o=; b=b3yfHrV8Mk+GZFH7FrLRHTnLkTmnMTi/w03wG6LZ79vK6tQLhL8fZnWCqJmRMDAZGEoJrI12AnoLDLGiFAMp9m8jXczonVjCAoEFn/wUIa8numAf+6vDksPEUtwZARnVmzm7UpnY2RBcJEP7kAL8Eqn857pYdH64JNoBjtdTtenG6mQDRh+N7OILen6aGSCjluTqcZ0whwH6c+A0YuWSH1VDILjSnf/etDTqRKEJmswBpHg6VlgNkz+kI93jrYu1DJIwRWaZUkuRmoKYpWPJbHe8qjXjErt8mndHtEmqMDH6warR4DrLfbYhv9r7M6qLeVBolRX6KXD19wH4vH90bA== 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=a0dOwLQbiWSj/npH2cmb+Ck7k/lzeXjY0mNBmAUWL3o=; b=P19UObevhac28JXQxObwJCTVBoN/xX+1Pz5UwzRWxKGBHlvJLA27olE6bOzGeHiyzo2u+JbNLjcI4M8XgDLC7e/uLKQBRrFZh70vKvIiGR4BA/gW6pWG3hERs87k0NQH+eVtLoTzeFuQiBbfKgIzegSieqGr6832yacnddglioU= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:14 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:14 +0000 Message-ID: <87zftr71ey.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 12/23] ASoC: soc-compress: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:13 +0000 X-ClientProxiedBy: TYCP286CA0008.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::15) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: be1e9416-f0a9-4c64-ebe8-08dc5f5e01b9 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MHxJ6K0EzT4BhP5yqG83VjekTQ3K5FKU0/k+MJzCeaEs/iQPOw+/7iY5pG/aWjUHa8K2cwbgHaKGU53QoeMhFlvYXrc+gO7OGXnugksrHgOE2L/JwoVehpXiF4Hrh5Mm4ZEq8l2y5hliYJPgFqHqalWnprmPeulB1/qiLpQCp9uYO3MdsLtxj9JCNNk24lAHlERpi6CqYQGZlsr/Bn+0H/ie8dDu9Rd3TeXXjHaS0OmIvwVpE8x3a++f5XXLTa8Gn4RF9ZrJce8pwKit4z81pkGjlyxfEhpiRau8mTanhB+8exR37+S+J1kqDSBZw6rU22pRm8t6ljnGxeQjZxa1foik3dMxCWJnNkZR5RfmwwOiLqn7XoBUWG6o9C3CPb6ombwRvAyZ0iH1gCi3EHeFyz/xBLGiQqMa/coNNpWEs9IkZ+7dZS+aelutZtnqPyygRRarujoaih1rY2+1MdVtZuj8//yzA5JlvavO3rdTZwujsJ2QQPlPcNZLWI2g2jv89keHh6+ZNg8w1/L3NKY0C2dYKceYr0uXcniYdZdUG01EYca4MC3KlrVvsyGCeuZFYpzsNWVSSEtKvZUeeMABi5JsMpfIRv7Rfco6EbmhXzTZNZbDFkpsPNvuOSyTxTo2PfXVioJjdhNdfjFd1wYVR+ckTjKxiYl/oZx57wurdGlUvRmC9uvzsyZHoaUi7EqjeWwpMhdJ5dmI9NQB5XCwxzeomYSrHnC+a0YqDWApLRA= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J5gnfMWCKXiXbo0+2ztBwCX73Vj+VSKTE37jynKhlCfK8Gsy0PdEBpJv18+HNPXEUYE2g4Bu8qLOGR2D2III3Qf3QZRJEekruRcP/jfgK4epb4i3M1io1jHPxZbtJmWhIqdos0tFP5vO+wg9+BvI6RQ8NnmdLQQqP3obKZKAGmr05mLJF12H3NSxqLSxedxeEnpOHzqGTMlK6VJ0Rn63HJ9q3kMqxw9q9anNKC8yWtnOhrOAt2OTNT2HaPmzjxOhM7jKPU+/yqNuX0yQiLTPOVFKuRbReKx/GMhzW4AdTHEL7HVU6NIRJ+orEYmqMNRuLlebZx7tbmRqUIn9E54QEdPO9b8o/cn+G6xqcidkY4hn5uNf6Gkow3C/UU+OE7S7oIPpxNBbxp4+qvTC72PzFsFKYSmId0kdBu7ZjX+BzkgxVvOIqoVnX0GCBHt8Hrfsoh8aCuqOq5iOtQEASiqJ+JuaAjm+iq7lb8/LCajDP8DL+dfJfvBO9P9H6N6DvBPQSkjaDOeXvlJlidjR5JeEhHC3v+sZ0PzW9ukBmnfyGtLsCodoJ1B9pKlFZiLwHJIG1Wi4OVPCt3eaOC75YKUQOeG23lby146bzA3XWVgjW8vyLmpmldLPiAiR5fmms3eDCGGaN8EeZBPEt01v4E8m3qjHkl1YfXRCDyy2VA7kIGhVMXQV9IcDeiXfITI38RYfaHEihvcBR+QygCagHz/DFxMfPtRWSSVlzNscjEZvDYIryX994Vav1FBhiBibA906q+RjuAsJA1yirvsijfwDG5G3Q2WQikjUrqRzwq6RxPmJ5BZCdPkCOe+8jPW3IxQyJQIfZs/SmjyvlNfw42sEp62ASjiUb3Yylr0debYGwLmSd4yBo9gTAPqr5OSxochIhar17Ik6rApMKUmTGsh+jBoPYCkLpOlCbPhjHDBv295I3ryaP9fvX7IdV5eBaDGxxIH8rmGY5YMaXtB4xE4ZASdd8riSoNGC6DD6er54hm8OEwlgLVVPYpSGsw7H3wlI+H/1g5Q4PwfWvcjvymh3ETPNlGCfxyvw8jZdiWb+nbOrIdCbgll94lS8hdCqyJFt3D3SEQIkTchNtRw6ov4fFyC3DH8jVpS9hu6oaWPa+o74iZrnCXVW6+uYttBFZaql5yFEmFb0cnrFt0geJTrFr7Noy/zmXlNI+kIehOodSS8FxCgpmQX6MCP6gQSs72eXntAyFmfl5aRbrrtcF2XZ7jz6jmPMZRRFp9dUMGSYUL9kWzJJO0tfEUTCV34p534Ynkuxm8xMBbNdfGXo/Ro21+b/FhghVT+agX0DBWE3zg01goB+K0OJ9Z1BqPH5xtvBdLbY+eoj6mOZlifDMkk4Y6EBUw+5eoE9oKqg6C5ogtQkffFAGnUtN3KA7Hj8gZcdUeeL2aRFg6GKRsxbZs2SSvUQY2jdvvzopMxbEA4qzLFYohr/ArrRxBzMVu+G7bmQvSTIHFbtcMRK6C/XlTqze9ijuuEqqy7TVjVpXoKClsmgXXqHykc4RY8RwdamSsY49MQPUJkoG4O5RMTW5xxHk3jCA2kEo7LKcZ4iPATbGm+EVz7Ec16ffeboHVIUJ+WxmVsuCAbudkAGFS1PNe3Miow+3kLmK1Fjjlxkm8iLUII= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: be1e9416-f0a9-4c64-ebe8-08dc5f5e01b9 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:14.1335 (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: gPDBqitxHKGC1xhq8oRZypTI7xgwhBKiJxF327HoCD7mEiZa18UwdTpngqRhvBtNQS3Y+Nc8ez1Ypg3ycAljPEZPLPlYi/HdaJs/O9r8YOLnJdfh5FflkCeVdkp4Ytfy X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-compress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index e692aa3b8b22..347189ea30f9 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -610,8 +610,8 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->dai_link->stream_name); ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num, - rtd->dai_link->dpcm_playback, - rtd->dai_link->dpcm_capture, &be_pcm); + rtd->dai_link->playback_assertion, + rtd->dai_link->capture_assertion, &be_pcm); if (ret < 0) { dev_err(rtd->card->dev, "Compress ASoC: can't create compressed for %s: %d\n", @@ -624,9 +624,9 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->pcm = be_pcm; rtd->fe_compr = 1; - if (rtd->dai_link->dpcm_playback) + if (rtd->dai_link->playback_assertion) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; - if (rtd->dai_link->dpcm_capture) + if (rtd->dai_link->capture_assertion) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd; memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops)); } else { From patchwork Thu Apr 18 04:14:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634116 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2074.outbound.protection.outlook.com [40.107.113.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49D3854679; Thu, 18 Apr 2024 04:14:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413667; cv=fail; b=LykYKiyqWncEQDQYKCMKWwZmbZu27Lo/uBM3ippo/En5YEg0frI9UY5pq5fFjU0ck7hs++SfZ+nNzk8koV6PvBmD4+3RqxtaPVQ6SwazUtQAV+NBU43HtwdL9PbB5CUwdbetASW/MLKjZRx4k5xUIECrp0ENiVkjiLRcpLDBit0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413667; c=relaxed/simple; bh=LyhYdDQi2Lh3dQNaIeUZ7JjWYp4mA6SCRaG2g3WQvTA=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=ufZqcNXdM821YvPUwZ2rMAP5GHhSIjI9GAwfYo56mOuElduytduSDrCkt5GuMi26e35gVzXDpQ+bsYKkCF4G8LLaaAxvPU+8U0Afgj9lawIh1clt38+WadWmyB7e5YLAIQpGMlJ5lIQwuhC/GQ3gDiNYdg+hi+CbPf9POC7YUVo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=SLHpdcAH; arc=fail smtp.client-ip=40.107.113.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="SLHpdcAH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mAg2LapxCUKCJZxqOyZHs6YanK7y6gBV6F0fHhrh2VMwzVe9IBW1CzgdzaMvRSqqh9cLAsUyaSyqGqvI/sOhlqjQo7wO5kulq1JkwcTrptrkEbdxTDSvf0wydkHVIp/nFA2/A5edaAphbSJENBcorJI6+cmVJmpZb5+1DcGUAocqMR4QJ9pwdQL2iInQ2lNJgQ32NZ3DCBxahMGNKofH9HF/2Bx92tFQFx6mKz1Aqz1Y/awR00MM06kGPKOStbki7HUcoMQ+cL1VS00c7oFv5HIstfQvjP/B5qTL3C5dbzfnWrexLu4S5uheqfQYNV40P0ByuUFlwa5mqeKUjRUjtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YTcJDyoKEVyp1Q+5yiZ2usCzHFZkG2TZD7VLZgBJ2fo=; b=kNeVwQi4VjHnecqgLYru1roI5v/ucIRFMFxTgXKS3HfiKg0GaElnUFsiEgHos9AxADAJN4/LSGQiza2L53DfJdpEBg/3N6gJvOj1xUN43Le1UkPjJ6QatkqaaRORuiikN3dW3d4ASZtM2LcsVVg1DujFd8jgw4ggyYI+1+svpYPFeQcGre3xUfefLo+RUR7M1o8SXhuABctFSg5dgI5Z4WbR4StBzbos8cFfAz+y7yUcezoWTLn6+3IwbqzewF0V7ukJjXkmE9+bPNOhrapHM0Gxtw4ZZTq1d4fxZc8yfpf2BmtFrzoO2hXOUAjPqzr++i2TlbRKy4bU1AkGLUaEMA== 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=YTcJDyoKEVyp1Q+5yiZ2usCzHFZkG2TZD7VLZgBJ2fo=; b=SLHpdcAHuO2Bzfm0H1CdIptxlEgTu7/kSLWNBxdd7rM3MxcZjFWsfM+/vSEioqlJ8d58UI0V4RUBzg3oYBYCQMYX/Rg0MT8n6Ts6r8oU0XJFps9Ag2hUxW2V9WITl9YO+YICGtExi5b/EEU4B/xkSWkWN0p7zhyoucCHJdJxdLU= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:22 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:22 +0000 Message-ID: <87y19b71eq.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 13/23] ASoC: Intel: avs: boards: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:21 +0000 X-ClientProxiedBy: TYAPR01CA0220.jpnprd01.prod.outlook.com (2603:1096:404:11e::16) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 3196ce8b-c6fc-4695-2d21-08dc5f5e0652 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NflNqLVBMznfhP6YXN/MRTMMuFjfbiPDloylZcpx6WEXFMwS546UjXY9qEoEFAys1XcpgMP8IPr7514CIH7J2tl5GDXmlwcXkFemX5r6UVql4BH9RPBKP88bOQHI4ov+FYpTAnA4OTE5m8+7p8votuTu61nu1iTb7nDDhlj8lD/t7NzzElnosRJxiqw4sg6kjtTg/C5noGCjmfu2jGia6xYF88aDUTtErqWwGoVi0LzV7GfCsjkkyXQ/DJ52pX3Drq9y3PCl+fFuwF+kGZVDMXFXc+UFWpbJnDCEWtFydPGWcFujTriOZGr0/sSu501m3xhA97d/H0wE7HygvUBDFo6NPdqVlClZkPqr/tDvGMCP2jiMlcXJ/AVSKpJV9Xc/RTV/9HRkFPwYO1MYxfAOWrbE8uI3MP6cQDf5NzgtOWJiKX+WYXFE7Fcu/xjpGAk1mT79rDsP3MU5P2nYaBvqzXRseTicp5h5VAfF4H6cO60heakfDcNm3Le/o3j/3sRnn6TU7AzUvY8skXaxDChncLzmnSUfcnWxEm8/dcV+GRKSNiRw8VTPHZF26mxMniHPioUebsy3yT2H3TXs084F3QMb971F/VnFvhA/6ikk7rTMqmsfJY47Sg9/BQ+W9ItixrNm+V/yawf5n+6s3FYNBr8umn9ppLMpEPg0swLm2nN4vnSFk6YZlomlJqYZ0LDSMYSkKQ5awz1tDUdIapijARpun2+5MESckJ10WfmhzWA= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qkPKozcO76eOaniuVMmgePdZQQipJIMuhBXm+z2+DEgWllJamCR3xMKEebtDwFa1R1gFnVdQmCH4pI8g73jw7g9DIdSjR3AtD8nJn6WWHfLaVN6EV7j9g9iePiimcID9QvNe8pq9CAUW/OSizrRkPBqDgDEN1jPM3cZf+4MqHxDXZNEhCc1iZid2Cjfa/ORaFnlwh1PLOdQ6WGlBpzxqLnumCGpZu3J3NgtX22iSaqWzQMvf/iTuJvn3aZnGocHOoxDT8jgsc/zTW5ojEfudBkYJEWKo0o5797XpD+bo/FB/O1T0cinQ3sx/hSItSejZ1+nWwP3g1QI6xKzupoM3fVHgwH5L/Vo54BpsV87BzEzbeRMehcly98skfozHNQGepaNqYFjvbc8CBP6fx/ho3KZdywuYU3bREz+yhlHU4wk3fx+bC64g4UHCOJlz3nKg1RXluNi6ZvN/zzrlYJBiW49q2oFIJRfE8w5OoUm7OZJ6xVRWUAklRLvfUclW0y9xovSue7gztHseRTBkgSQZHJF15JiO2lE+BGMyeafBLI3TzNNVQZVZl9Vw0FkAWoWwn7jszysmOlZivyKusG87GYz1YYaRTkVOPbm9x47R1stL9RaR8DI+r3thok7C81k20MhG/8ucm4bDxYPBSqjEKeurLendZyt6Kl/feuXDPv+c4S7YRJ1Yc4zEgr1fFgo5ezXhdoTNjBW5bc6UVf98g1h5eJHmyWn+G8jpLWZxS1sL0Hmjw57+2KZcw9D7Dl2/sdziqOYF7GMuNXQ38uPHtJ14UNguIkeAvKcCmbxnzPSDKs+KXI4vysn08FbiehMy2OTCeiPHIz2shjg/rskksCGCbMhsN3SgqHcQRvHXLgNS+Cg+LrsS1ib6b3B42hvRgJMYl9oit8i53cBLCMP2ESF5BM7YI2gEhVXkRnuizG2vvti23cVgb9zkTRFttBKLRG/VebymKdXJCbYcEOQ/8Ak1QRSXbcrjlrAuh6HLy3dLjaVOKYOV8tLgYmY8GD/MqQGfSJz1DvN69mXosuAJtSZ3odInYPI9iiPgAtfAVQJ17qmgnb5ZmKglM7INxY2G1GZbxW9tRfa00Ujy46BSTKZiv/Ypm2kJskGeD2kFRqtYOgMuC5FKxE2gytWeGxgzHQWtxR8r2ELYh/F8/SQcUURmU4lHIANFcRi7QK7LYN6ywpYKdvZGRh07RcVDgqDrb+1ZsNacQSuuaC3aJIzu3gt0NyeM4xUFDoUt/CXz1ATNCOB4wzNlTkEvjbZPwGZAQCXBHXVA5GZlzrUoCdQINMIM9ls3eF4lvHUBdLnWiB7QXP0vZfZeZTek0U/6dufboYOBH+Pe2Cd24lpwcsLGlgp3O9p453l6TX/puHE5QrTvk+WamfJyJi/6Q6UDO1oHZIj2wKW1ToWdgBbPivtpcAP8X99hWaU+wCgYaOJPpCnRT+W2xxOS+kq/Tmfe53Z9se1e1dsrQ4xWSeJSIrv94hx2zapoH3tT4ptfxadx+gYKBUOBW0g7E0xf6VYupQYkjh6ueFc2bbdiVAIDiVjGIOONwHrdwpxS553TDoniqUnu7vYd7MEucggGi1hDYOG24DPAyQtf7Zu1GsCmaSpivYKdo/y1iEutFhs6lFlYgL0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3196ce8b-c6fc-4695-2d21-08dc5f5e0652 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:22.5271 (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: CI1ZvkB7zOEBf4IMu3r0BZGWz8IKQy3B72j/P9jU5Z2N3phf8mHrxKNIXfj6wcKLESpCp1G3a+dSrpYDx4KeUn0uFkWVLh6b6CoCfvtXUwYDhYNKDuDuAUnGc0FpkZYe X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/avs/boards/da7219.c | 4 ++-- sound/soc/intel/avs/boards/dmic.c | 4 ++-- sound/soc/intel/avs/boards/es8336.c | 4 ++-- sound/soc/intel/avs/boards/hdaudio.c | 8 ++++---- sound/soc/intel/avs/boards/i2s_test.c | 4 ++-- sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 4 ++-- sound/soc/intel/avs/boards/max98927.c | 4 ++-- sound/soc/intel/avs/boards/nau8825.c | 4 ++-- sound/soc/intel/avs/boards/rt274.c | 4 ++-- sound/soc/intel/avs/boards/rt286.c | 4 ++-- sound/soc/intel/avs/boards/rt298.c | 4 ++-- sound/soc/intel/avs/boards/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 4 ++-- sound/soc/intel/avs/boards/rt5682.c | 4 ++-- sound/soc/intel/avs/boards/ssm4567.c | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index fc072dc58968..1137fc490369 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -203,8 +203,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->exit = avs_da7219_codec_exit; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c index d9e5e85f5233..0035900c5237 100644 --- a/sound/soc/intel/avs/boards/dmic.c +++ b/sound/soc/intel/avs/boards/dmic.c @@ -22,7 +22,7 @@ static struct snd_soc_dai_link card_dai_links[] = { { .name = "DMIC", .id = 0, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), @@ -30,7 +30,7 @@ static struct snd_soc_dai_link card_dai_links[] = { { .name = "DMIC WoV", .id = 1, - .dpcm_capture = 1, + .capture_assertion = 1, .nonatomic = 1, .no_pcm = 1, .ignore_suspend = 1, diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index ff3bd1513269..120fe60242dc 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -233,8 +233,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_es8336_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index 4433175814f8..b91fe6390894 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -39,8 +39,8 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int dl[i].id = i; dl[i].nonatomic = 1; dl[i].no_pcm = 1; - dl[i].dpcm_playback = 1; - dl[i].dpcm_capture = 1; + dl[i].playback_assertion = 1; + dl[i].capture_assertion = 1; dl[i].platforms = platform; dl[i].num_platforms = 1; dl[i].ignore_pmdown_time = 1; @@ -160,8 +160,8 @@ static const struct snd_soc_dai_link probing_link = { .id = -1, .nonatomic = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .cpus = &snd_soc_dummy_dlc, .num_cpus = 1, .init = avs_probing_link_init, diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c index d41955685664..b1087aaa5348 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -46,8 +46,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->id = 0; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c index 1ff85e4d8e16..eeafdc3c4364 100644 --- a/sound/soc/intel/avs/boards/max98357a.c +++ b/sound/soc/intel/avs/boards/max98357a.c @@ -82,7 +82,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98357a_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_playback = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index 8d31586b73ea..1b561a0c6ec5 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -134,8 +134,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98373_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; dl->ignore_pmdown_time = 1; dl->ops = &avs_max98373_ops; diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c index 572ec58073d0..38188887b631 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -131,8 +131,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_max98927_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; dl->ignore_pmdown_time = 1; dl->ops = &avs_max98927_ops; diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index 3164745b1516..0dce214bbe49 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -210,8 +210,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_nau8825_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index e3aa28780df5..849583182c8c 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -183,8 +183,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt274_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index d24316fc4db9..881ac2139215 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -153,8 +153,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt286_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index 7fd28544f786..7df1b7711323 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -173,8 +173,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt298_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c index 097ae5f73241..8daf3a28c561 100644 --- a/sound/soc/intel/avs/boards/rt5514.c +++ b/sound/soc/intel/avs/boards/rt5514.c @@ -121,7 +121,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt5514_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; + dl->capture_assertion = 1; dl->ops = &avs_rt5514_ops; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c index ba8c42d026da..89d476368791 100644 --- a/sound/soc/intel/avs/boards/rt5663.c +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -171,8 +171,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_rt5663_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; dl->ops = &avs_rt5663_ops; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c index 823f04dba2f7..2f236e4661db 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -242,8 +242,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->ops = &avs_rt5682_ops; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 9e78a3b91208..4c1864fb1c0a 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -121,8 +121,8 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in dl->be_hw_params_fixup = avs_ssm4567_be_fixup; dl->nonatomic = 1; dl->no_pcm = 1; - dl->dpcm_capture = 1; - dl->dpcm_playback = 1; + dl->capture_assertion = 1; + dl->playback_assertion = 1; dl->ignore_pmdown_time = 1; *dai_link = dl; From patchwork Thu Apr 18 04:14:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634117 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2070.outbound.protection.outlook.com [40.107.113.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91A6A5467C; Thu, 18 Apr 2024 04:14:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413675; cv=fail; b=lGRa3iGJAoCxHdjLfkwh+EG1UxCelcxDsNIXYIl4uJp/kW+hTkEh3/Fi1ARLWZrnRrJ6iN3wDx3InvhCnyLzG6+a9GiN+33OtaH80138lx7Pig26HHqhr8LU+k5was/oT7u2uy0xKCv/5R+gE74jeGw9FrVOG2ZiMbyddl+0aTQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413675; c=relaxed/simple; bh=4kcRlB0ad+8GlJ9lXEqOg3HLbo27rTG+03l1oS7xqBI=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=uiHBhj7QfgFmSGrBupwfmskru09py4cYRW2ecAFEo8vnOrRgaLWbNzV9f3X+Xhi97PUYd2BEefrDL5z6WpG4pNiEJOyfkw9csKDB0ijo+5zt/JmsFFe60Cb9VdUmX+n7UBfqEFvPJwdxiWr4v8QQxP1TCWvREBoJHfBiBbrHk9g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=gjY5vom7; arc=fail smtp.client-ip=40.107.113.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="gjY5vom7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S3Yw8QOTuJhgLQcADfvgLwBZmzTObZ2Kmpks+dSk+IzSIr+oPYYK6mCUOAdfxpfrWjUzt+PDMePBrxhoS7ewDgR9lGzpgKKavIX14youXqVOt+o3EjvKoadl9QlrQG2TTPtD8ALJyNqE5336BcwN4nXYBBMBzrvQjfHTBR6MLNQwR4ZEX0Do/T03W7iT05fHz8vssC3KFB0onAoC9oBchmoeWr4TfjgG+tXa3ufwz6Ed8Nd3rNTH0CpANKytmKxZL2Z0Fmg791v8na+w/v957rYBvj9Q7hpmWu+34a+d9XEejcAxyw7m5wwIuW1NRuCfDaaxL3T3k4VZN+9EDjCemQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=87OewweWG4kuUvrao/JJUSGiBcnfqiwsYcF5frUzWW8=; b=e6MRA+o7TvisO479ALzECU/kPgg4r4+fecfUJZwl/0MIHsHfVhhVDkqhhBY5kOQownB0tCP5tGoGD+70+WYk8kKGIOMX8m/dSgtd8lWL5vq48fPnyZfbthd9FpJlQhBPLyBm3fljp5GJC7afDyURMldG3ZleyRXiw7gGTpwkXxQn59+099IK/KrufGIQPw3sk2/jCmT9dSuB2VaqfW/CNy4EdQFn8yCJ3aeUDO6OOE03G5P16xcJUNa5LHgNcwziHpBbuYyAPbksuObIn05i0R75RoJCrxU0bOtd29s577RQSUO2h6zCqLqIzE20cEu/p/5RmA4GJffEsxDjnFUIFQ== 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=87OewweWG4kuUvrao/JJUSGiBcnfqiwsYcF5frUzWW8=; b=gjY5vom738PsIhnrCjjT4EhIaSqRrOSYdwwaTuVQMKfKV9yajvRVidtYQdZXRrhx/mEaSMMzee5BBw+yNEhlAV8/vhnvQcVOyplPMCkeqw3Pv+OpyDCvdObtbMmfd7FvFt8UrtxwDocE7gpumuAgp7YZEm1Eqb9RC9COQkV0y6E= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:31 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:30 +0000 Message-ID: <87wmov71eh.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 14/23] ASoC: ti: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:30 +0000 X-ClientProxiedBy: TYCPR01CA0083.jpnprd01.prod.outlook.com (2603:1096:405:3::23) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 70b0e4a8-e18f-4a64-8041-08dc5f5e0bb8 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qJ6DMRmw0qmFzQ/UEFI9qmlcHehJhbP7QMEk9tGq8AOGXxgZcGuRIkraSZUIEHRAsIBtg6gJY3AcPbdFRholeNTH5HMNBZ9NIMmmtmAKL6jenrAoH7TBCB8shibTMlv7iWJhpLhs8FE5YdrQFTcVmy19ZtXbMhSH1OqdXzQ3tlMGd7auvMoRsolc+AyuIe0siFRoDDX3logRGTcE9GebZEaLjoQjlKFlKs3jmu3D0+SN5hGkmeyGcBk6OgR503sIHT0bFOs5NMKsYpkp5LETYwXs72m45vgJ0WYxIJye/s7QR3Ip3bDmj0BpXJqoFbkXuem6t0dUEIsLRtabY7sDxATlzsCPO0ocZru+Qbsv+SRj6c6CRBWUNSKAqxjb3zQabxIxHXZIX5BHxzedpjM1OODD+n5Tynybo90pRNHK3Gf1SYaIH72xmKxzciMb2nMwYeAGFkj6ToY0MvpvKzeShh+cl82PnjZDquz9PQQjzpDxAx1ZKd1pspOpSwRaYb176AJ8/eSsWcM1GEawzBs4KQjBcCVqc3xpa0/B8VLxHgqtINGdhMON4NygGiP7W8eDp8XqC/mtljxNQO7q2zAzD7dBPYFcEDJitAgmQvRcpuN+SH3aSK4JoMoihkEi6Wk6oxVjhBtTs+quAuMSdDG0IH91sfS36ogeEh+3wHHOsvLHDRoLaM9Jv6dhU6tRLLWTdcwwda2et9Pj21JCN0iatCNzPWDcXPx9h+Kth26houo= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jtUNeI8LQlpXXLF450gQFYzbQOXZ/IU7YB9zER614TP3O7acZAmNVUHr9pJgY+1IWUu5TI9Oz86tdVvMniv2kRDYUOf3hTKlkKEtozub9VXxydtDb284pqDJna3NuraTqzY/rK5m1CXyJPkDNTtlDAEmQxP1XhZHdXG4AL+F+k5GZUzJaLJ2kRmOamhTzx4QuXmOHGJYKlyAR9pcR2HyCAP6W6ChybdWrTsUhwoYz4Bk3caDkg8W7+PeAUbTGDsYt3YDdXTiY9+VmScWLzup3M5BbiAzMrXqLxZ1tPhj3Y4SXsxSDviSZVDRGgyvOkqh2ZTXGFg47uvvCERcY4GMcqQtyIhWmS6e1CYoCEzCcncyFV157/hYwHYTL//iDyaKW8LclacUi2VMsQBCkQPrW9FdBTlIwPwgqoTvww1RhAXwlVXe6xmRE2Fok8pYyIY4ZKrC7z+kzIbn8JiDKQN0CNce9SnMKAgNk7uQiLwwhY2YsQf/nV7YWkYUrdu7fUc9+16fAy7czYkqF0mv03YFE/a28Mo3WbfV9XHzegsj2pjQ5yc6ag7kSozqiVpQLho8oEj7R5lNEttpP7L+vCPrwj1KWQlMyx9vGh9yktSr6V1yqfF0ZXomdRpIDPHjgw0M6aQQxfwdLEX7JIjhuGNqpW4gXROTbCEjW5ih/rCzQKgNX1FcWBdjAjsF3UhIBa0BLKaIjRl06M57MFN5McS+G6SC4T51UO9+Z+GecBBU94VcGOvBb9J/AbC/batZ5KivLVT0UpTlmrjiuX74VKEgUArWsHS83mQNeE3A3n0/4DUO9FgJn41o1+Yi4AHkFAZYMTcuKOWNr8VX8zEqKlx1SOJn5L618P5/JBKGuKNvFXHLeX3gvXrjYwBcJms84Sy+aVagBx8XRVza3Q2yoAnVrLy+yLtO4P0z2ws4OkIVDbv29xkh4BrfHn+YIEaVY8lbp3fR5nAYsaUi+lTAXbJqUr05CF+j+AXO8zioYacG5pc0sS+qNRPcDW7MhPzlLzJNHQM9MveEZuH6kMAA+hkn2Ha6oPUXD2ySwqhiZGL81T0vizBRDsXZCCLR+75nveWzXOerM51JvfWIm1UEw5iyg9sJeKvLnolwvowN/wq8zx17XBKNGoonWuQjIaQ9x8Zq580sVUVXdwdgd33UgbFqzNzS4Kg+MWSgtzdPGqASwGQ0DlZz5S+/QMbbgcPBO9FzCfIv0gH/1//8v6pJLk7x/kp1MoZ3Xarx1w0Ln8op8Wnqr9DWhVSzi7pY4PwW+94GdnXq++MKhw0PBivhQx3IDD47uE6pdLeHXQHYhXWzqDdqGe1gBjwdnlbHrJ4nmUzkJoouIvd4PMWUvuUUx19lOn6PuLyGrGK/90TWRkui42g7XWFm1cre/mpD95Gm+VsXWgQtXUG7z+m34uYqcYjefeOGQb64ZFx7AtoSihOBknDOkSvb6ahtv9PoCx5lyzwhyY1E5jRQPSgzySN5oCDojRXYUZXEGBQSPbsqUVnjBvSBF1ICrFQvQ759rjmQWdUT9qlF4oSS59HyHIQ+oeoOQmJ2bt0MBuu43w3YHED3dQgR8IktWOvWwICNYOCg6VqnRWiYHSLmm/rhKdXguJ5lVyD2kPgmR8GtQlTzlNJ+D+Y= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70b0e4a8-e18f-4a64-8041-08dc5f5e0bb8 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:30.8808 (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: KV+eeUg7ATq97Vk4WHbxzaOvqWnsyonutQWmwEBJAXvjC4hTfkJ/213tItz6sQpG7/XhX0mP91y8hhxdU5LrrfCj/HnuAni9xbNCjtPNEWr3cSBdkjTZOg+VbnXFDKYd X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/ti/j721e-evm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/ti/j721e-evm.c b/sound/soc/ti/j721e-evm.c index d9d1e021f5b2..a58c7d64c28e 100644 --- a/sound/soc/ti/j721e-evm.c +++ b/sound/soc/ti/j721e-evm.c @@ -670,7 +670,7 @@ static int j721e_soc_probe_cpb(struct j721e_priv *priv, int *link_idx, priv->dai_links[*link_idx].platforms->of_node = dai_node; priv->dai_links[*link_idx].codecs->of_node = codec_node; priv->dai_links[*link_idx].codecs->dai_name = "pcm3168a-dac"; - priv->dai_links[*link_idx].playback_only = 1; + priv->dai_links[*link_idx].playback_assertion = 1; priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_CPB; priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT; priv->dai_links[*link_idx].init = j721e_audio_init; @@ -690,7 +690,7 @@ static int j721e_soc_probe_cpb(struct j721e_priv *priv, int *link_idx, priv->dai_links[*link_idx].platforms->of_node = dai_node; priv->dai_links[*link_idx].codecs->of_node = codec_node; priv->dai_links[*link_idx].codecs->dai_name = "pcm3168a-adc"; - priv->dai_links[*link_idx].capture_only = 1; + priv->dai_links[*link_idx].capture_assertion = 1; priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_CPB; priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT; priv->dai_links[*link_idx].init = j721e_audio_init; @@ -787,7 +787,7 @@ static int j721e_soc_probe_ivi(struct j721e_priv *priv, int *link_idx, priv->dai_links[*link_idx].codecs[0].dai_name = "pcm3168a-dac"; priv->dai_links[*link_idx].codecs[1].of_node = codecb_node; priv->dai_links[*link_idx].codecs[1].dai_name = "pcm3168a-dac"; - priv->dai_links[*link_idx].playback_only = 1; + priv->dai_links[*link_idx].playback_assertion = 1; priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_IVI; priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT; priv->dai_links[*link_idx].init = j721e_audio_init_ivi; @@ -809,7 +809,7 @@ static int j721e_soc_probe_ivi(struct j721e_priv *priv, int *link_idx, priv->dai_links[*link_idx].codecs[0].dai_name = "pcm3168a-adc"; priv->dai_links[*link_idx].codecs[1].of_node = codecb_node; priv->dai_links[*link_idx].codecs[1].dai_name = "pcm3168a-adc"; - priv->dai_links[*link_idx].capture_only = 1; + priv->dai_links[*link_idx].capture_assertion = 1; priv->dai_links[*link_idx].id = J721E_AUDIO_DOMAIN_IVI; priv->dai_links[*link_idx].dai_fmt = J721E_DAI_FMT; priv->dai_links[*link_idx].init = j721e_audio_init; From patchwork Thu Apr 18 04:14:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634118 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2081.outbound.protection.outlook.com [40.107.113.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B43C54679; Thu, 18 Apr 2024 04:14:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413683; cv=fail; b=KsTeBmi1a3qfGb7Xnw+4RQ9qowqaqdnzNIpwztLbSCkIRxjHTAyOcMYjOI+OV9Fl4inZ0nVAqTIlkf7qYMI7YwYcLbGfOWvOO6+Xb744l8zyiyXk6QMvWuInMNKxJcmE/tFX88Q/Ow+rdSvEyrMoUlnDljX6ZJWFzwdt4rnyJ/4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413683; c=relaxed/simple; bh=CHwN0w+kKECkNO7weFPOWmJwd7w94paxc51yfl3ZMp4=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=lnMeMXdRwT+kx6s3pinmHnXNvOtk2i79M93FrRw9sDWQm7tsm+2VRk+VryHVaRHy7j30Yt0/LgwTUUccwSputS0TD1RefaX3Uq8XZEsfIabzvO/Ech27m93Z/8+dDoIlplJyMpun56PY1iwGGtWsT0fYo/VtSmvELYNWago/AKQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=PWpXf/88; arc=fail smtp.client-ip=40.107.113.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="PWpXf/88" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOJQCSUIWuTjYLw7Bql95nkLeCLfJxgYneWB8cCfhIGNwW65Ssd1uKT2QQQZXwZtZp7y7L+os1zWp+TKS8YDcknoJaaylzm2BSlcALW9LwrodfhXDv0oSt69l3L1A55lHHtKo1Xvu6NsEHaAAJkp84uL4tXcbn0jY2SjDPtqfJVn+/uZ7rEMPCA6SJS2uc9WSsKGwbA+5kS6FWQn6GNHcr3xb5X3v1nNbwy8Nopu3Mt4lcXlnkRkx+YAM5iByTW7c4DnDHa0ndfRlyJS+bju6pr3YpdbG4XdgIFEC8mRA1obFblFgUjQsEHwqDUleicU4tWWtEnrdCYtdnRdDaZhZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t7JpM9eowkOs6q/Wzy+Lj4zAdrPFKWW+4gwnLCEOr5k=; b=jmiaP+HJ85uHI0HBWiDUqHqXFMbFbFRNl0knJsV9+/n62dEi62IahVpirkvgj+OqPwwUMrVfX8NTInY6MoT22ujSom4R1il3OEN98gKtO+Zp4WzrgsyAaUwuHj3y/diQvePBQYHMedXYnqEQIszYmwwbij3OR/lv1/OKcsUuVf9RawOiCA3whsTa/+fnVPCOtcyAbmjWM17pIqfDegwk5DZ14AWsGXj7qb53eLLF1vWXKiLsZfpK62SieFTwCdnXVP15r8ysVHjCPxMQ9DwQy61xbDxVGNhiV/DOBow56QdhBN5eKX7GEgT/4rlX2lEuleHMgB3WGDnNqPBcTgmebQ== 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=t7JpM9eowkOs6q/Wzy+Lj4zAdrPFKWW+4gwnLCEOr5k=; b=PWpXf/88XuBl2FD4z0isB9Gp2uqaxwkYEpumpb7AmpshaXpad9ltFOd04zSd13o5lTTeZUa8XXSi9wB0I43O1ewiLrq3bs/Q927FnUMyK4sV1R9YpcnwNxDz1Bd8xZdj45vApIgpgteXC7gbFc7yakdEgphkpeDzBzrFSe/gnbM= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:38 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:38 +0000 Message-ID: <87v84f71ea.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 15/23] ASoC: amd: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:38 +0000 X-ClientProxiedBy: TY2PR02CA0046.apcprd02.prod.outlook.com (2603:1096:404:a6::34) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f22f383-77a6-45f4-cc49-08dc5f5e106c X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HLP4hFwRAOXrnXDg+/rswmeAnqJ+Exrg5hfMG9TxBpxfdcTSeoVxhHwPAuIZI4ZQsZoa36WuaJXINWvbRq1yWvPGXA4fBkZAn4sWk48FmPOt33HgyjgZhoKjOOoM1F7sSBfus62L10AILO2IIFjkZLCd48KE3BOIYSrij0U7ftuBejRk91xnWMXe4RwMmbAFfTWrnyppZE/qBHNFK/H5M4Lhr+nAJbzlXQS8+cKLM03mqrsk+lmps+DTlykXgd2xRp1lyp7kGgqYpYdzjk3IEZzc20NKhguM99B+9K2bnDYrdFpd6xhPu9PpklouQjmf8ugmgG+dzVcIs2vuegsdxVzsGOykVfAKBhynA9WqNlkpewQ4Rmj2C9ZgVkidva0z/SJJ7L0KApoxhzT1Hm1+bRabVUaFMBkuoaYo20SKQXjHU9mapum/JIjXeElEih+FH6e9Dv5D4wI4/5Rqghv/QIN5wWHpvY7exgDo4w9Ykv5JJIMfkyKqSBhqiIze3M4vAVCnUR4f+O+4MM0xm6XrjAmOgDQqP/SOOG4AdaSy/UD5omt9MORMl+z5M96ZaKVsR19LkTM7jxHGuomPczT8GRzVihMf6N0+zhn/5pDbix8NNwmQO+bbXa4k75Ik+AtYgm5gYfiCy4g5wkwfoTVlvKuljiJwV2mEOuf6lIuSAGNcSDCs4hkf1gX+KGHHu6q/IkctN78dWxKMgKElqjIEj781JCK0Il4x8R9a6l4v+w8= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VKVs+3XrRrEyHyqOpmpS4m6K0JZwiWoH8M4uiNwEL6OdtPEUDXYQQQq60P79yG2AijE5sy1/8Sjgq27JfrO8C0q/YB+ldnb2romnJgzYO1TMmOIByYNu8fH89g7HRU58jLfmSySMQJ1b9TUfBYiSQVDTjg0f0snm2LGFTl6WZPq0l3U7wNkKN2VE4NtHb4zp0wM09kwbf8QNw9DsfKtB/xN7xCDftujv789kkuOo1Ec+rO/jwON5bykkLsmd+c4mzHIf1bSA2sk1mMQZJf/FM0xXFkhaN2rPaJUpny61KEwtFAOXsG6j/5z2N5MBtzJDkfd4LUmyP1SV79Sxc+8UKQaChY4etMvmN4DzjijPCKXwGZB1M/knLrWTXLZ8rX2nTmvWubuFbtwHa7xgwZEly01aHQxovsor5ZhKy8j9VEwoJkvXdamxHtatPpHFUf4idf4uAZYsDvojkoBlBZtopf2UpjWWWD7pt69BpcPAgA64DCqGkrR88BcJG1nJ5IMJ2wlIZle2QWD9orx5R8jk2Ci30t3iaFo093e7lpMk6Pd0qW3ylbW8nsC8p+2nS4jaHl388K1whR6jqiKM6WjvxHAw+onosad1Wm3BCq3QSx9j4XIhM2yX8IrPz5Z8KQtRrcDCmWh3LQnnXBDPxGvRXLQ0CZfRlBPQ+/4zGchGQNYh5ZShsR3y9Y590aKAOHi+bbtHIdvFDVuYcPi+g63Lv8SBjsZIQysn/ggWtCxDdENM1CNK5L3mwCZ1M8ARfbkkz1jrMutY+tR26rYkAZIQQv2WKWrDTtgDR7IJK91hQM6SjVDtcCoHW9X0CSKKPscEljni5+yQWf76bXloFwrlO6WfzNyxAVA1BAl+XZvfzgBR36wzIQNDqcGlF9RF67ybhBYhystSglVrGMiMVCiUmBvYJiRc9GYZHcA2pJbpatW4FUPjPv5OhIXHYkAmii2jiBfOCE/SSIBPLN/gD09RNSldueS2RqKBs+ZU8/eLJdXaZTnetZLQdLCCpjLSWRlmwfcKsdA63So7EcLGv7570vRB26Z3XBbBJczIbz0eIHQh635Y2ERtGmJ0poRnH2K8zLgYwqgMxwB8lQQKjbS1a7kftEkHMcV/W1VLfmKPjIeoW4W+CJSEYTUlLreE1OelODsG4T6PN3R3XHsN2znPXQtxrl9XsxN8DZnuQuMR9th/E7S87oYTcs6rLnxSrlmQnYzue/gIRLaEDiFGm9/ypqirw0q37zh5M5+37JEF4oKnv5eTqmfUAnCwlYqQv02UOB8maQHnpVGX2Tm+6qHnlVaIQ3GsS7BF8YlNLchfShL+h3Cqdyiv9qZV5eOBOL/K6DY/Uwi77eiss8SGLq4ueB6jT0RJu/KXtC2dfbSB8qbI9BfTGNrFJLFmnGccLbGm2YhbmzoUyUyS5rbe4/aok+Ej7CHscyKXV008sQQ0ny9zrnI4mly9oTOqitX0FQB+3amGMr2FQ83G/Qw2ovzLPMtDdUcg1nJPYVWNgAa6yLN1GCBrywv/7DaUOecLb5UbXbgFCiFurJtAdiC657Sva6Nb4KZs2QQ+mGLTPyrF2p2cG81DyhoXsvMUs6kHx75M5SZtYWoc1j3G4kzTouymRmXia7kKWModH7e9gBs+mOg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f22f383-77a6-45f4-cc49-08dc5f5e106c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:38.7679 (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: TkBUn2c72JSy/KTyW0x/oJviZTN1CtQvF65zNaU0a1QeFT0NboJJMBoNxp3WtYmIQrm/HtKGJiLULspmczf2b/ZHAZPNnhpQCbckpa1qg8JeBrUe/FHb59DSwQ7eoXTZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/ps/ps-mach.c | 2 +- sound/soc/amd/renoir/acp3x-rn.c | 2 +- sound/soc/amd/vangogh/acp5x-mach.c | 2 -- sound/soc/amd/yc/acp6x-mach.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/ps/ps-mach.c b/sound/soc/amd/ps/ps-mach.c index e675b8f569eb..3d8bac56e8b7 100644 --- a/sound/soc/amd/ps/ps-mach.c +++ b/sound/soc/amd/ps/ps-mach.c @@ -31,7 +31,7 @@ static struct snd_soc_dai_link acp63_dai_pdm[] = { { .name = "acp63-dmic-capture", .stream_name = "DMIC capture", - .capture_only = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(acp63_pdm, dmic_codec, pdm_platform), }, }; diff --git a/sound/soc/amd/renoir/acp3x-rn.c b/sound/soc/amd/renoir/acp3x-rn.c index 5d979a7b77fb..42b8d89fa8a1 100644 --- a/sound/soc/amd/renoir/acp3x-rn.c +++ b/sound/soc/amd/renoir/acp3x-rn.c @@ -29,7 +29,7 @@ static struct snd_soc_dai_link acp_dai_pdm[] = { { .name = "acp3x-dmic-capture", .stream_name = "DMIC capture", - .capture_only = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(acp_pdm, dmic_codec, platform), }, }; diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index cd5b075d4b7e..cc902f857af3 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -289,7 +289,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .playback_assertion = 1, - .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), }, @@ -388,7 +387,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, .playback_assertion = 1, - .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform), }, diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 1760b5d42460..a19f359bedae 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -32,7 +32,7 @@ static struct snd_soc_dai_link acp6x_dai_pdm[] = { { .name = "acp6x-dmic-capture", .stream_name = "DMIC capture", - .capture_only = 1, + .capture_assertion = 1, SND_SOC_DAILINK_REG(acp6x_pdm, dmic_codec, pdm_platform), }, }; From patchwork Thu Apr 18 04:14:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634119 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2068.outbound.protection.outlook.com [40.107.113.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C04F95467A; Thu, 18 Apr 2024 04:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413690; cv=fail; b=uJcV2+tFCPFlspoXui38Z1nJplUY6zADmEsX9onhHB1XKAmx643/ryW9RXCdCgXbBwPGnb2kfMJFQtpAO7cJLu6b3DIhC16UPqvoSXnT3qbmh/PSdflGEmTLPZV1pKzwzx0sePH1rvkjQXuZwNRKGf5kHcYK7chsMIXhTyZzXyk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413690; c=relaxed/simple; bh=CHH52AfOvY/ePAYShjYVG0+TbHowSsfj/36VOxK6S/M=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=R5ez2sZHfamSjXoZRuf8AGXqba6R87XY2oJWldHnTqlzXez3lRB1V2dsHrOqG7E7FM+1hlm8tLQngFcz5lkI0a5jC2+TaT6iqvFKKL6tk7/e5T4MFSz0UD8DmcBc6JpO+U0LB2vuzxNN15ASIyQsrGZVxSyrUxaJEVpQ50N/59U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=Drjbhyvn; arc=fail smtp.client-ip=40.107.113.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Drjbhyvn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a4axM/IK79dZu2X+APXURNguhMzh8C0xh2NNZWh24xU2jJ1oO+Qx0IrCv0KQR7Cncnwf8dA6e8EtQBY/iHkLy4UMpk2fIGRqTdLAkkw2GBP/LgQgalGYDdyifqZALFigfyP1vA22C2DBrfy+i3yBsGTB2a7nRezBlk87g4+UftLPwYF7cCgsur9lnQ71Z6Yo7H7My4THkOBMAC9UkBOXxp8ZFmSz+JtAAzBxHJiO1WH/br5+vy8+fn/MJEDpe/qny4GyskjY6fZBGWWTEc5yAL5fPxC8bBzN/10KVTyTQULzakAecYg9Bg3D3X8i+O3ObZDUijt9OVDvfpJcZpf+jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nnB78NWGFgzHzMXoyH9pGduHLaXhOvPT8HGW0b2aEZM=; b=kmQ+f2bzMY6OmSGAYn4c0LXdxzMhfO50hfMIVYHP/Glf9uhF+w2JJwcbEAMHvtFGomij9qvHmUNAxykBfsAPqVLvQjnBKYHFoM4DLavgZCiN2b0cooD5jw90lVVnm28M0MmehcH3CVKge2WE6XQxYYdio+4/WWYHcaWGrsQLnq8IYw4Sob/nLsOlHFVt8Sm7dI1R1bqaZzwLzsDt5bTG8eJ9ofv92wJ6tWxaOcA/UmWlFztqLCB4kBsT+iHmhA7T3HSmhMpnHdS4/PWu8pd5LhJYf48O5UPZwh4VvCP+8vtmbdPrc+xqeJzlWa9R8WiEKnc+r8IWxV2UPj+ZReKJhA== 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=nnB78NWGFgzHzMXoyH9pGduHLaXhOvPT8HGW0b2aEZM=; b=DrjbhyvnuUzp8MQZNJZWcx8eQjMqsd0zM8WoC+eFpBNILpBhrbaH/ZyJr2H6dSkSxeKm5ManHflC3Fm8W/6/RoOZeuDvk1uDMglOkd3I7ifyiwVk4qdZTk1qPBkNDZGXQ7onF72yBTbv19AArNBY/wd3KuPK6a0ZcWxOTfoWuHk= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:46 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:46 +0000 Message-ID: <87ttjz71e2.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 16/23] ASoC: fsl: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:45 +0000 X-ClientProxiedBy: TY2PR0101CA0008.apcprd01.prod.exchangelabs.com (2603:1096:404:92::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: b0a4d611-c47d-441d-2cf1-08dc5f5e14f9 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ekSQxGbzIGuCey2+B1ZQw+4JpGziZl+SYwds8sUCxCZetNdP9h2rCP698wa7KLRHECVPeWnGn15wJpzYc3HL69DHpvyXO7KWnF1FkneX1qQNnJQibEHdIrgQ4FpAV7fNLv7Fo0qCIJxS8HZFFLbLftaOuKWaXrHGTgUWJEPebjIv/CyWh11MSeTP9dfAsQ8cgly4p6Q2jvQmI5QW2CVK9liaTYVJjctYB/jM5Iip+w7pfYsqDe0Ux7rgLknFkUMrwH1qgB/uZjD+sHKh/Njb2d5chZHzg6BQadjcejLN/UNlfDInBjnlfIhJyeDMJoP0BXoV/U/Z1K454/rwc03RB9nEk4UhZrOnDE+tnwmZq62lZAbuN3c201Da2J4wPbCYgNKpe+IrhfrzC04HSB1VNMmT7Y+T1torlyD/dVkMNr1rnEvrBW6kw+3BxEY7+Jl0TBEPzmIobvktqLQ4qw1ZGDXxJqxhDYS5AvX3s+piWtcRklgsd0XVLtX30FO9n3G/K9362kRDgPdyVztiXFcMTd6YXSzTCYHNcCaGlFyAlMvrzFzNtnhfvyFf7cfocX5q5CmiwMpd6GSsCChKbrec/44mqV+PtGg0CPMkHnpJU7mP0PMoh/uraVeFYRFfHAlybTxoKD797Mn3U3l0e7uj7k1GBUgtfipjYX3ilxDtforJ3g0fMne3r+vXjrdSwXNdJB2TlR5Mwr6rvpQRdB/Lwshb4Uyq1RVZFY1oZH1DZpw= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CrIg/N07+0CmfFG1n0pSKaORo/wwAxULJlKDSlhKs4R0zLzt2/b3S0nyDynxyjtzxIuMDeE4RDYVxDpPPd0Qpb3xv1VVZJDtV7T0E+++7glupLiKQJuzlI8TJ2fJ55vBI3a1bdvATyuDxbMkiSDwFH94nUq8BbrrVrJ+cCOX+SD/nuHKBDzLYjnaaO8SfA+ZIVJa1nlJUyCrHACT77eMd5qvLqVS8Hbkffn3BKgeLIRySamkQEMjeCIUHHH1NFre9nVHtgrhkjmyzrRB/l73uRirD3cV9Dyr9eSzv7ymQzVOFvvWIyoLonhgzF84AmnyNDuX7hlXhNEBhy4uNoCsJQbUjc+rveOM3Es1nd5G1nagSwADXaUH8FPnoEVRNGF8H3/nTnoBzLU8MvlpXvdTWN0P6bPhSgCUG/Sve7Hj9u7juaKlVOMEbDJ6qdOItdrAOqWCuGMfPiuPJZWsrNNLHAP8wglhWpmvOkEb8Gao+BMKr1rK6B9uwyA/Q+oWEp68mfVuuLJIpfsG044vjhkhpic2z7anG6tDBaQ0qATFwCb0SqvVReuI6urRTcINq6Y6Pyn189G5wUw2p6Fw58vXyXRfMz/190fYpMESNtX/TDA8qVa1WGCJt/jL3aD26nvnSiKmK9BvFt7t6Pcmhwwg/eD3oUMxxrQj4bbzoLAufMbi46qSuOhxEwmb3Trli7MeMSAOel9HjTfV2bs4SfmftC4M6HtRv2RHkNBizZv6rMjzJvGLfRn+ZX4283EPlTMnKQhXOkwqueOqND6qm6ITD36Zw1bae9iIHHKBnPhAVoC1FrObLc/yOAqrttpJPbjx5wOfNEVrUQ1iCDJGihorej6J95TepAKy8Duxh06PkYwspQ83QLJruhYMu9np9NTYfjTD3Ggx438mxN16JhG759Sh/eif/EIxgGgEDZPgsbulRkMDVKIZiKHTvovXD8VghTwTPs259Fw1y1HslqHAvHR3Cn3uz9bKaY22q9dVdWS4wcr/J0iptIcpQVpuB2cItkMtBcAopRhh4XrxQPAIFIRms/ZKYABDkwthYjJqSdI6216BU+Cn5DyKsBRyPCOXbfWKDu9ZloL6i6ArGrfPUAXZl0RJCyIWZzl4+N5ZNG0cS33FcjIROkiuxCX2MvOgLyTTU2ZCX6kiWn5wELqR4LUghDch9DDjoC6kClxjRldr1o0841GaqyJpoxk5julP2LaQnFSl/HB6MK3e1chKcYikZWO9Vf0iaxq5Yjx+a68WmGMAOAA7vQuYCISiKyW4ISyNl7SDuLFQvzRRKZVxKDHr4NQXfI8BH61nAtFHyU0MS2s5MtVaurx0SZn3wSyrBpeeDaugl9TXXV7jShcC3iNNazwKAduu9XAZEhOvKlIDdy4sGGskny7CylVrhA+yNjT3XRTLMh+Li3Z2U7+ufrVxBwGCB3zUkeBmaObVTGDsQWePI2dF6L3fd8GCtoi3Gsj3/0lF4C9s6MDxwLjjRq/BkSXBlTIY0kanujhNf/62Wi9hQggTkYtvIoo8VoXu5BUbHkeoWVfkTEa3y3XTOSPG9WxAVyCoFXXR7yWVIZIzxzAge/Ph5j+jnL9SCRZL/DVFdtozmFmhyvL564Vjqpo6f0f2tGNbyWbUtoKB9G8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0a4d611-c47d-441d-2cf1-08dc5f5e14f9 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:46.4182 (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: oFNV935Wx9qznKP/L1ui2b+2MbTXUV4pCfF55wll8htA2Zi0/g7RDvQjuu+LYcFk4zSNYNw1Z77LScmgXaTcBoZZEELwLt7UuxQdzn5H//mj6xqeZf30AIQV4uktA5ou X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/imx-hdmi.c | 12 ++++++------ sound/soc/fsl/imx-rpmsg.c | 10 +++++----- sound/soc/fsl/imx-spdif.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/imx-hdmi.c b/sound/soc/fsl/imx-hdmi.c index e454085c6e5c..53ae87a7b640 100644 --- a/sound/soc/fsl/imx-hdmi.c +++ b/sound/soc/fsl/imx-hdmi.c @@ -143,8 +143,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) data->dai.cpus->dai_name = dev_name(&cpu_pdev->dev); data->dai.platforms->of_node = cpu_np; data->dai.ops = &imx_hdmi_ops; - data->dai.playback_only = true; - data->dai.capture_only = false; + data->dai.playback_assertion = true; + data->dai.capture_assertion = false; data->dai.init = imx_hdmi_init; put_device(&cpu_pdev->dev); @@ -169,8 +169,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) } if (hdmi_out) { - data->dai.playback_only = true; - data->dai.capture_only = false; + data->dai.playback_assertion = true; + data->dai.capture_assertion = false; data->dai.codecs->dai_name = "i2s-hifi"; data->dai.codecs->name = "hdmi-audio-codec.1"; data->dai.dai_fmt = data->dai_fmt | @@ -179,8 +179,8 @@ static int imx_hdmi_probe(struct platform_device *pdev) } if (hdmi_in) { - data->dai.playback_only = false; - data->dai.capture_only = true; + data->dai.playback_assertion = false; + data->dai.capture_assertion = true; data->dai.codecs->dai_name = "i2s-hifi"; data->dai.codecs->name = "hdmi-audio-codec.2"; data->dai.dai_fmt = data->dai_fmt | diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c index 0f1ad7ad7d27..2254b7c0c3ff 100644 --- a/sound/soc/fsl/imx-rpmsg.c +++ b/sound/soc/fsl/imx-rpmsg.c @@ -185,18 +185,18 @@ static int imx_rpmsg_probe(struct platform_device *pdev) data->dai.platforms->name = platform_name; else data->dai.platforms->name = "rpmsg-audio-channel"; - data->dai.playback_only = true; - data->dai.capture_only = true; + data->dai.playback_assertion = true; + data->dai.capture_assertion = true; data->card.num_links = 1; data->card.dai_link = &data->dai; if (of_property_read_bool(np, "fsl,rpmsg-out")) - data->dai.capture_only = false; + data->dai.capture_assertion = false; if (of_property_read_bool(np, "fsl,rpmsg-in")) - data->dai.playback_only = false; + data->dai.playback_assertion = false; - if (data->dai.playback_only && data->dai.capture_only) { + if (data->dai.playback_assertion && data->dai.capture_assertion) { dev_err(&pdev->dev, "no enabled rpmsg DAI link\n"); ret = -EINVAL; goto fail; diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 1e57939a7e29..aaf87eaf7607 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -47,16 +47,16 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) data->dai.name = "S/PDIF PCM"; data->dai.stream_name = "S/PDIF PCM"; data->dai.cpus->of_node = spdif_np; - data->dai.playback_only = true; - data->dai.capture_only = true; + data->dai.playback_assertion = true; + data->dai.capture_assertion = true; if (of_property_read_bool(np, "spdif-out")) - data->dai.capture_only = false; + data->dai.capture_assertion = false; if (of_property_read_bool(np, "spdif-in")) - data->dai.playback_only = false; + data->dai.playback_assertion = false; - if (data->dai.playback_only && data->dai.capture_only) { + if (data->dai.playback_assertion && data->dai.capture_assertion) { dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); goto end; } From patchwork Thu Apr 18 04:14:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634120 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2048.outbound.protection.outlook.com [40.107.113.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09EE15467A; Thu, 18 Apr 2024 04:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413700; cv=fail; b=eeYH2JuY6v6Dt+NaOCUpDQuET742/EK/fLDGoYGKdqPOG3mEd5YffGG0IOiBFj3/Dcvc9B493FhGBeXNQSGdc+ckQ6wGGiH5L9KX4kRhJbuG/+vbI9Mqw+EoYabvwdfrR4jpfhVXWtbnt9uxiZiznsjeRDntzVVhLUFhWGlf2Aw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413700; c=relaxed/simple; bh=CEhhY76HXmCbv3jsBJ+i/+GTiOhN8ynXGwnjUecK7Lo=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=MGsHIop/Zk6XpHbhKnOFYleWeAilwkNqIB5vwk8dpRdNMuyYyUlS51wCGyKkDiagl9ojkBtYb7UvzJgVrzqEPaSA2+hdCTvD8sA4EDtE52NiHsWP7CFGLeQg1FKh9Up6t8octJjtokCMEBr5gZ/oc7UambiLAgftdSfHmi/mWTY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=Hr1KOi9V; arc=fail smtp.client-ip=40.107.113.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Hr1KOi9V" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XIYrnwpTA7riSGwJ9MQDh/Y1WfBj8YnPjFVjB8cj0cNakJTJZiEMkdMdelbuRhklQA6SZe/CAskD8U1P2KMJ35M72KiuvaGakWwMk8sNgpaSvz7FPC/i1O0XsKZigkl1V6IV/RHDzow0U6yqVkapNo+DSKcatLQr8Da4nlWhM8o1UvLgtO3xrpe2sk7W5lNYhtHF+3bZlAidkiaAl8budmOxDD07SSZrydpzCHJb5DFd0AkFURNkt5TCwwZoJbZBQmAJQZnO/CVvlbVeUArj5CB6mWgbAMxp//kwqXBbyS88T7/aVu82yp8OYIpvzRo3178EkqRlSfcNfoBPV67kIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ncm2RPDI65bPSQcuOqjLhAh734Wl+ZrPG76kx//yxLM=; b=n8RlxW2kSEdivvoZRzRcWNGNAhYzXcqNe8532rN9yICPmdlIbsYfequYoJ2pDRXC1AlLVG1xmXVN76XCUE8X/swcOWq4bpWO0hVuKnfSNcjUVSbj135zlaD44WNCciTJKJ4HriY5Hu5efBVkBQONwgZxJJaigsMT4PYWP8Pb3+x07e/xom9KP2ESMajJt8VHIoNNqUs3lbylx4MWUP3irFNAxZIu87mRy2PgxujzkISGF0cdShyAUahvWYOV3fDAelAOXCwp5XLhMGetTHNXDZSRlQQRjGIlWr6PS9JtiucEEFAAwUprKJ15iKIXRuVxUeG+zFHYRW30qSeILCnxvg== 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=Ncm2RPDI65bPSQcuOqjLhAh734Wl+ZrPG76kx//yxLM=; b=Hr1KOi9V35Gy1PECYdFL8PbJKIHNYB+IHr58cOlDtUcYJan1VNy6XKunSgjd6gHrlUMe5Bak5h+P267rBxjvhKhVYW7zyaI/VMucxGLr6AiXBuTEKXz4LYPMHZiRJZ+/8ukEqzTnU/1Dnb/YIHceFO+tutZmUr8mQRi1BfTDtZo= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:14:56 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:14:56 +0000 Message-ID: <87sezj71dt.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 17/23] ASoC: mxs: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:14:54 +0000 X-ClientProxiedBy: TYCPR01CA0014.jpnprd01.prod.outlook.com (2603:1096:405::26) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 799cb002-29b8-4869-e9e3-08dc5f5e1b15 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pQRNp0sop3pD2z2wm7qrYaoqBPUJscwJ3ra461hYBW56eLwy+90mfe8QzQK1BGQvmknmF2itPeWj7DBDuzinAWTzryqpeGhpwZZPUgNm8I0qGTI+d0gWzzoz8udKw8yOx88ORkxx1ExbyjYeeam+rRNhNJiOkMcQyPVV8NhlBS6RbOUA35LcKn9NaztkZ8wdXrExr75qYpzY0zUb3Ud8BSlGCacBUNbXrrVLSYQ9cG0BJLPJOQMC71/6Tl/yjfQENJoJlyT4n9+t7anGIvYwGrniagPTg1hE9sRjtd6LER6/tZXN4WN9W0bwEwQ6e3nT8emen10RZR+nmDR9+xe2lr4P1QkfAv+ENREEd0/2nAyPdQ24owo5WC1dfyAbjO46H/Mz+JWi4j+wtmPuSRf1a+OZYJlOgIIJumPxRhhzS1WXrnv9Pt4OKqf+kpy4dIpqkdzLFeVSAuRxtpmTDPlU9hydiMbYbntgM64w5Oeabqt6Bu2liWxI2iTMo90QrJEd9IMuGks7o2LK85wztpBxEC7GcVGDlYua2MEiitOoGmYeKmqXGBfkZugY8nHbu18NyUBSZvmBKRtAz36aOM6d4L2/Sa54/iF7ATU3ntgrPWjti7PMoHPVHAYXBVyBM7Z6go/qQJ2RM4XVAjf+oz4eCdFui+S96cOx+0ei4jprjmRz8sa/xSkLlVSjRquTVyh5XZ6QwJ5lFGuif3f+b4BfPse1BAologY35s+LJ3zsxEM= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DCkNBDOFtxh0sFNX00XweX23cWPxs7VnAxffTVllZCNWgeMMFYtW+pUTZFvQci1E4gruyMVD3v2WX155ZGN1k3KwX5K08/jR+T/mQ8+u10roAzPRR3DDZ4nDbh8n4crvBrxvu8EBOWXCWzXeT4vhGx/yf1Y50cz6hFsCx47rsqloSyqPzZPoLLA1My3rKOSdgi/TdEXu2lWhYAsauP2eQcoL/TlGRhYJTUMoAuz5Z5/0cz9HcG7qcVliki+wlN5tEPbFlxvin5cLfjkicbe7PR2AyslQmY/DVhd48+Oo7nA0rq4k3QuZlqYonbThw77sKbMH0Na58KjQxFjomz9m+LSGNGENt075LqeE18WUBjhNPSFNYdcwuiIw4QwV3jTO0o/HW/kuaWTIheKs4abMSxAEqYH9KHkoP+GJd3lrcdBtk+i7pA9kyY02S1OOXjybG9WUfZnTkjwNYzE8vNPDeN9Cx8rjR0M2khcTg/1XwPNCwbtbVcWE/wcqfasPwE729v95ALN6c5vVOfjcKSktClvJu/5T5hJTdL/76tEgz5YsuZR/fCp7aUD4drXAkT9kJrFKGMrG8rVdBSvHxufYWYiM9peVYYyRinpGx3bLAQoSf6N/lOVoqeiPBwaLh0t8ztoOilq8JzSAEXKZ4oqsxi/hLOq5k3tpI2opra5rkYyeFEdCA2NfjgZPJkDnyQnMKAg8GqFFrE6/F+DTqDBOKEXv0EYb5ywBKGXYYzrfCZ4WDw3SrAkhymJOB1DAHoJT7oIIZhE9TWHVlfALlYhWTUp8xG+MAAGD5FLLTf+Nub2clKeOtCcXmt5mwEMo818HdgtcZPSTtxgjSpZJKTL47j6C4USFWjSuDfG80Mb1oKl7n7awWTefCQTTQCYlzI9Xf38xUvohe1pi4H5jVSrCrrVzFFTJvLmkpFo1zA+wl67LvBOMDaOGJKb2Xb74N25DLj39+EQoRdQtmKfEkusjp/4IMlY7JhAV5ki3H7DiPtWsnEBthnskFAT7OGjDjZv3391EvaEZAUe88euS4QDnc3pGotSlP4Oy3yF9uGWTUDMYNmVXQJ+EBHRMkn+6sJID8gHJd33h11ObzSjVNO+rydB5+m9JEB7U1PAx0/hffuapkym7ovZ1w6uk4iqZ0qk60uZm/VBaZxtdVhxxzvGLj+4rVLlTwCoKvBr1GX9xCJTu6oAZvSLumizd8VdZURqbEJN/+fSsWZrnQiT/fhvxW/5VVINgZTqKB9RbYf1o44pxOXJIHCK6jDCBcEiFHcbqDykWEAdzx1EpUaQwWep0ooHIQ+f3bQeFeU/mRBARMIDZ34sXR9sFCqW+xyZn0r5F7w+jLJkF/zL9VerPljfet9jlAOFTAoO0mBrAy70SgpUd6ky1w6oeRo40CuoBuPyhi2av1P972WiNmBRKzW1ls5eZecaJEioa6w77K7FpIKFnYvErEIFsXYBNgozYrCMsVZtODv5kWgFsfAPO7Yn17OqxI1lCpoLTpGVnPhOtUDhy8AW0bKpjoJvMDa8o1ZszEVBAKWeBBK8F3qT38r2ToPpdsfodtD2lXofShrGDtZ1+X+eMx4VYh8/ogSasDOFQXFxdoXhbOGJERSCDkodq3SJxp4L1Mk+CiYApbLQGXeA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 799cb002-29b8-4869-e9e3-08dc5f5e1b15 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:14:56.6909 (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: E/k+bmQ1ZVH0wXfGjEQmoyd0xat6E8rYvlZ8ZTvGwnh/gPRg2TjLKx2FopdFehHkkAuJQ9aDpJvSz2OP7vOm2j2aa7N77LdFVDz6/eHIB7/+dJLgNy2Fazc7NIJ0gktB X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/mxs/mxs-sgtl5000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 310e3ac77424..829337320d17 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -78,14 +78,14 @@ static struct snd_soc_dai_link mxs_sgtl5000_dai[] = { .stream_name = "HiFi Playback", .dai_fmt = MXS_SGTL5000_DAI_FMT, .ops = &mxs_sgtl5000_hifi_ops, - .playback_only = true, + .playback_assertion = true, SND_SOC_DAILINK_REG(hifi_tx), }, { .name = "HiFi Rx", .stream_name = "HiFi Capture", .dai_fmt = MXS_SGTL5000_DAI_FMT, .ops = &mxs_sgtl5000_hifi_ops, - .capture_only = true, + .capture_assertion = true, SND_SOC_DAILINK_REG(hifi_rx), }, }; From patchwork Thu Apr 18 04:15:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634121 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2067.outbound.protection.outlook.com [40.107.113.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CD7F39850; Thu, 18 Apr 2024 04:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413709; cv=fail; b=fzonIIlyDKjymPesVXhq0Vr1hqZK7fYf02GMUUZnP4HAP7Y2oPirRKy8vyZxeWV8FflbxbqKgah5Cx+pMKgZgH0amIAdyO5z/wYH7nv/P2C8cpullujv78mzMQUSKAU5Ry2CLrlw0hrO9vQ1F696bUKJbjAkxDM+j+TVDSlTFX8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413709; c=relaxed/simple; bh=wNERBcOaEDhUjVApjqfWTWSk0UTezlpWynxXl9cv/ro=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=VhiyifrLBOu1h7Hppns6XEra+nD773JvyxPmh+F4tX7tKNy28C/bGzb1cHP3HK7wcL/1TAuF/eeRkgLQDzzBiWEoacVCH7cN0WoIVzvuU35klzl2maaY1dMsFZasv09Cy6qkUMSIFxQ4bzRaWFwj14hFpY7JpPTb5knoCmSwgxU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=e/+rK8vB; arc=fail smtp.client-ip=40.107.113.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="e/+rK8vB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KV6OdjoxEaTfJg+IWQMUxGFa+Soe3bk2rGr1uvWMwaZfGE4DxJDgX5Kdun3cvlMSv55Wh3VTkzkgQfQgNXyLD9ptCKdpCr6HbxS9VCwGTC5JW3+2SRQowQaHbnQ27CN9XsebT62qAG2T74Ui3QTAlNTymwmt6nmmTuHqkdN2oHHegml9rtrqfoHaAJWRqTcXD0La7PJXveNuJW22fhyruDqg++HHCa3bb6bxhv5ATMVFkGXhr89gbLImWYWXv7bCtoa3CwqOYgXeU2gFaBNEdHfEBTC+DXGdLaxALKDY42DQRXCJTDgJp0lcl8x7mNsc0EjcYJSE+uFywXDrJzXWKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nTX2LEMs64/EALtb8tRbGa69mv/ttNFlE+0JeVztGPA=; b=BvQZM3212v3WWkv0VmOvFFmcHXxybNMDg+QB08bgcb4W/WL87pbgRW1a//2JSrCYOh5XpV/7aKfr9OLH5bp35nPpPeOJ7ZV0PZ3/lk/Cr06gnPaq8fE2cdkeZwN3cihk5f6Uc7zLGXAe6JrZKV9ttoZEbQE6FSpNGb1VKEoSqxVnrsf0WgXzvMYfariJ+/JWP9RW2VggqZsFazQFZInjgt7p2bmEef2UOhv9lJUhlkeh97awxDu+OjW+JZSsv5OKQ+jK4B910RVqbwXyfqufedvXBrCqJzmXUbtILAMwvVec0TVP+1sUw+BWlabarMlUHZ8Od+YBQEGL0KYFznGlGA== 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=nTX2LEMs64/EALtb8tRbGa69mv/ttNFlE+0JeVztGPA=; b=e/+rK8vB92r5s5Ff3N0QrboChahAmdZo3O/zgzfs3D+73uqbbuwHE9SjxR2upb0RHBZ6rUjmpkzC1QsoSMWJyD1yIRA0AuRHyF1ryMkLIjyrkLv2EwiElTKbT8C2QgZ8F5qyx5VaiWgZ0hHvjwPcJ/rADFAFHM2GetufE8IopnU= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:05 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:05 +0000 Message-ID: <87r0f371di.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 18/23] ASoC: atmel: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:15:05 +0000 X-ClientProxiedBy: TYCP286CA0028.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::15) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 5aafda6c-fa8a-47b8-02d9-08dc5f5e2081 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 38oHpDr14uehyPpfchvdaLV5EaE2NXNZESTJVPclrEIdE9XiDzvGPJrTGUTAx+C5T/ARwlg552eN99kMTxh2nv7ujmz78njHnhJ015gc2KsA/8GQx3jbJCKn/65skqrJVqGNcizxcOIfVNRAYh5/l22qsSmKZlC4uN5jzPtMfHa4kEHh7EDEh8CVf0T0YrdUZEBIHfpikigysF2MjH2kycPgu1gox74BT9HOIZ6jsywLVLv46/GUhidOzczTnVchYn8/MAy3GcWICmVmBuWP5wFjixD5H4BYlbdCsvcXspKP9TeAoYNcwwRQzjgMpcxwqEJ8U8/7Zy/DYQ0Ls/YqQ1AO5IsDG5ACSypmFCntUD9S0JSnNEjjK+TZ93J16kHTX/YhA8hXaeaqeU+QPNsuDomLXev/XF7FRA1R8j5lon/QKj7yS6EnoUrdXnG8N9yx2HthK06eDYmGa0wW426vbCYUG8IIaKWSOVxw6llrOy1veLvT6nMwcGMYZNH2JK2PzLHOUczMwpu+77KhZzcXxlBDVMxa54+l5kxsk8FvIxjrw9DdvAJegRxMkz4RrJQCbxnV1ot+tXZxtTx/RH156uMAKWuCwSxz/KknV57D6Zye5hkezN9IXEyw0W7F/TniXctFAaAZxRXP/ZBqi0JWOU8e48qsmVPNp1b0X944Ukrvw3v0tIbGCXyrCLvaIw26m6DC5ji7XFwF5l2xjhnRt+7UzFmq52m1dmGAx1hMNMw= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tyAS7Gkki1273+vLvrMhKYqhCQcPKRmlzaaEW2gfaPERQgJTSZzfhxXNv2jpVzq3uTet0Cyw07V/KPXof8JJyW9H0odiXjiBSGqZ7uFsFnFUJ/KzyZCV2Y8vRarVAwXCAI302KMuV3FD1g3fTf5IPibAaWVKIiZXKYsaNGvuDu9XULXVL3IEb0erGGKnEys98RwMExXceHSb8taNveV+zYlG/9w1OI6J3U8IImEWEAw+4A1qo1am8D1lCE4I330D78WthMGFPJv1x+8lsZwqcl3Sd8Jvyts07skT6a2z6Hlhlm6MWlpbqVEvqi6DBn0ZJyk+n3THZSdWojxRi9YEr5nKkNuO2x4SWSzOnrrcRO484IgnZWxHqkfvzH/HjPI4TkeFQqibZ5j8vmg7QQLFZZls5fE1iLaisxV8Eb08AKnlsBUOqGw9z6KIQlQUApgzjQ6SDT/SHjsBF6y/Rsp0SNe2cNe80k6qOH8laIlbl5Nrs1pYi+Djv72MlTtvgxzLDVD9cr1n8a4MgJLluuYm4wJUwXU4RGV8LNQJvk5GkfngA8F9zgHzn/CZmN/y+51S8OVzSNWzcTbL9vDHJiMVcaAtwI2fthOYj3IZMAfl8K9aa8Ets4fnkYJu9qjbVsksQjoC2XSBYK0gJ3bMRQ27rtDvqLBr9PIwB9zG/fy1Lo6S+cwKkkJNipjw8GNdimnDo6TclJO3mo1M+evneb1pwIpMRWTs3+vNP8Ov9jiftPx+0In1/Yfq6m0zIB7YWmWp9CrLLywy5bFLsSsDdJpSTrZbmggDGNo5ogjYbGFWkcU+x/AHWs9VgYEQj4Snlp32G0YKs58cLsF+kA8QWlET+OSd6jwDo7C+McA7dxBnJzWYBV8cX7W0uapagrTEyb2BZdARzIYdbr5q1lQHRm/IBzMTOI9LDat2x1hwQuCa6ExRLcmi9n4/b4jpQNFAoT0M+RAf7WO6jnmtqvUViwPCYeNqlH88UbKXhjkRJ+pJUph607CFiwkM7U7WqmYbzxmpmYdJnAtPeFwmc+scAWmW3f/dBKlzuAQeQ5Ox3vRFkizkaU9xWHfaO61zW/wsiaEQylR2AEqj9OrLRDsW6f6iZ+u6s48IUbZXAeZVGJKlm8TaO2KWzW+AvSsgDIFHWNZ7S0uZTvCHnGbLqBrVO+CvKJzI144W/ODZlzvPcfj0M1c7HgJrDFAlyCo3Iu916XaPY+67n1OvjiPbImxgGGOfziQOCx+7v/6VcDWvA/7/1jJdDlefD3D9Aa1A2hGNC6j9CF5uasvM9x1JF78GhGJgCifNOUSFpptgj4D3TTPLE3o7Rp0Yn/jUMyYoTSj4sVDgxXDo6MoH81CozYPIo4E5KJxomwb4AsrcB0Uur0kMkK+BYRW15AC/GDDLWlfGlp+IYAoN8g58MQ4OrgEW7P53HbgyIgnpshsXa8Wm2n1HRxa3glua72B9cs8h+ch+5+xSn2868Xp4/dRpHesTebCDqnhD+ZomXqyBk2k6OJM5LWS2sbIEYSQH1wgl+mzR058rLvqWSDIwue17UWCDmEpyK4ysnevs+T25MgCns/7xQgP4NISYMjYGCaPVkxDoXLWnO7M0JVbR4dTxfSrgqSBuntrka2UZz5chSDuiKbtp6d4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5aafda6c-fa8a-47b8-02d9-08dc5f5e2081 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:05.7380 (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: xqzoinWZi1vPWwmXJTz9+8A0qaEPhcUU4q0utKSzlTqnnd8sopuRUleit3auSV+75Hh9jGml4WE5s5N0N2tAXeLCv66ak3AmIoWZeHJIfGZwKxsoOaVJVAUIHI36DaiQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/atmel/sam9g20_wm8731.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index d3ec9826d505..264017d3cf7c 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -98,7 +98,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, #ifndef ENABLE_MIC_INPUT - .playback_only = true, + .playback_assertion = true, #endif SND_SOC_DAILINK_REG(pcm), }; From patchwork Thu Apr 18 04:15:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634122 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2056.outbound.protection.outlook.com [40.107.113.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9AEC54776; Thu, 18 Apr 2024 04:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413717; cv=fail; b=YDHwbGWs1ERGOBbbxvS0DehFZygRF6kytTg5K4KTZzQeRpVfSn9+ap24VA+NQOOJWselXvMw810QA5qEBWU25BPy7Wx2OoUMVt8teft9a9RWEiAHNbuJ4QoaAHOFK+vVxNKZ3oUlX5y8LMi+ppo1n272xzinv4f1Vof92JfAL6o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413717; c=relaxed/simple; bh=qcYzY4a9tVbIqSyKQZYyzVKaRVSXtC1XTW0nqd/xf1o=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=gNKealmn+G1v4sRiaffRhTuHLuQvfM1ZDcrUfnrJJ85ioWGaerWhSBzsKNOQ+vq/inDyB07Niy25uBr1PPIGE/BNqxDHXNTQobdSkKHYRn5YIgO10Zv7ANVv9vCqCHmakHvRtSeFHzcfF3wY+nxTYRlUFoAR1ooWW5CO304gKlQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=pZLjyj6v; arc=fail smtp.client-ip=40.107.113.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="pZLjyj6v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RgKqXSbkSZfXMLMOr3rXRkphIIBvik+eCgtud8bpKXEdasGLJf8jnA8L16yMJQiMd6DOwhyHYUxLvCilSbzxu46Fx1MpzyxionXZlJxpdJYFCT+Y88tYsiLvRI1DlRnCyUq3qp+CWaHZeFZU4wzQrQZPNVfJiQ63j3/SxYG7SNUmrGhiYUjCb7Sw0EYDbfA6/hhWFuOy3inYdqukpdcXGkrLrqLyH/duGoAMh5VsqkPNNfADAGCHc/4blxfKcLoVJK+OPzwfMiV0AyAWS6HA2a8mhz9CUS8usp+h67Zx/Nk8d9PaY/cigsIHo6hSJbE1Ed0osXB82tnGY9wWOe7GJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=k9PKZ2elLyKF2hu4yo1yAX3p/asCfWw4MF6E6/ASqEA=; b=aaJSmpKJaQ8NRij4nngdLG5qG4kEd8dnUEzLZSuPxibm9QBKoyzFqEh/hxonwpnlq6ul4Q7cF7pxaFBjlG/0+exdeuS8cl/F3ygxBQwLGG6lpuVh/L4+Oyit4N9GHlpHieazygVSUTRNssdng3sczP6mYvcmnKOvVmZqmbuCKtASpwZvxWTtLScluanu2fs63jc+eyo0hTtez9C9CoFvVbtl5i4VU+rGqI39LxpUYlpk9BT7sX7jI4AD4S99Hq1syf3v7EUGL1hcVEJUTnhkh5WMXefbzYCkS7r1Xf0DIKXNc3Z2Nxk5RWyMzuzvmhiLQCxHn5XN0YDC99WDQNgFBw== 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=k9PKZ2elLyKF2hu4yo1yAX3p/asCfWw4MF6E6/ASqEA=; b=pZLjyj6vavVRRf6sYYq0KaykTVmQU2wCy1qQDoE0Ma7ycxR3SPuhLMSQ8lgY+7/m2NvEwCg8uTlu3b56x7EN/Bkf2P+Thr4Buwf+udZ9SxbjPvjpz8yveRbtQOTtVHVuyiOM3F8pue3hkUNEUrS8sh6ALSWbHLmVvTTyiC9U1SY= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:13 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:13 +0000 Message-ID: <87plun71db.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 19/23] ASoC: Intel: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:15:12 +0000 X-ClientProxiedBy: TYAPR01CA0094.jpnprd01.prod.outlook.com (2603:1096:404:2c::34) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 37115666-726a-40e7-6404-08dc5f5e251a X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x+x1hBdcFrruJt/iTqCvinFEJ6zFYbCY1/vrW9hNXKcCH59ieVnqUo7NA6hh5e4rgQeES1du8haZCd2umRl+Urk3/Dsw73EeDJYP9LglaBCrA4cSwAjtA2O9t7ddCTZx+zdl/HsMo9KFyH/eKvfIJTiiNpDqPcYPvKcm/N+tvfNMRjy3MbsH9lRLIZ8Z4SzSbha0vF4vaBiXeo91GiNW3Zw/G7HH3GczQH1eoFlNJDYancmuMNy8ldGhuNSKlvbD0sulfllg5Ni2DkI6lmI+6GXubhKBgXOEp3RsoTMaF7DB+t1YGFlZ2eDRb9LlQbml4PKLUfeaZJi4ooKUaLDMH9wx58BM0LdsCSXzchC012qJ80O96b4cqC4MHvln/+C02Tvn2IU5Bw8NyyjbDCmC8QcabxV77cmsf3oTsJU+02gQC8BFIrolowjxWGk0iWiDOSFcqGJ4zOd0g61Pe7GbXyULEAgzBLmmY4MYZPCMobrw13q4Wzkxi262cwzKMDRm3id0Ohi1MvGkaaX/tY9zMvqRffRh7E0oOd6+fSC7O0Sy++KPMtEYavwqSKqd9baqFa5V4UDfXaiROH/X1Xws44A6mKdwHxsEPpPNLNsj/n3KLJCchEUFM59n657Fwg51U1AHPXyV7rN/gwvXsEw8WXxUAWEyIqA7uPCVU2ylIxjmIeqIvqGSRWLJo0Mk39vXIncvc/WEqkvNc/p3eL8FzomBkplU2vXLZSkLiEkJFzg= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wb41igkdHRjeViaki8VGTjh1beBJOPouuWEZZALxJfFZjGGxB8jMPszOmVSUIqDMkCfc03hZSTlg+O1uI7MiVhHl55/BkI4LynZgpqlAgyXcB4dLbcvlM1WbFhn5EuQn9dFmn5e3kgzoHF5kE4RMQxmrgSznXhXbkWjPyjabYefmMpTRXJh5/SZGSTkeYgjCpm7fPosbax6C21INvHaVr5Rpn9ttw8sQla4ta/zyab2kt47dERCPsOoCa1lXto4oHk7e4uD0uLU8OA/OU3qpFitKtBeAwKP/ACdnJslm/kRm5QoGfYFSNdlHTp2es8vidse/c7SLcs3Yy3kIndyjOhxTx4NvGWtR5rk10U6GyrSQOztYDlPtiQKTmV56uLFs1y1PEfVhrc9F67l1FulVzoCjHllE/BwtChcZu30bejb2D4YDD2TY8R0fAeXcg9skwRFZUsTB6lhEmp1AH/qD5Yc1MKaJ1/7nK8evaaQykDaOYHAzZYq0dghgI1HuLW4qlyVXsQ80+YwDoLydRKzkOn1Y4kRDjNvatyOe+otXLUXW+WZ7HkbLoxOWY1d4qg9NsOo1vZpCXBqx1P6IbDCF49gFPisAnpbKQLNfliADDcuKbVquMXQ3ilY24D30/kme0HzI0vdprL62/jP+YAcUgU96Zg+UmG6D3xx81TlA92G+LLuwXiXLrcsVLqzQcMSLjS1RHAuCfE1FOOOEl6u2xgGtYYUiQf9erQ16gcJhALuMbP/VEOFUEZi6ylzePyMrs8B2mCPxzOArNFKGw46ZBOKPgHO9kSmWrM6HI8S5YDjHV2r2kT1keE7C8d6aS0JvGrZVAiRGqWip4bR/R5HC7vmJCNHsugkAqdakqG/Qm2XiaAhMjzDF9N4mQgwajnQ4r+QnAAYDSQqqrcHKH/9WmZg6YgDyCojoEvzbJkhukNNuvublTIr7rjgKoSPbKYsLn8dv103xo3lYo80qjop/y8qBCZ32GHcM9jLeY6+dFllKLnn/7LwS5fc1fcwP0HfEFF/uxEXTnnYX4hirrByCG8KuVgmaUXvLBT72L11r9wD2/ttjA3YExrI3P7OgTynN0Ha7GE6boF9hA3U5PraYXe/1EicKl4iq9HH6BdLado3VGYi0ImRo6NOYwwuJDoIXFSDY6rtHXXOL5Ew3yNPRr07y1J4DrJFPKCofTBUgcu6H0HT9CY1lOKWLTouvixmMRC0XuMaWANeqrqxlMd/H+Rul4Iut0koKopbYd8Uo8Lf+ON8JVa75sv77w2crFjFejwMlERfPk3m0RwUNenhsyoHfe1jbsciysRBbX+6KGIxPmK9Et7ZsnyXK4Ps2vvKGhWpzaRBAjQRQ6f2GD/iJdIZ/1CTBLThBdXY388PcFxrJb2lCgT624h+rwvoG1Ck8kz70G9tjWQGammbZjKF6nCe/d77K0dtYiAqBjA50Tq/CMUSSTSfcvtwebKMYB9A0A/QwJOg7qgALIpq03VxjAsS8/DKqQVEAELqwE9raYzn6kbuC3LJDECLsAb9+Fz4tpd+lFpY4pl2ZSxbQ5LajNCmTW5Y1jRV7xVg3pfB8PN/aFaeeu/yvHxfYPcEQ7mZIPL3Ko6YRxA1L1368RXoRjG4EjrLimMWEdMpRvuAbRmw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37115666-726a-40e7-6404-08dc5f5e251a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:13.4684 (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: Mv5fDwlMyL3qiX1dYvjpr+Yzjw8QGCl9Q6oumYwAH+Pna4j45KibKK6z8CQSs9DQ93xAhP0KYwE9OCzTDUM/cHsdGejWcsumgMmcQOTfmn5z1zlvs6kVlJU4TcQFN6nT X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/boards/bdw-rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/bdw-rt5677.c b/sound/soc/intel/boards/bdw-rt5677.c index 54e3c5d3c251..9170b1d509e2 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -339,7 +339,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { { .name = "Codec DSP", .stream_name = "Wake on Voice", - .capture_only = 1, + .capture_assertion = 1, .ops = &bdw_rt5677_dsp_ops, SND_SOC_DAILINK_REG(dsp), }, From patchwork Thu Apr 18 04:15:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634123 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2046.outbound.protection.outlook.com [40.107.113.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FDA554775; Thu, 18 Apr 2024 04:15:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413725; cv=fail; b=Xr3RwIWt7UEquqmRB+l3uCKkh7WByIlRwDkpg8SPyuVEdIzYMFf9XpPTn7yo649dFNhczVaJlICed469v3kw44d8RD+KoR1iqByVpqkdyyd6Cy/pYVW+chbQSDWEnfQyeFRcAmPc48RKLcKJgiIoWVxwT11YexR8MeV5/G3VD94= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413725; c=relaxed/simple; bh=LlmqsnNQQOEp3fF/iwiBkctVgtQXIkrh19OIwqkeM2M=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=HP3IhHy6nnVSkwSQPux+vXPFzXqz5KoDWsEATA79DkpNvpxbAJjT+b32HoS3OmozSx1usEeRCliRCS3g7ZVDqsRQ7PlIEE8IZxbw7obs0/4uTZaIFRZ0FlJf23zeT87HMQiL0EBS5tqnRTeEb+F51NVvlWPGqXy6TnawC0L1wn4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=TOVtr344; arc=fail smtp.client-ip=40.107.113.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="TOVtr344" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CiCJ3QoZxD4oXzhygIKoYShgj1E0ajQu598SoYhwvG+0iHIZQBJgmqHTRQx+e/IQz0Q0MBdVXXbZrvoyQlfHGttzFUjSKxIg7xFKuVHJpmXfJnWiKOFzaUTWPfs2A8Tb8hkwMz1s/RUgjdFqcaSNbgSoVqJr3mGzuQ6OqEgymYkR/OWc6DcPnMTVOHqpAYHv9cOIGr5uU9S7e3lTgSnETvXMWH0VmGqhvQoX/MWi/hEuK9owYZS26FX3YUFKeBZH0i54flmLunJazGCAWH6114wfzak98axDFu8lqFAekJfQv/C13pu4o2IMLBV7c2HM06d1wzkdFmHWO0mH/tTFOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N+oJA1X/01OXatMVyFj5GewHkYkvWPE4j23i9nFKVGg=; b=i5JExYBGLujyvwTz0oxPDGTdSTxW7rlznNx9GFdi38vHwhlBuqX6ZURGu7S1Klfq7Zca1A6l4HK1K+1QH2ceSljLpdnq5o0BE1WKtiZG+pPHIEGgUJuGY+AyA4b3rltYNPE2jupXIkiz+O59Vy/IRoKdSPj/v378RMElvfMDBQs/gsLNgArkK/GUvXenbjN5SMEsM1wOsgUrzvNEROb/oPv1sNP3maGB1Sp6sWu6jXcPqbIHD9F42Dyb30LMOWNH3+yicHk6gzgpt6wHFqU822Q7G4T9mwK7rDrsqoxC9kpCi/ND9h7PjCpfOcC68ENUqsE/EtcwG96Ar0BOUAN8ng== 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=N+oJA1X/01OXatMVyFj5GewHkYkvWPE4j23i9nFKVGg=; b=TOVtr344IxfeC5S4y/oh5iTN72MvpxkGGxxrlZa9mInf3prIQCcvjFMk4ipArIqlTEQa2hlWzh0zZj0jF3mZTou74sg7x51JAM20Q2lrK6GIX1eAh8+ai3B0XmINOmezMTY1j5MFMV46WTNxUGM6ODNJHnnaACl0FXzipCq4rQE= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:20 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:20 +0000 Message-ID: <87o7a771d4.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 20/23] ASoC: samsung: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:15:20 +0000 X-ClientProxiedBy: TY2PR06CA0024.apcprd06.prod.outlook.com (2603:1096:404:42::36) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 8de798ed-9ddd-4d41-adee-08dc5f5e294c X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eYoFoY1aZpSYFdjZ+YAzJeCyTokRhyQ4wgDXjAW4jVD1Mgv7tM/MZ7Uu9LoMGc1EW2RYnELLhnl3BZbglXf0c0TtfQR0xBQIUuco0yo3Uyo6WjVN1MFJsgQ9aGcJRyKQjkkRf4gRunJbEI+lZtmhCychg+eY82D1HK+uUBA0TM5bSuCeKwTJklAey201XffxleHJXXU7JWOF/zC5M/38cA5Z9EudWMikB9LtXtz/5WbDphsDLaBA8DMmf88lJ+izRoIk0l2/+kxNxtSAkvI5XxNLRxG1wmNeo75lu/4wvdHkBh3OG5C5QXFtyAAXf+COW8o225nndf4WtmyfJ5DsQXANy/0WQP05o1Ocj+fNX8Di6UgzqiPFMkxOGZL57gC00XC71UcbhpVXtysMbRZo1wQtEROovptMmuB63ET0TcKtFAu3pe6NXhZBEcvXV6Lly754NNzd5qaeI4Mwpc3XZaSNjZI1rqy3MUF7LmBhZF+dtR2i+Db7JLzqKpsfdzSD0O0doTIVZl/aVAUuXRFBnU4TDb2zd5VaYJJ+1USEk75MTWIt/ec9isTpyhrxrWlEkY4KmKBdeKU9tc+qNAa9jKafkeIJIHLJj1nDGmh3qJ19YoO90+cfmSl/diMC8acg989cwdmcv1Dq5OBcDHO8b8nalw4VYQInQsjcZumpZi8FXs7knMKbAr3fA0wcS2BZDisT/c5Di8/ZtPOJnOl6ZFeMuQ8iCVz1v0hJoykGHY4= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OP6t7IHuCJW5wQjylEabbWXS121fDYt91F6pmO+uVL0ZYUFPsBG6sbTX84yjkmOZbNGil61lKbajf2s0qr21SQHhfI2xLGXZAnUBMS2kUf5biVHMWtLHgjFmSq1ZY1h2g/T+kX8jv1BMttWPo0dHRI1awM/LX6Ze8wa1dTNpsHwUOHfjGcvouB2g3ulrIXixkP2+/lpZj+vixcr3cqlQd6T9o1BkicsB5wMkDvwZN2PZbISJXMIvbZMultxODZeHXHFyC9QlvHNXSc22Nb75vCxnPMxJNRK4ElYYvGwlZLQDCcPIv9FrkC4cDDMawjug4JmRrtlyUHhMCYTk1QSnHzLS8Ez76Iu4KvhIOQvNB5ydevKqQ6nosFk8+dekb9MOZMPKjbEOdqNUSjcrdNhspap27VlWzRWYjalcjQwcKyw6b0dYTUfPvvn7CFwgNQMMsfNusfglcVqnY4oJJ9VfUZLFlHizF1IXNLy49LPkDnuiB4sKHw3P60sxXfJru5oH1D1C8gZDnPm41n/mdhYbzWJcI58YPZEdgxZHT1dG1c6yl+QTXxW8RkdIyJmBYgUtqhYBt08pvZLfwqAht8cn+0pbiWg1/9qOSv6BfFC2tBBvjR+VOiflcyzOFdJIbbiZ7WoTQW92aXOG/xy7utCs1ytI4bKXzLlgRaCUt0knMUL3Rv0jCr3QujZwZfrZxD3U7ap/3BLOtHfrjp8UdpmYa8H+2FU1cLYU0kZjoH3v+Nl752vqkc+Bfz2qOkMyiFwGTlY7NQvGBWqKyA0+UhKoPiXsHBX/uw02LaN3A7v0veyyXadiRA2Fky0/5mmaQQfmB6C5SbhNxlvy0zUR/S8PydNtlTwpQaRfEO5F4xzhPrFmnUtHi6m+UzYJfqhjz3orx64XmjqrAp0prUfDFl4g9iUV/njecpvgwLnN1zhPVG5CYkoQMfUZ9WrOKsCo6JfDRoofxKLnqGyDYhpnR6ALKcoIc7aghWnX/WdTVldzVcb+FpkI+mt1sblGjUm+DSLa6FQeT4GnEGL+aWcEWsgbQ8jnMrnEsQg00p2lE4Q9iSVDGGMRVKR2+vc7JLxLc+ddoTyG7FqaY+c5dFZwb34JubkmtcJIm9tsSfS3tht1H45z2H4GQYp5iXrPjGSigXcScYDIA8ZrKxnyWzfGkUoalRf7iEdkUEGY5qb0qjeloEPeHbxUcPZSP3tz92OJ8JJ5slyfEfkgDf2vn+y3ot7T0kXv9q7KNbmFmI6zLkBBASbbnuRZzpdyZ+Oy9tSwVdc2zOaN5VgThMXqxG8KRXt01LxPw+3fKkagVb7sSHOGKqjv9izy0wSGR/5PqlNDWFKNjnE08Cqm6JvkJ82WZYiQitikPJHv6Wxt8IMDlXHStZ+8s0v821IgwmltjdMUBKLtnuiLq3jDzKCMVe060o1dHDHA/2j9qbZBcaNM8wZBEG6LjkWH0Q0RIjsb7M6VPxXuHWdiObxRm6r+Zi2GI7d830Lgq+03dEn/ycQtDO9rOeW6AyZejB6fULvhyhQSFy974Rk1jlqeSOemtxOX5hRpU6Y1BIgGzu9iZyr2ioj592nVJ7A07KTWh2nqGwvAjjHCnUu9njzm1cAKZUt+rsxzK8WXtNUlhx/gxBy3KYMj7z0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8de798ed-9ddd-4d41-adee-08dc5f5e294c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:20.5296 (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: Gl2HHbxQvCwkOfBQ2YXswq/G4mtSbzpQnnnuHTg01rzudXKlq+avT0OLVTGqI3cu/pnn/9c1v2dGpshtakNipnNJl++ruZ7I52uxZxVX1OiNrN8n64H+TjBFLbdrxGRH X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/odroid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 35b284897d85..6370122b0310 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -184,7 +184,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = { SND_SOC_DAILINK_REG(mixer), }, { /* Secondary FE <-> BE link */ - .playback_only = 1, + .playback_assertion = 1, .ops = &odroid_card_fe_ops, .name = "Secondary", .stream_name = "Secondary", From patchwork Thu Apr 18 04:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634124 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2046.outbound.protection.outlook.com [40.107.113.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0BCC54743; Thu, 18 Apr 2024 04:15:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413733; cv=fail; b=RHlpLY7wvTeEQPHK5LKSd7EmZQ47ypyycCpMYBOnTX2eWpOnahWJf80mJ7xA1q5mSkGKfxC6reZXGXI+h7hpaNe/XEa6IAGjZpLBgp1X9IznxP68IvwABa+EjGXDFZ9ALlfRXSK8T2LfbzsShywIQVuXB6G32yxD9kdXZcOZcl8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413733; c=relaxed/simple; bh=gpSpG+U0cb9Mygwo566jjTkKPkKgSqqIclxxbdi6BFI=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=neRav9BXP5/TYCr/j6nvGMFrbuKC4mTAQCXJiGas0q+AYWgYt8jLXEyFkIQJYVsxVkigsWUlzwIpljnUxWAwbo8UM8UOPPUss/eGpkgCPqIoPJu9PSrsQJauEygwLbNrFE1uvoW1Y27GQJjwTMk/yb9hVpY2JG0kcrqJ4gsgvKk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=LkHQnqkF; arc=fail smtp.client-ip=40.107.113.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="LkHQnqkF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Am0N7inAAgVWo6cc4cUQeB6W+tRewQJuMoDGB7BF0VAbaTsgUr1fZUN82HqD/NRux6kaR7YpUX4T67YKQ2jb+q5gAfxnt6eLfWs4BE96q7qp+0jr4PJ4z13Zu66SzGXYH8FlmZZ0cOrCryLZvKDesSDFGPooUCzt2cGAduct7WJ/7omAJ14cc60jmkD1DeKSCj34xO2SMIqZ7ZFl82FaMJ/+/0jlGqrlBgINygZbU3NkTaomSD4vRhYAeNaj2yow+KCChMtJwHduqpDFSP8mrDfzmzEvRMh1UVpnsXgNnMEBNde0VXYY5jX7FjDCC6cSBPPYoH0TYAKYimr0ordZhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M32q7kxBHy+CNmGy5HKB6MulJCXyj/IoK53451u9JxA=; b=OlKnbgDvD2Ty49M3vcaZxanHTheSc6dzLvHi33JjUu6een7pQduvkRmG5ApBpD8sAjfOu3UGMCkD/biDyjmoR7ZIaPt58zV7R0SVY8+NyXqC0qCl7YfgWKsuwpHKRhTqDgqu6SLpXxnWesj8iVNLwyNx9UGDRi1MST0iDngk7z3ItqpGoE9kuU2D2kx/v7BzjPdTvbnUdw5H8sEFTmOHPNgpz8W23EmxVIt0Lzh51NR7Nu1NlXRCILXa0thD9dtfT++SHYDsSc9nK5u2dOA7HXMQoDz+c5/bSGlECNIWNCNQc4xKfwuBABpPSTzf2/VTiKCUIDt83pal+GLEXlnAhA== 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=M32q7kxBHy+CNmGy5HKB6MulJCXyj/IoK53451u9JxA=; b=LkHQnqkFTmnlKOUIL4EUADHdMSaxV/0VJn49A2Ak2Yulwbw0eEHBqUM6wSpDwVsH5OL1L1GTnwZd+K6VHY+h5P/5ufFUn5P4buoGpxncWXzvZMcNiBtB0YQpEh5AILwfH3iyXd3MyR+hNJeaNfMBtZr1k8udPOW3MJTBuDr5nn4= 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 OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:28 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:28 +0000 Message-ID: <87mspr71cw.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 21/23] ASoC: generic: Replace playback/capture_only to playback/capture_assertion Date: Thu, 18 Apr 2024 04:15:27 +0000 X-ClientProxiedBy: TYCP301CA0039.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::16) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 26e8068f-3b2f-425f-c1a9-08dc5f5e2df8 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IUag9ux0B+mtJ3Tv4G8jIhmf+bSDHPcvgZ5UBYngxkO5XxCM/l08LWl0qJmL6lzwyv7fzRJQLISdc31UD5oTObjv0ru086vAXT95poIkAKzwOX8cbfSWf1kaAeXvCsV3wTdoFncPMwV5rFW4PpVTpW8VDv1YdjMw+m3ghm//XrNwsUMt0ZcFMTZjEovraZCc3aPHqsboynB0zYW7g6/kIJSbX7GczZtgNi6c/h7ct2UDHYxtvW2wDikCs9KpILhysyt36Bb+X7ba1tNK6dQ9n85TwjBuU6n9QrI45tQJ/GQ/+A/Jn75ySyRiBfdMGpcN4vlMfqwO4aOg2X1wjvNppd29JgjJj81zD6C9bQIt7uuitJPua4gVXYEK8IEZPbL3nsS930eAoCu6NbFgtQa+e59mFsblwZnAxgf1+y982oklrrq6ylCSEM+nf2E3G5MdJe0j2kcu/Tvcg41WBusmM81m6KwyDqxYnOvqk1a6hgG/4cfAEHFtiAEKLvZGvS2wkSana+uvPIIsZyuRR+0U2hjM9sKi1XPqY+XbPCtp9PU3rgM6FdzijuHcakGw3OiP/sTT85uETjs3THRczEbll2y+32J+plRK764o7JrlK8n2VT0J5kxESFKQe13ZRYznOPzx+cYoGycG3UkMNbi2SrK0qShG9O15yEcNN0V9WPOqHWckk0wG7LQUTVKp0WuU0yPt2GwPLCCO9jcTpbSKDe4KHN8nuoDHPhdSNMSXWdI= 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:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fNN1STNYHZaVovauQeW4DQV7Gc/fKmAGe6wN1+DK/UH4h4VBh3TwGRLdWvwUeTVh7wam25tM9Ptq1PJOuIRkYi+PXxIGQeiK6Re98fDVPm+U/RhZFTPK73RU5Wty3oud6Ij6eLzMYlDoXIqMPjKYHTYvPMn0PuEsebSd+6DM8gKDQIgCFgrE4uxeqL1EWm/cjn/MQyZIq2yraJWTpe4zIXrUeFN3Hahkl1853reer71Gd4P2a3gs+KWgt5U/QInWRpk1w+Ry+sl0kneIGSa4ldIW7LPYZtQ1cms6s8c/tW4o1/Kj/5EZoW1klRsy7fyExEza9/2WXvrD7zjklbX3HNKSa1DDQ6Hn74DEJNyCFapvDKaaxtWsQfWjyBd+/YRieUiyvALfred0vQXjKkGZJY3K/ne2KkyCwPiRepzcUZnljk7xmwHzL6b4Sac3uCj/bucSbsKrJCa7yT0RBi4s4QGE82qXClZ0GL4fl2JhyPYfnFaTN2RHsC2TaB/uFF58YyyKJFab3oeOyavcn8HObXd93JlQT/Qoh+0kkgje7P8id5p7PW2wR6l9IFOix2QaM5BKA03RHIaBtM39uFq/JWYb4yLMRcplGycI6hlaUBz30B1xtxjThCy308g1GuRFCmaA6Unu0/MS5SHOtSA71UEj7IY2/arFctZOk3lfSLb41NPEoF/4AO8aPj8OUirXMjS6ad2dUHJGY1o3xuik0tIquqS5sl91KE59PcOP9XPtjdm+Qror8R7bXBcdwwTDhdZc2P8LpVl59ep7HNA2ckuBYZxSDOQElKvdZeXJUMaV21PFvb6DOAIhn6dAhYXztJ5szf3kHIyf+iykEOWr1qebOF3sl9jIkp5GPtz9J1yY7cYJtDgX2P3iQ0Z4JchsrEEjHTCYsUNuU+68wiEEFtxHizYm8qd5OszEDH4YN3yGjnupM2z6e5jVlnLWUacpI4uGh31u3Vjphe3ZpGyJ8cRF9qruGGN2A6sGUJunSSjQf/iJWEHQ6DFknD5yX1jBCbVR2db2YkFsxltIkqCQzoWP32AXX/ro6JoU8/vBhLtRsS0lpj8neVcZfuADqxES6f+Qdajwv7QLmnomEN8chCosvUfkzSneazV0WexAzcS04dyIxBlgfXmpSoG3mEJ69U9Y8FoKUzMdTZu7Eo7u72UbEAqWMBAKE0eWDUsoeT6YBWl4BxwTF/ldylpn+OtIq7TYaiSctbTs8/a6+lZu4GHfnDkhgArQEyBrZJfhx9cY74SWZebAMs6/vIfhLJn4e1s5XdOmDU2m+5LLxU4Z16uH6JWhawScK4y5l64yUtfEZ77SlLi4c8XgAhRkSElYG9c+HfNXbJYkUTEFY3NrL2+8twpBem0ziFBS9fpQip8u66320RDDnS+1U/TuuoRTliPD3wn8RS9GJhVpQZe4dLml9ZHbDajkuF7/7366teUAzOwrHW/tqidngqUHiRzDhx+mHw4tvQeIw/ItaNMsqiGtidZX74dKU+ZRHlzOhzj3MBKjgk5ytOGw66gGR9dcQ6CWMGS0FjUdiKRgzmJ+A7WLjAToItAMBHRVhn+R1+6zcsTi8yl7HfuPv7n7Em6ryFvDHvOKRUbon1j0smkWBd2D3sGuBX65xD7nyt0yaI8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26e8068f-3b2f-425f-c1a9-08dc5f5e2df8 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:28.3576 (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: 0F1gMke9ghPbQv4ByTfS8jJQMRicOsYLy/Cc/QMQglQ6nN8iBhHyJ6D3jYrVjU3Drr5oNqOA3+CHsN3p93PveNBLtMvnUNpudERmNT23lk+UaEyh/U7fa6+ZHYHZew0T X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts xxx_only flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_utils.h | 2 +- sound/soc/generic/audio-graph-card2.c | 8 ++++---- sound/soc/generic/simple-card-utils.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index ad67957b7b48..42e464090cf3 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -196,7 +196,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, struct snd_soc_dai_link_component *dlc, int *is_single_link); int graph_util_parse_link_direction(struct device_node *np, - bool *is_playback_only, bool *is_capture_only); + bool *playback_assertion, bool *capture_assertion); #ifdef DEBUG static inline void simple_util_debug_dai(struct simple_util_priv *priv, diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 0d2ac4c9ba3d..3007b95eeaaa 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -759,7 +759,7 @@ static void graph_link_init(struct simple_util_priv *priv, struct device_node *ep; struct device_node *ports; unsigned int daifmt = 0, daiclk = 0; - bool playback_only = 0, capture_only = 0; + bool playback_assertion = 0, capture_assertion = 0; unsigned int bit_frame = 0; if (graph_lnk_is_multi(port)) { @@ -798,10 +798,10 @@ static void graph_link_init(struct simple_util_priv *priv, if (is_cpu_node) daiclk = snd_soc_daifmt_clock_provider_flipped(daiclk); - graph_util_parse_link_direction(port, &playback_only, &capture_only); + graph_util_parse_link_direction(port, &playback_assertion, &capture_assertion); - dai_link->playback_only = playback_only; - dai_link->capture_only = capture_only; + dai_link->playback_assertion = playback_assertion; + dai_link->capture_assertion = capture_assertion; dai_link->dai_fmt = daifmt | daiclk; dai_link->init = simple_util_dai_init; diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index b4876b4f259d..48233f410348 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1127,7 +1127,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, EXPORT_SYMBOL_GPL(graph_util_parse_dai); int graph_util_parse_link_direction(struct device_node *np, - bool *playback_only, bool *capture_only) + bool *playback_assertion, bool *capture_assertion) { bool is_playback_only = false; bool is_capture_only = false; @@ -1138,8 +1138,8 @@ int graph_util_parse_link_direction(struct device_node *np, if (is_playback_only && is_capture_only) return -EINVAL; - *playback_only = is_playback_only; - *capture_only = is_capture_only; + *playback_assertion = is_playback_only; + *capture_assertion = is_capture_only; return 0; } From patchwork Thu Apr 18 04:15:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634125 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2069.outbound.protection.outlook.com [40.107.114.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9818F54776; Thu, 18 Apr 2024 04:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.114.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413745; cv=fail; b=PNmrpMreaxm/LsLux3ALmBM9TNTzfqV7h5p3IAbFm3PYGDGCpeaI04YxcyXSY1UZm+N/9Zmkr/npZicRJjhbVRbCblYk2wfo8fMfyRAcC/uWj3aMbu0F5jhq5eC99xw3OKMqFddhNypkhfuD3Qp/I7IoSs1uMm+waK/yw6koNDw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413745; c=relaxed/simple; bh=KIDthD1JiwM32XqCndudSaNjkK5KZd9LtKuvFi3i7gs=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=jvm4bTuHEV6NNs7Uc/Hws7tjx5wzfvtzWzN+MAtZr/9+k+8mDRC4zGfohZTwBtPuwP9RN5etZ4TkY0HMYEPAsW7e5gihpEXfIqe2z2u0RdEDWG+fIqpYE6z4z3qZ3S+w69KNeMqXTBNS/eIr0wgyVOEwJzH1n9emZtUgNC14rgI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=MJ5G+w5j; arc=fail smtp.client-ip=40.107.114.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="MJ5G+w5j" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R7zM5Wr0QvVOAzqSLhZHjSd34jgXYrNrZ+bnWhlStYZNwUv0A1UNG7O9wpK/f0XNuKYPtUJptWk1U6YqVq6yJZ8MOLFlYCy1Wufq7vIExUd/FvT2yubx4+w7JFgtLVuZ+2wkislESWwr9QulRPYgs/cmG3FR56uFQt+CIHcsgocGOR9U58nbQFq4+lVX7Nob069WN7kuLSQTOJvO6Ch9MakUAIZyfGdBjPrNLmQdFAfD6F7B3IaLl8448A83RQlaPE3EbaqvyCIXc3NayADEDzn0wx+HSAvAopWGDDcUIk9IHTb2GPdTSIp6pGhKgVzVi/coUG4dvL3TKe7cGsLSIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hTjMEaSiFKMZZdhs1cDCkfMy7kNOvDNlZqjLa03lFvg=; b=AN67AW6gtXokjkkCqTRCfDgdWMzPG3nafW8lSEkChrR85Newr3qP6HE8xKI8UuNisC5UbLrBxWW+rVrcSL1cVUHfsF2fZpMlpsNG3JJ//7hbDIDFPDKzjgZgUWMJTTJJL4fEMIRpeTtUikVyaSY+4z7AmLgdHGWmSoW3Y143TLPFkh0zd/bLRlEX+QGjUOnUQYQdh9UXrn+IbeMPOAtAP3MGE53Jy5fapJHG/Rja7Max8MaQXn9LZLVcQcPSYoASd3rXGYE1wcV1RS3/pQTVSNlP9oDdfihpdTkSyHfVy15XQEWp0rfB54vqSx2BBku+IjRC+W9WeEdJZs+cGV772w== 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=hTjMEaSiFKMZZdhs1cDCkfMy7kNOvDNlZqjLa03lFvg=; b=MJ5G+w5jWb4mc5El0eybrVkGLkcRHlEs4U5lnyKyPg+hfM1MOXGHUCUKPCPUQxiKmAJEUmuA5TfI6ac8TmRkmTA1PKC/9KRvR763K5/TbPA66Jpg1gNtGloyuGXFD+TSLpKxyL2R8hmVqfEFsIoXutj6fIODrDU58aaGZlKHYRE= 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 OS0PR01MB5379.jpnprd01.prod.outlook.com (2603:1096:604:a6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:37 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:37 +0000 Message-ID: <87le5b71cn.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only Date: Thu, 18 Apr 2024 04:15:36 +0000 X-ClientProxiedBy: TYCP301CA0001.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::19) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS0PR01MB5379:EE_ X-MS-Office365-Filtering-Correlation-Id: a2955984-36ff-49f1-e2c8-08dc5f5e3323 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZNhQbFzBgdNuUTt6tFKlQ5JluEVySXQQ5GFL9k7F5OBcki4U6XuWd0QDsFlgGn/7f7RM++sQuOIXvADw972yFUI9lgjtgJ2aWNayuY4XSlA9QLUwJqES1vPHXXDLgSp/Bh7Hqris7tleOj4qOYbtO/KZGUO6+bTsV3+TwjAmpAG89GHkMaqcTuAflpa2pSP5H6j9fBEk/WokfdQ9e3bCpc32T8h1pfLRfHWNmEsx3AO476bszWFzEEN9bqFSJhRFSZcHw6JHwPUFTg2L3+/s+q2fUyChN9NRwA8yaTxj3DrKgm1xYxHB995JD3bsreF/goJdUd7xR2SfbmPBOZ4FuHaYAx0HKcZGoZrEUPdcsibMFYf5qhYBhnonw8OqcFpQT5mQ9DD/rrpiXt1gnWkHJlPBTRO7yTdJNzDIf35V/4LoIR3URxWZ1jHxeq6hxwvabAOtuzgYp3+nSRjMGJAVt7+fp533I6FzNDxMi/lsQc62APh2/0DfJ3gHGsl7Ca2FjjSGz/c7nPRrhSdYCWFr9+4A1C+b4KsGMH36EwUL3QYW2eIN9Z3meN4pnFY0aRWZTBSALqP7iR9K91bPTu3kpyaIoHo61cTr3G0Un1fkSEFQV+Kc3eiipuX2+bNXKxgRsEzI25uZBcs42JL0m6iBVjwPZyIy85TkLUlTsvSd1GLg6UvRanFLE/2iIJFJ/2hV2MehhbDeoJjPI++38lmXqkYZ1OgJG4czuO3EVkReGGg= 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:(13230031)(366007)(376005)(52116005)(1800799015)(7416005)(921011)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bgb2+RWlr7HUBrhEMhloyUHj49R6pudwepEHxtkZN34HiDFEmFteMipa2Iqqn/lZ9CdJIXDMOY4me3rt71MPU8djN9vkUZRydNUqdq+lwKWR1ehOe03DfUma8iN1mBHD+YvLXyldidsf1v0dyIIEvmdr4j4lqRGWTAeDqg7F+nm0OhDW8QaNkicDxLoW5m/ZTjbYGJfcBLR+kbbhnADLGnLY/wP3XRvRGfWFdEk4bDcAsUjmpqYBZJjEJudTAxqsaWCNHLdeuxF6vZITviF4S5v04ccU7WaF6YHWEspj0sUID0hS3ef5apWeZHrUbAovihhHuxEX+zJk2tzSTJESF51137MQ5gKeBOvy0qSz2a/BjgCAqK+p9Ism9V/GFuXu3BDpBL6dijbDk7GEZc6dEuX+LpLpL7Va1kRgmeG6+lJqPU9aayIqNYTcfeGpNIie4PIXCHVG3cqfitMjCL5dhtdrYQIlgqtrEMe5ht4MhwanK0DQzFqRaOj7jc7iFsGgdfkjSjctoRcStnex3XWApzdZSHbmp7pEZ8CIVds+LMNbaJo1An0+0fIGmD1tiXzyTrvuST21LSAQBvBug94uhi3dYkkFTpcY1GAHU6QedqlQufHWm2tgrdXVAm6C6mi2J70xRYuDkdXHKBx/owRPDQmPSLB9C6c3lODUG2Jce0AfdyohZ0oKs00dtFF/9sbjI3tmL56KOR36MYbrJkpePb3p3uXyEaSWAcE02nzilQgu+MeDjcgiEelZfAn8vULmjDcPOP4c8Ian6fcSS2YvNN5HMDGtnOG+IvHu4G1Bj8RdnbXVEhcgKq+RRv27op9M2NwiiSJ90HPPE8rwsv9QxJS1vZPfKeeu/ITWO76uVMabVHzalzWh8FCfg7kj0Kcq4kkMW0v/+dD82MsKuNTOLQjoTG4FJrIoYgycKtu4EQOlJ/qLEuKAnJ4geN5dgUeziQ8UOAtASD047I02LbgjBPyGzaV+exRTYB89EmYEOAzvHVfvLxvSDbelmBTre/QnyhHwFkoPX/BfR6HSqbU2Cs0DJVGFsM9GSrkPY1tX+dQwU3DSWZZDVkDvDlEXjFuKNNHa3goVtHfc2MfEL4llnajI2ecGnK+s5W0IqtSrWdHiJA/U6TXvLgeb8tISyNoHevNgPcHMhZ+JM6zet8DccIATb2l+HIpVDbH5s/H+/mej3FoRDop5OG8MMxa0EaRIO3DZ4+t6CYORk7mOHySVucRInmOm9dHHBiKzs1kiGPfLm+3svDOIOJln05IivnHV1nQLe6joJjAo7XMpamddt91yBEgM7H4c2NVSW88sxkl7VtJLU1PxOjCGLXtI/A12K962o6Ax4BRPAlXhigetHRpdD5SbZdF2uqwcUMC+t2ScWCs9DCcunLD4Fb4Y+Xp7nEZtsiq6jIk+/kxgibPS/iNXvWGwAUV/IEG3qoxsSr8CSXMTv4N2ORrjfTrzLVgYrKTgclu7bDo/2RtvA1HTCUdMDPEMzdFI8nC8KvrXjpGmYUm1CxifA9OoEsowa/Hz5ZjqWR1ZKt3lwNXzYHGpcrlwhCptn/2uwTb8IDxVR01fADoNFG7+Mt+h7CBn1qR20Be7fCSWXwcDiDYKuWSR6+SWbSkhC5sHxQDHsi39IrI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2955984-36ff-49f1-e2c8-08dc5f5e3323 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:37.0571 (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: bVptRmgVlinEq82H07mo+ZqA3FGiR0iqCIX4xZZzMHSPUpOTCK406KVXYGw8+5TmQBKDMZcgQRH5C8lWorTR/sQxGKbJCU8TtU4Au0pkzC4+LarifpnlGfkwbWcpEy1c X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5379 No driver is using dpcm_playback/capture and playback/capture_only flag, let's remove these. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 8 -------- sound/soc/soc-core.c | 7 ------- sound/soc/soc-pcm.c | 18 ------------------ 3 files changed, 33 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index e604d74f6e33..37602141834b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -787,10 +787,6 @@ struct snd_soc_dai_link { /* Mark this pcm with non atomic ops */ unsigned int nonatomic:1; - /* For unidirectional dai links */ - unsigned int playback_only:1; - unsigned int capture_only:1; - /* Keep DAI active over suspend */ unsigned int ignore_suspend:1; @@ -805,10 +801,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* * Capture / Playback support assertion. Having assertion flag is not mandatory. * In case of having assertion flag, non specific side will be disabled. diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6667f34e875a..64270a4f75c6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2011,13 +2011,6 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dev_warn(card->dev, "invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n", dai_link->name); - - /* convert normal link into DPCM one */ - if (!(dai_link->playback_assertion || - dai_link->capture_assertion)) { - dai_link->playback_assertion = !dai_link->capture_only; - dai_link->capture_assertion = !dai_link->playback_only; - } } /* diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index a79ca115f4e7..4ceca99e266f 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2808,24 +2808,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - /* - * REMOVE ME - * - * dpcm_playback/capture will be used as playback/capture_assertion - */ - if (dai_link->playback_only && dai_link->capture_only) { - dev_err(rtd->dev, "both playback_only / capture_only are set\n"); - return -EINVAL; - } - if (dai_link->playback_only) - dai_link->playback_assertion = 1; - if (dai_link->capture_only) - dai_link->capture_assertion = 1; - if (dai_link->dpcm_playback) - dai_link->playback_assertion = 1; - if (dai_link->dpcm_capture) - dai_link->capture_assertion = 1; - /* Adapt stream for codec2codec links */ cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); From patchwork Thu Apr 18 04:15:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634150 Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01on2087.outbound.protection.outlook.com [40.107.114.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9DC9A54745; Thu, 18 Apr 2024 04:15:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.114.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413752; cv=fail; b=ZNqJp6+PYJ2ahJ6QBuJz61aFQ0AxvBhUsvpwnMUq0vZusAJoYum60tyXcYgATBf0S5ZH9LtwCaewpyPEjfLP+c90O6r5IRoAPnCtUIHnNk+z8Rf1OGO9pZnGNWreWnuQsaywy1diMBJ6uva4vfsaIcvtltBqxxonhoVimNNnMy4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413752; c=relaxed/simple; bh=k7OiPFjG7V/BcxirPcWqjmKQWYNjUCs7F6nQqjmhX/c=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=tYinjRkD3/unPXz3Qm+Ffcp+x1l1UEyzsnj0jY55C+8DQ3JCiM4vZNbLIP1Xs3UGy2yL+hht6c4rIb7wDNFaB4YL+4wEkCr02wikQIpi5yVIa/bVrMta5QmBIQYOkh3M/wzzERBFRRQaxeEOuhj2yvqPRP0zeXO4dkZ2XY8Biec= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=FT9cKdTY; arc=fail smtp.client-ip=40.107.114.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="FT9cKdTY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LJbZ7EJKwpAxUgqyM1jn6X19MJES/2ILk5Ce+NPQfUsY65fH47XOPmYj/83U6dzxLaxPHIinEzXDik12OyZYL4xjKq3ivsHlhugaYbd6il81+hcJTPAvnA1uJ8ACWZJsUumVzhXuIgZmnB+amWpztnoGDl6I6q++6Sm5COCWmVZQEVWaOOrrEeh3BCzSarq4BvbeJ+lGge/I35VyAsxU9fUKexm7SsB5b3CeF2pcm5NH0JjfVJF5Ji5q+j7ZbEgYUzuK4U7bEL5Rs3a8HZTFAnToEE3PuZLNX2FXEfUw1gY9T76zFHS1zkp3WRnj/wW1m9i3J68z7JyfoRjCUs/TLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qhfezkhwUSc8SvnqDMfq4EE0KM1x01wW7uBPfsaZAHs=; b=kigagTun8NJhNIX8Fnc/K/6u+so5xsGUlX29i6r2RwqPj63UTL+Rw33ngxKwEDZ0AAMKbBZihoC2Mz7+9xnu5qoRpk2ZptXhYAsBC/6ActUks8adRdw72b9eOeWi3kJQyrow+a4Bidh7PXt0ZAMeBR4LcC0TOOEhEK0LxZjuJtrnzGGObUEw1n8pF/3bIY8KvBEwUwG6/gVnQAaCRhrFjh4HZNAGfBXlt0/buFVnNpmvZaaW5XxAP05i/fY+VdPLp5CYHc+3aRfmAdMuYfTS8GMl6tpQFWjy7eZetIr1hC4+0AtGaZqo27gjK/NQpkOHVcG87hM6zEnIdrciq37jjw== 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=qhfezkhwUSc8SvnqDMfq4EE0KM1x01wW7uBPfsaZAHs=; b=FT9cKdTYC3ERsQXbpbaSopA+4yVqRiboIrVnF2iGLPnWeyBmAeVi0UxQkXaHfqsbhXTwTtbB3L2PrIOeKkYije5Jqhb2Umgv3O/NCHoyzCSIOXw3chkaK3JuqC8kTzeA9e58hRPRndS3Ial2G1wsCcal8c3UkQO9MD0On5haU9M= 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 OS0PR01MB5379.jpnprd01.prod.outlook.com (2603:1096:604:a6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:15:48 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:15:48 +0000 Message-ID: <87jzkv71ce.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 23/23] ASoC: doc: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:15:46 +0000 X-ClientProxiedBy: TYCP286CA0227.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c7::14) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS0PR01MB5379:EE_ X-MS-Office365-Filtering-Correlation-Id: cb2624d6-82dd-495a-cae5-08dc5f5e39bd X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M5FXIJ8a4cbqab+To9fVn1/frLxhfx7kYm0pSfuU361Lvz4bzdfakmWoO2aYwXl3pyDazo7RjAoy6m/hH4ut4Yr/iFEgGsf8Vb/KSDuCYK4dvtuJ0eGC+ZxHCOGnBMvyWWViyQ4SPU8Towp6jrDzRu1FyuMgSq7ck0Tujp37JP/byA2uGsO3lGeDBJl304BbTVAmVcqX9tf2jtt/C8z25+2wXHpf3z0yJm6TdT/BXbc0ez7d6JGpjNaTNL6sDmw8/WI2Gu9YqrmZz3cf3tCl081OeJoOmGo5ZQ5SefFAOrTwWyWRKfnyfIJs7ILJdz6OU8efugjEqqS2WmIaQk7EPY1Lanxc13VSO35Y49JquSaId9pnyf2d8QzY88h7t9SbrjUBWmpRCVzN1pf/wf78zm0NgZ+sXC5igJ+oqLu+3qcKoRVbnPcvcZhIvK5D6FdQzpEhQ09AmoAbWrlubldy6MLmoPm9/EiSDjmeBdTuTsJKmU+FWjHIl+PKg99+aLkzWSu2ONAtiOmIrbmzjzoOPI5PuPzeDAhbMZF0rmDBEq41mYMIS4EEzjW9z+TdgL96upw5RS0oaoMYXCs6KQVGGZASQLcQNEWZO0ZaJnkyM8es+lY6D7pxgkU8BewFKs+eSbJJITjxp9vM3upMrgYdHowSgUP8miqejnGQ3C5JIhfWjbL3GTxG7Zmqn2IDJuumr6YLval7gWpqPqFwX/WWgg4BH4S9BmmlwruJGA1OSYk= 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:(13230031)(366007)(376005)(52116005)(1800799015)(7416005)(921011)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zON1069OhMqADYe5DCVCqEb8J8gIpV1Q4gxEZslRJOdf79/xXBebZ4mep5GlRjlyMejvKjoD27+e2JF4GTEWGD1+f4XYCBZH6KeiehZbOWkeaQN4bbBBlRsKZ7WsO6r7W0BWpZe59QgOEylPYhkFWCJlquypZAnY1SSd5qYQ66/X+s8Q+6u+N1tI97VhAQgLe5+XWmVJj9qEV+/D7g7cnJnmLDc7dK9sq4kNS4RqJCJbD2vOVotFiaozaAUXhEyC1FWHyaF3iU/IcCU8S0Xpu+P1g3NQMd+mLxcSSRL1166aNJB6SIKTXNHUsS7gpS4pcwSQqIHMieSuDjLDcJU+4NSPG3a0WZ0LsGajKC8T5x6zfCTuB86JNvk11a4HAVBCtlfkw56wssARXsGkrB1W6uXEaY0xpQltSbU010D+NPyow81I6MTY/0NiHCuuROZ+kGoVm876GvJzjpYzwLNwXdVzbShfQx16fYBQjfpmykCfkWhx8xNaWOu8m4qe8Fc4GbOA2O13+uhlmn85ZqVCCffUQ85NHVLrpOJRbS5PXuNabd8F1Z3N4r7eUVWIHJtKLGsex5VH8EktXWkzlZ3B79N1JHt5aKWOHwCa9hAZeOQtBqWG3h9IhKXMA1QOzT4NbjCzAEbSDTq02k1byAKvdfTsUdOeixb16iVvcHaYmF0657fPAcyQb5+VKwrMU3hvXi6rhQvPu7ygQxTvMRpHHyg1hJAuKzw6mudD9LAkmSsWJnx8BhsoZ2i5eNX5bSY5MFQTROuNlExrcmHeI4El1hnaQ0S9Dhm2p+9uszWaPUCz3cq1B9NHmT1NMbfY7XCrt/Y6vvLylF5Skjlt8XNUyVOenE4zVob+nRYOaX/X67GixA4a91zdlETaK6j20u9Sd12duJLyaiyAC44K0hCoXT6KL7wxMvYllLOnMTDXiq1Tl79zdSvKMECZbvHOexvyHWMHl5ntokReysOfsIXP2HUCkLA4rkn6i0ArgZBWYmdBpII7wr+l6u6g319sFPE7S0bO+nTySzPCFvKaWMMliWFC73goKYy+aqgbEI0mn1ln/mMdmIVvApxOasDjxvuOMdUcwI5bEgvBOxIMTvxlY96FIXLEUKT4/2twNBPQv3vmLMq68Ef5Bvw3oAYPGdEIs0DLM/tyYoKmnur/od+OsLQdF5pbFGOXiS9ydC5+0dSZdjqZCCueeeAP2KzxgbRV74O347Gva5bV6oRSOsOTs3m/K1Y/Zj40ptmCJL0ZxRsQ17RToPt/i0yQNXv9lORO2sZd7by91RLC/7xASqliIdLBAjr1DHXWgnolk8NIJ5s6vq9bJw849QChHfdqGgyCmg1OWD5Kn44bM0P+B1ehFvdWYpVeRc+dyM7q/DauJs97I5Hqr/BFWCBcdBGGh3xuClJ/fzwjvrF8kg+AuCkf7p3/23nkU1b0j6VqTI3Bf6W6OD44fvAb116/fYxKz3cscfbkXgcUnNJDN0Opz6Zt7gf8cb7WEpaVucLqqQDWOV6zdg7otZZ2+PnvEwGe546dnYMc2QlfXI89gunri9ZMH+cygnd1P/DV0ox+ir979nebX6eu8PMAI0/9dfMXVIQC/uWZ6aKxTohh+nDVZbzZdSjue8leN1q78HVuSzk+psQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb2624d6-82dd-495a-cae5-08dc5f5e39bd X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:15:48.1149 (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: pVdUJ9RvfKn5N1Ct+TS7qfzlovMSU6guP4edDTt3eICetBZMBlfg9BwO3GkJsFNxYrWWZDPWAUa2cuxROkZ+11aJjJjCNIO60oGgug06vj3uaveYkHeONiiP5wr3XQFs X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5379 .dpcm_playback/capture flags are converted to playback/capture_assertion flag. Let's follow it on Documentation. Signed-off-by: Kuninori Morimoto --- Documentation/sound/soc/dpcm.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst index 2d7ad1d91504..bf9b454e6654 100644 --- a/Documentation/sound/soc/dpcm.rst +++ b/Documentation/sound/soc/dpcm.rst @@ -157,14 +157,14 @@ FE DAI links are defined as follows :- .codec_dai_name = "snd-soc-dummy-dai", .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, + .playback_assertion = 1, }, .....< other FE and BE DAI links here > }; This FE DAI link is pretty similar to a regular DAI link except that we also set the DAI link to a DPCM FE with the ``dynamic = 1``. The supported FE stream -directions should also be set with the ``dpcm_playback`` and ``dpcm_capture`` +directions can set with the ``playback_assertion`` and ``capture_assertion`` flags. There is also an option to specify the ordering of the trigger call for each FE. This allows the ASoC core to trigger the DSP before or after the other components (as some DSPs have strong requirements for the ordering DAI/DSP @@ -189,15 +189,15 @@ The BE DAIs are configured as follows :- .ignore_pmdown_time = 1, .be_hw_params_fixup = hswult_ssp0_fixup, .ops = &haswell_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, }, .....< other BE DAI links here > }; This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets the ``no_pcm`` flag to mark it has a BE and sets flags for supported stream -directions using ``dpcm_playback`` and ``dpcm_capture`` above. +directions using ``playback_assertion`` and ``capture_assertion`` above. The BE has also flags set for ignoring suspend and PM down time. This allows the BE to work in a hostless mode where the host CPU is not transferring data