From patchwork Sun Oct 20 23:58: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: 13843337 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010033.outbound.protection.outlook.com [52.101.228.33]) (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 F1EA12260C for ; Sun, 20 Oct 2024 23:58:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.33 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468724; cv=fail; b=vAkpzzZ5DOhWvRJSAQjBJgTNMpR8mUSzV30IwO3dBkb1bC912v9DoJrRY9hMkP67+2wwhQyUXjVvwxxiXLhkGqKumygxolMuzaA/QRLI82gz7AM4Wq2aVpTdA7+IOz9AOKbyGsUw6RiFwJ7Kt6OxmZS5rVTFmRwmeA5VUr7IbUA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468724; c=relaxed/simple; bh=Dh5iNNI+MUZdbyrHuWXLEFv6rHdFP9Kv3BIH6KoZWi0=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Cx6ZlxYZF0XxJ191O/gD70BWahG5PPEsdYwbhq4Suwd+tyeFIizWfMwz759W5hbZDG9Usg2hE/Yvx+DHRCNn9o3G6/1HLbaa5TXYI0gtJznnDJwgB6jXnwaaPW/KTkpf4FFuCmGEIBFVAqAUczLZpl8UdL5uW4p2MPgSZrLVEtA= 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=dAF65kpV; arc=fail smtp.client-ip=52.101.228.33 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="dAF65kpV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UJqmbkVzuGVEmmkz3sMj6iBwZEX+LiuFj2nzbamByqkOPEDLD0qw5Qq8B/tU0BuKxHlMl/Ox5eon5ISXz8tL8VsjcHOGNBWh46qX0hgZsF2zTS/wSDdNsc363S0x186U2AT4+FBOM4jJYC6J7pPufk8ovxcVvbeXhixzxDjChiJQecFLghj3c+n3tAIKt4wX3JhmvQcV7CQGO3tbC3F9ZDt4+9/mUYMXh7Rvd8ACAL91EFfGLAaCaGnGwgVnUyUlIJQmx33v1iDol2F3l/gh8KemnphwpG8buJjxMk36VKMVJKUWC3gFD9t0e8WY5K7SvgCjL2vCRkrV/TYMq5+4qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u7U2iEfN1L1cOoyetZNY5oXZqAbnpVCXjvJ3IQpJcQc=; b=BxD87pgb95N2jzr2ye6nnkk2/+qKUpYAjWb8zrQf4OJzXCkXrfFgE3rqvB+M98cwwdYBoeg9ELM/bfeUx4UrH22PvvRSGgQrhgjS55rsUwaotzMDwX0wl0tKwDkKYWuyq/ns35hK4jSk0gYutSueyrKxPdhymspNr0awP6E91uo7kr9xzvGiD17r6/hRw3N4hwxkjxLpHYEg4MYzmU+XKQO9AZ/CUEYEK0poxf+XqXiwAs06uZdM+qeQ1+pIf3i2PgmXOzeXFbYVteKTFwOgAvnGlyrx5rZHf1x25p7YknILESYCssjKalUZOaI0skC4XKM4W994jN0EeL0rUanqkw== 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=u7U2iEfN1L1cOoyetZNY5oXZqAbnpVCXjvJ3IQpJcQc=; b=dAF65kpVOCsKMh7Hgk6/tVh9wScdNTwkUXHy7PvSd4JEhAeahPClTgi9i2SlcLck3Tar6AVbC+M/auITok5D5ply2m/oE1tMvb2Jai/8eEW2pG96VC5L2JQ28gCtKVINvhOv5mnk9fvRptrO2hZRN5aHvNbo3CCpOKlFr4gLUX8= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:58:38 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:58:38 +0000 Message-ID: <87jze29vip.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 01/13] ASoC: amd: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:58:38 +0000 X-ClientProxiedBy: TYCPR01CA0132.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ea5079e-6893-4a8e-0f9b-08dcf1631dc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: kY0JDm+MfHrRt9sCweoSUissWv02KK2C2XxPBVecrRUsfM8fKEABpOTWmUYo2KBfRekDQJt0AVodckh3mcL/S/IxdMDGtsauyM3r2ZZQK7+ufdyJUqeKjBt0nfqgnNVFp/ELvse1oeLq5Rv/bw24NGQgI+zNUhEmo2xZyaUvkKDQRS/vUk8UqA7Ks+kdf9N05oUEYV482ZUWc3z/RnJ/Fugikaspb3U781dLUo5vjRG6xcTPMKTaP9bTmOcPb9/Lz9wZOpVn/wO1HVcotU3fizJP7eKW/16fi9370jLY0+CjYhP8spQpSsmFIbh3rCMnmxLKmlR6EvQ1VQUb2GADo1NHFxrCejJ6TI2VdQbbUeiu83+/6RNWeiALjoSkz/CdeAleX2Ux6KDnmknYYnM4880GwUV20jpyk6jCt/1SDAkaZ/yA8wY8h/QOu8ef7rGHDsLxN5WQQccj2l+xyQcZrC4tq4JcnpXXs2RIGYoaN4+/ehtNMOn1MOnEzNMfsC5cHJxi/qTtMDxLMFvIAoYwiRcUJo3jbt5h3bqAaokjKXTy1aL0V84ffHDaC04A1iOQSKMl6K4dBKj7oDRNZDrgDlJILo1/awvID36PprvM/B/UvBuiKmdUlFbzmddgRfmsU6uAoIpWSCalav0qbwpjBtHthfN6zCYPvjojMoZoo6GkU8yQMpF1396/GT37kNmF2fWhZvqsAH52DcJVWvK18mKT8IEeQJjzAWEQDWhyTPKSNUrRIjERN/vlKmmRxD8bhQiwYC8DanuoJTw11TYDvXYJj6FEXhxmPvMEVmhKjhx6mk9c7l54oTrF18HCJQHEZIYZlST9DM2GXr+4rNhumxu0g72y/nAPOoB5Jdv3f8f8Ql9MZ6aKA5VzQufmO7LYo3rRuVZvdj/sS8LNCEpxdiVT3Sl4v5okPVjba8yTRAzNAONDtE5RpU2uHUttL/JJXfn1IQ+Feuc2vIVxowc1XRAC83rJtV176cABUplUnUQm6A5D+Hz4+vJGseYJTfTu+8he/pqtOLLESNC2L1+knDpnMuFqsx2hKXmgPyc+mb+m4Kmwg+Y1Vq6/iBaL3lEnbaWMwJFpHxGElktZs5zzEhaQ8OJAX5IeYcwFLI6FD2ORu/eXOej5Wt9hIwkfncPlt+vXIQm6Upf9cLh2n5EaXreVC4PCi00vfomuOwmxKl7VaX3z1BlzzHq52Wkjlx6tFrlGqxe97PEoAGqDe/yQPVuplUHTAThEEvcX1nmI74NXMUrXjNHWDSUtE38Vr1r/zZtAOdKb93qzn/KoGaxvx9kmx/ELNJKLr0a/EtGz28okVxTyOIPgZFkpdCkyRfO6PBIPsTP5kvW7oJ+GF5s1Q3zdXx0l2PnTovvoGjcIIrw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JnbwTl8n+fpBtoz+Jaclm0ieogcuaSJ+3wPU+awZ0yJycvHh1ssDhzaFPxnPpv9oJN+NDRbBufxEHIuDKjYeSxOHNRC+Jeh1e8XfYYn/0nZ70PE1o9vzB5GkYpJHPuCl/SbDL68DHGjYrFfLB5sUFYQ0sQFwDoDz+3lyPyv5EcRcGMC1fTrqQJICsFu14jKYWPOdGnDkgnOZRvNqaQZ2b6iYW9S7QTWXgZq4oq+wVXKJUYvnNYIblFLFoibL0nf6Ij/lHgIzR04HuXONQqELpkpNMsFLrxORfZlh0YFxauRGMBvv19ADstLi/8MDfqyjdspGsRHiotttkvpGlbbgQpoJMdy0TMx5Bn8yPcRns14dW4XHhuKrS4E81sry35P91m5fdT0Yzzp/AYG+WnTFv82TG2+8/6S3uq3/hIRDZz5/wSdf8Fw8Bttiu9owQjcJNT9ClVBJi+t3ZrAX+8rO9ZA6Lg6PQwTXfqiQ+wiR9VpsqbDAZ5nh5teTYY2QkJAqThmb42coP0JxemqqVn/dJ3wYbyH5bAIzt+GtgI/Wy1tUr5cGzY7mhlMk91O2ohh79GK56aszF/fG/87mXP+948WzW2zaOaNQPmdwo1wHmf1Nzi74wuWX2o++mzGJDYEn1QILEbf01fPmym+PTB7H8RmZCQHKDAFtFcv9COsNdKnfNp6q5Z66IGxVTI26UlNXPH8+spAz2gcjNejGs5+rMR+silq929Vc68TEUAQDiPF9QWgJCV4S3gyTVQeFISnPnfPmywRL+s0gPFjjj5C2ROE8gAZAdRmeQLH6JFBWydwP+DbCCHx0S/5B94JvkcptiN6QTTK8H+ZD59oXyrnmtQQTFAWL5aMN4c7qNvWvCPPnLrm9vbTO/N0+TTkHI4hmELXscbmZWtkn4oHCFOE9NkfDaXQGKl+nMvnhHh+YiBf7tUGxgBK6Fd8uy56YvcGJX4NBPCsCkrqwGb1FjYhnVS88SfS/nh8oq0AakdvCOyWeZnPYsPaSypmExR7lD/fXWxE0rhizel1fvL5XVbOiXDKN58eDkeCqkwjM0BDtbmAQWdZBUe/1APavcULuq2k+VWUwNJo18TcV3JzRRvP3pf9p8thxvNWxJ9a9CNtp2QPm0RPnFEaL40baKgd7reD2IswVwBKmHOS0LHUd3KN7aAu3bwwRRIvi+P/5tkZ/rdEafeItbPeaLmUfJcSF/+xFiLEmyScKea30EiJrjsa+KysddOu6J2HjcQvvKlHP+Ifd5Gm8O1rwHM6kgd546L5X/hu7S0i1G2LAbaw9lsGIpjGd9nL+hfxIYWiQmJuFQSREYaWKn3PjvVcd6DadxHib7+cG5egZgcgVqhS4Uggb16qBot1KLwReZZWHYCBhn5ugRZ6/bRARyS+CwxJRZeaPZfg/mPMmU6HskHsQSGaIDkeLTnpp0KjwOe0yiqU3GfvRew95DK2mPMJsr3ueMmGYy+jW0179Fv83cP8dufJzDhluTyGd63oFwLzzaCvHeSxFsDRqFjCrm+rSfN85cszLf9jdrM5O4gXPW5lybnG9BuEFy6ZTpYOtAwSLFIEovGn4/WvYgm/wV0VSaduzN2hJ9t9CLl9P21ul2e+3lG2SoYq4/oqO+IhZ3ahzFxc+NWw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ea5079e-6893-4a8e-0f9b-08dcf1631dc8 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:58:38.4343 (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: PpuTzzqlBhxPpRbHmj20ifaL3vJKtIosq3VP5DjfyoA6vho5aOzUn4aRE/l5YGrVLwKc0xRFVSGG5koCzUWI6e35vJUbO3b7euFx+LkhNR114pkkpsvKscI6uNi2jzQ3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++++---------- sound/soc/amd/acp-es8336.c | 2 -- sound/soc/amd/acp/acp-mach-common.c | 24 +++++++----------------- sound/soc/amd/acp3x-rt5682-max9836.c | 6 ++---- sound/soc/amd/vangogh/acp5x-mach.c | 6 ------ 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 77cf72082e73d..02b04f355ca66 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform), @@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform), @@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), @@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform), @@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform), @@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index 3756b8bef17bc..0193b3eae7a66 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, - .dpcm_capture = 1, - .dpcm_playback = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform), diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index e38b478e15f30..67aa0ad83486a 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1407,8 +1407,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1444,8 +1442,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1480,7 +1476,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) } links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1512,7 +1508,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1527,7 +1523,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; } if (drv_data->amp_codec_id == MAX98388) { - links[i].dpcm_capture = 1; + links[i].playback_only = 0; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; @@ -1553,8 +1549,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_bt); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->bt_codec_id) { @@ -1575,7 +1569,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_dmic); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_capture = 1; + links[i].capture_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1614,8 +1608,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1663,8 +1655,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) break; } - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1692,7 +1682,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1735,7 +1725,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) break; } - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1792,7 +1782,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) break; } links[i].ops = &acp_card_dmic_ops; - links[i].dpcm_capture = 1; + links[i].capture_only = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 357dfd016bafd..4ca1978020a96 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -317,8 +317,6 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), }, @@ -327,7 +325,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt), @@ -339,7 +337,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_only = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), }, diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index 7878e061ecb98..2ca904db82abe 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -276,8 +276,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -288,7 +286,6 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), @@ -375,8 +372,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -387,7 +382,6 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform), From patchwork Sun Oct 20 23:58: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: 13843338 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010048.outbound.protection.outlook.com [52.101.228.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 C23961940AA for ; Sun, 20 Oct 2024 23:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468729; cv=fail; b=QQhjMYpc/k/MdCNYghXgM1TxRhevjJfIzLxr0S8DWWYs22V8ZDkqcYmQpiRQg4Br5KjoSHw7zTkp5EDeV0TO5v5M/zX5GMFQDcc+qfNgx1VfxiClt2JTPwHpZTOK1C3/KtsnaW2lMQg5/+mgNrKYt2g4BqD2U0q7hmCP1421bsU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468729; c=relaxed/simple; bh=D30Eim8Ln02RXwksD6qpDFu9qxLf5s07lw3x4XwjsC8=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=eGt7HJpTEZjWgrJJy/ZPdZo9gsN5FJjUIsY14MMpi51DMgJVuVrfZVBTnnUp3lG49VsrwgmKXrj1gqpI+fKOtbTCbX8avMwY7RGiVtu68yxDyN1IJKsGyxnj10SIUlm98SPDChCQmOp2sSgj3oOofFo4DnJ2IsoCadAE3h3O6+I= 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=lJXmAyUM; arc=fail smtp.client-ip=52.101.228.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="lJXmAyUM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ru3cuhrll7y9UhlWc8k1CEYiyAurd4ZcJ08gdWufs/mheS0xejCVMozAfuTyw18rzmDrBjbTNtnO1TuYzs55ZL4elSaU92Byu29ojozpzV4DTPIvq1IoFjREKmZMe5sDeDqtxBWeK2SZI/9/HFq79b5f67ALtcGOjxIwVXr7QTSOs8dDrfdzoZVNWr4AQNCc0dAhCdfJJ/ILCnMiWQS7yCzYGnXMvS3/i/F5Jzl/G2SLuy2CmSLnwvBYZxmZroWSq98U7FurYu/ON19aiPexcq4qAQuq+/XDujp+0EHQwtIfwVIazumpceg3YH3LdK4UGqVGrTMdoVTtJeYBebaYFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u3PQdVvaZ1VYKzr8aoP2xlzfTMD50pWZg5Olj/6FycE=; b=olHvQmWRZtHfeEVGtKaQ7f6oapY+QZwgkLUVQdY7CmfBr7r25e15CFcyHLIEFQ68xRO4cc8eH//4LmnDO9GeobGwnJz39b0gN8Ddp2pSLXuEu+Wj+tIWDilYKeTtVHk4UxFapuhxLLlO5yv6O3zwWWtxDyPyq2j9MK5fKDWF/sIvFT22EsH3UZ8UgRe09eP0wqbjOFW03+kLuwu3sn8aR7ZYDsKVTITREWArU3g9OK/yT0pvLmTbQ5SIRxX6v3MP8u60TYdX1GNwha8XPef98AY95ZusUMPEFWzeQbGELGpQ2SaAQeVDVRt07d1pFqmN1o6ROtIFPHX44d34yqCBlA== 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=u3PQdVvaZ1VYKzr8aoP2xlzfTMD50pWZg5Olj/6FycE=; b=lJXmAyUMoub8T9p3qzRncYIljq75P7ft5M69REi2hut+FgEXk3GOCzLIcYxIqTgp1vRWc1DlONSs9R6/1eAm2giBZdrP1ihs0FfxwLt2M+DAilBVy4e3t4YKru6bS3ZzOIy2FDYo9p1nPSZUfX+UoAGCjluFYqL4PCD9JFFghx0= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:58:45 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:58:45 +0000 Message-ID: <87iktm9vij.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 02/13] ASoC: fsl: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:58:44 +0000 X-ClientProxiedBy: TYCPR01CA0132.jpnprd01.prod.outlook.com (2603:1096:400:26d::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: b66ccf17-d171-45e1-b6ea-08dcf16321af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: eutTW8Kgch9NcE2oo9k7ISrHdavzmqrEvjFeyyOOMCYyqwsvs+v6bA126AYg/+e63MBw3M2LhbmPXeMu62lxLsK71u2ufoDhRDX9rLqDhnTMjB53s4xX7Rq4dAc8U94OoZanykdTiwGaB5Q8t9xCZptA8kHNVjtYmCWM3O+u6o8KUKW8XS+q01ghAatNGOfVl7QfbX/SP7KKRGaSSFbs00czWvV5wUxakrIzhvtj+MP8qaGLXVAyxTEcj5XsZpoVP4f0PnmCKJoXuqSlPkHa2FwYwZPwqJmve3VVvwsxjsbZLCQixdj2VqC2+ram1Txeu92WkLdYTT0acxzYCN3XalU1VcHziXMrH9f+3gL7EWaadiCKnpE8Po7S60AcGzBHDbHJO5EeTss6Admwt92OpIjcMSgEdiv7ZXIHYvJzG2ra96Ei4A3sc6Pe9KmxA3vbuzjp8jdQGzfGi5i8XU5LZEXP36zWVUMGWGbmmBFu8J5+oGk2WtG8RNw2GVZNTeMzgR12ffwoipV/RBvFkN+S7PT287bQaejL17Bc+SRD5g1QSCjic0Lf0A5jQwAh+l5ekd+gb4G6VEKw3HMU8NiDJ2v2Q1CMa44PhVjlk1wNoGdRpDsXUAU3v5M5zx/Kgf25esLAKGm1LKD7DHqjHEnEbTRVqkAYN+cdXDntCv7w3110t/vhH+zaISoG37e9Cd3p9r3iGM+HdNdnAIKrbJ35yb4sHexeeGEBg7uAEQlq0Cj8C2ZkPLqF1NPkudwZZLZSiYj4xvf+2ST/g6waUFxlPK/6PbwDHg1AR6LV4+tt1+5MHLD9AvmfHgu83eKpnmgjkoZRqntwM80NxJs7p3bnqLjUpw7Rb0tVIO7pgyA7EDLiUDieiDOXSM1NBL2MqrxU/LCAPL0hBUlhdW+4PtHbnSN+YU07lPCsQ6dxY/VBwh2C4x5CFdtC+FbeDo67xojtfJ3mrM4ncfXwnvHnJlUb/glW81rc6Y9imc7GXiDcMaw0u7wdYhIjvsimtFVnskcitY59G0RgnM4D+6MdjU1lpFCqEta4eBp/Ny2E4ZifMk626ikgmVd292TOQBftGrOTfpSA147keyNIZ+vOMSExO1P0KiROLK7QzED8zie7Vqwh/TdpmeP7YGNd9fY4lrLRgipL/3AyT3ElrzIHQ9fmhNMMfeigvI8w0GzGrKHDvguaYLWL0NhsotYWTe/O6lMioDHKYBeDXZA0WyBPHYgyu9WZDWnqJMXEVonMY8ufCjxPTQzkYtEhrCIvIn25zT2Rs91LUzbWice9RWccqIcBaS9ktb//4gh0SN9H77vc1lABDjCRHW1QlbLxctSLa5opnODldCz9vHSflip02KbUlfNBLfKDJF74zkvWgGdDKC4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RrR/wFtgpK+aYSpsI92RwlfQm2ggVBue3gPWNVySluNDhPknhdrrn4VpgJv4DsQaW90XI9A0No5qgwnNEUPjfqO8O6nUcmPh+w6c7VVGqOB8GGl2Sbl52pKWJSDSIgkrq15vZky8OmKqXp+iPW2v38w+4Fn15FR+l+YVOmWVQPWH7cXM3PtWyM4+kTMNDRTz6//nxlTVtuq3+vsWOivfF8HT4aCzoYQt3+75j2ePavjfRqrpFpN3av7WTh7quykwnp+awJCwXr1YeY4xLzmNiyLf9bdJtfZPY5Qv4sjSEjn+CUeZYaQLHlNiM6tYd7anr5tvTxOWQTei71OuftzlTyYFp3C4WF/rZ6MznhqYdc/3MrHTXpkLnIr7bdtV+f/FDRa1MXhwD9+w6xQFLqJ1GI28KkHctLje49vSDBIfVU8tKi+5q4EMtlElnZH3v7VrKC4sJtt3FO8lD8znRqXrKqlf68yASHMBzNDwcy2lUimPeMZFD45gpoTvH73fde9m4UuWruscBnDpacPTgmq3vBjCo9E2/QhHV7HGQS8CiaGu0s3FHhswIXHg0DaZvZVLK+f0Su8b4Hf4+2D+lfdIOWSC+homtSBKDBzLzHolt/STleqmYPlQR2Gxx+AB7guB6HVihnHOweXrHUuzyvyWf6qozQxCmoPwWKSEwtV/j7stdyGsNouw9/xhhVvFG/1aN+8dOefaqheS89NoYjtbL3bqcchckvupWO2jlQacWZSn83ttWZ1N1geojyOHvyEKOVzOlEtXTPMYll5DVNNapm4MX4SVE2WOkWabEq1KrUIIdTx+MmbTzq4aZikpMkiMfdQQvh4En3YDkfMdSn5fwLJ7Qv0wty3p2kFpxhWKRzwSFzgXKCrwNE8BAmlVbMKiIz5QwialMS3AjQGwYcpPya0/WDyMkRfAqlRHC7ltk/22BtWj0TbAlyi3UrEjAo35TWpfppueWKfoJkEDZ0S1+CnzJWcSqhmu4Mi6sK1sxuhmH6Cy1h3mM0h4b55r93MyE9Cswiy6CfX18xihZNUtZpLKfgJlAeEWjA0I7DAozY80mnPOxVXq/5ljvEIDR32lG43WXHAaVcIcUAl+0Qc+e8wvtyxVzfqvNqKKYsFIuc0e4eMpbaDiBOGEBdJs8NlKTsW+LyIM2skkX0eAQBvtJaymx4ZfrOtxT81BhHAhwcQlaVXxC6VH1lYMsU2kWFf2qx8q3eZC+83nlYlEd8YQqHaztsSvoFigTTWjpPTyFETLD0RVQjwB9OoHR6rL8elQ27gHgYDg8LTc9AK2WVDvAR+eD/tKWXu+DBX31+8uAABHtv7jbzFoMrLnGR0+BZVHsVqbZrzVwd/kv1PAVQyDodMG9MC78PNVE8LHkYOQoleXLnVwQ2w2t2U0WYn/i3AY7Pn2UnCgj/9CiEPk6pTzTYNnEqV4HR5yvNgRbo//j/b/h3XwsXzepYouWgE2LImqJuYSaGfgRFUrvoHOLQAHCBX2W1GQhpGjbCzSQwI+S6tJ/lGXUNHWAiUXJYsRhN3XT+ABjTAx0eYEg+3VPVuxR7qoMoGN31nkvR8GlDPuX81r4CsepnFJ4ynsGOz+vnp6OXy7Bf9a/9rEVVO70Dfi7SPgePnOrQ/qTrALJxnNzGk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b66ccf17-d171-45e1-b6ea-08dcf16321af X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:58:44.9920 (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: +NSmNRuFvj0scYBOQcJhZQU3bfYfu9LMVAPTitBYHpUV5JgZwgAspGYVMe/cmVsx3pEItSXw4ULoaovzxcPWad0nq27BQYAlzPPeZi1lOroDjtTD6pKUtG3HvPfzDEgi X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/fsl/fsl-asoc-card.c | 24 ++++++++++-------------- sound/soc/fsl/imx-audmix.c | 18 ++++++++---------- sound/soc/fsl/imx-card.c | 4 ++-- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index a0c2ce84c32b1..02e1594e8223c 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -317,8 +317,6 @@ 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, .dynamic = 1, }, { @@ -326,8 +324,6 @@ 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, .no_pcm = 1, }, }; @@ -504,13 +500,13 @@ static int fsl_asoc_card_spdif_init(struct device_node *codec_np[], } if (priv->dai_link[0].playback_only) { - priv->dai_link[1].dpcm_capture = false; - priv->dai_link[2].dpcm_capture = false; + priv->dai_link[1].playback_only = true; + priv->dai_link[2].playback_only = true; priv->card.dapm_routes = audio_map_tx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx); } else if (priv->dai_link[0].capture_only) { - priv->dai_link[1].dpcm_playback = false; - priv->dai_link[2].dpcm_playback = false; + priv->dai_link[1].capture_only = true; + priv->dai_link[2].capture_only = true; priv->card.dapm_routes = audio_map_rx; priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_rx); } @@ -764,8 +760,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[0] = "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].playback_only = 1; + priv->dai_link[2].playback_only = 1; 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; @@ -791,15 +787,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].playback_only = 1; + priv->dai_link[2].playback_only = 1; 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[0] = "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].playback_only = 1; + priv->dai_link[2].playback_only = 1; 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 6fbcf33fd0dea..dcf770b55c4bd 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -264,11 +264,10 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].cpus->dai_name = name[1][i]; priv->dai[i].dynamic = 1; - priv->dai[i].dpcm_playback = 1; - if (i == num_dai - 1) { - priv->dai[i].dpcm_capture = 1; - priv->dai[i].dpcm_playback = 0; - } + if (i == num_dai - 1) + priv->dai[i].capture_only = 1; + else + priv->dai[i].playback_only = 1; priv->dai[i].ignore_pmdown_time = 1; priv->dai[i].ops = &imx_audmix_fe_ops; @@ -285,11 +284,10 @@ 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; - if (i == num_dai - 1) { - priv->dai[num_dai + i].dpcm_capture = 1; - priv->dai[num_dai + i].dpcm_playback = 0; - } + if (i == num_dai - 1) + priv->dai[num_dai + i].capture_only = 1; + else + priv->dai[num_dai + i].playback_only = 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 306168b164d39..0f11f20dc51a4 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -860,8 +860,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_only = link_be->playback_only; + link->capture_only = link_be->capture_only; } } } From patchwork Sun Oct 20 23:58:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843339 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010071.outbound.protection.outlook.com [52.101.228.71]) (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 0C96A192B66 for ; Sun, 20 Oct 2024 23:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468734; cv=fail; b=tX9w7hzsXFRez/Fkbu/5T34cvCUGq4Qko5VrTMnFX7r/b+Zh6M4PaF+q1Si2HRwXY1LV885jbiYhc4oFd9Usm+twF2eNM4OX2HS3CLu+qk0USVATR8m58Iv9GTK1ii78ds8ujylXEDa2K9uv8a08dHfkhyBIxHuZ0Y8Xu/WcmcA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468734; c=relaxed/simple; bh=GgGhujaI0woWlgYqdJG4tJyAc+dIuukpTkAfJ3dobUU=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=EFB1Cgrm8wZETgs0H+iLo2A9+mZwNdgbOZ21UMWDDZolrKWWI9PszKLDelWO1iCAGGhkKl7A1iUhgpun1q8Hlc900thbv+jifvYwcuUDpwz4TjK2tIwBswTZrkiXF18SFrtHCldMQp+vNJJHHrMV7O4pSybyF3v+uGJuMLqK3u8= 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=TRuSkeZq; arc=fail smtp.client-ip=52.101.228.71 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="TRuSkeZq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aeswmdhxmTRtN9ciC/UGfwRKwcDYWFS4reFhG3K8gvq0xL1q4P4iyX9qT2sC1gptbV2qEn4dml7CTK5kx4GxMq9/FbmM7W8XgiHOkVgAZk0lSPKzl+ltl2bijj3xaoXfbz75iKvgxXF1duPQTTfxr2gLPW+VnPk4Bxvw320ep9GngL61+W1DWQE1cqI/6jd+Hw8ASIwgEXtV+Dvi4s8Qt8vkUmCzvFG9jdhZeQXq8ouw51gVwnB6hWQvw6fxr/FKmXc4HroFIfK3EzRCo6WBJIsDFRd6Hrf6MVCYHD6feHPIdNQ/+QQVaerOtfqsGDnYHSwsO5FsAoyabFuaybLSww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KZAxs4yzTaa6Dg7lirfzVAAaYESTfbXLM12N5GBpcfg=; b=HJlTrMrp8glYfZ3/ZULwVZ4TalX1PR7DB5OGq8GojI0FCAnunoHRyI1heWjDAv7pl+w3Pmx5u66G0Tf/7dyHGYw4VOmUXppAzSMFZP7phmk6Gn/fQd288j8elfmijM33+tMSlLt4pJynGrrwAZiVdJIaXFyn8oGbFsOCucw9xNzZO4kXYDdtvYl66NYqpkz3BPomqhLD4Pii4yuxfZuIedhCJAAcEmsJlcY3ZOKSpKqE91sk+7PAbbgifA6Z/J7folW7w66pTOgW4mjjcf5H6od5Aov1oc7rmF/yacCXxvSfCvHSv07nH3nuhQdbKzsb6E2oVoowj2TPHjfZMzU3kQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KZAxs4yzTaa6Dg7lirfzVAAaYESTfbXLM12N5GBpcfg=; b=TRuSkeZqvphrD6ub2kTIBtqO7ycWtm+RfQZeb0K38do4zDMSf8k5C+FYRsarCIcMeGyUN0cCZzR1/iXl7Km6B9XP3UyfnKvacjvTl79TcmljgvpjJQnvn7i7cqrUnH0Zn+uzwxOT2iVh92nF9d2Z60s2En4HMPqNTRtyfySzYAo= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:58:50 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:58:50 +0000 Message-ID: <87h6969vie.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 03/13] ASoC: sof: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:58:49 +0000 X-ClientProxiedBy: TY2PR06CA0044.apcprd06.prod.outlook.com (2603:1096:404:2e::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 198cc547-d884-47fa-71dd-08dcf16324b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: l/58rUk8c48GUGCJ8NBX02KJo9HW3Pxrpf6vVpT5Hcq8AYljy5pirXC03lz6E4D9+sojRnNEbEKwt2+4rxVEPCMiDmYvtlw60fCAAnaYvih4t8IIrDH64X1UVWpMXqCV8rxz+sgH5Lyi80IOQVxCqLU6PsmHYCtT/JBzbrcgF4Vh1uV5ZsFBUnr8kUEblh0rKgdQgv/HXWO8N0cGWlCU+z28oFTgjD7v9iYo+nyqQ+jOQjDMAqMjWM1IKXjPFSOvwI2uUxnpCYmRselsinzKvnFNDapx6ELhUyxl7UyEbnBBs6c+bWEmDLWBT3g4MFOTjRf/V1uYI9hlKrBkvhHTqVTHoTOFL0TzRq+Gd0bb/nxKYz5vQolfHzYnk5amGGpGU+w0/O0aUuJnenTUOpnip+/qPqvQHNy1wpQTXnM1q0vlfAGKbmsA9ghvWjaGAy6bOTS+UNpFD0hugKpDybR4Q2gnjbxWhr9HwkrSFTIRgcv2vQuiWvgzmNLNarGI6unNtAOG99WgE/Ky1xjxv5McHRp/cNrqcfkYAo3lE5yznn80+CSTLLxjP1i8zEWqYD5MYL1Gk+8Ei2LWIPiTFyNFgpu8+1DAtfKij4UF6nSudWdVgJ8aMj611qW6v4/Pg6lwulAyEmm4FLXnOExqob+JVxZfEX112sbEr9Dle79PTiMOa/rdattQmArMbuVDXAZNhlAqWfS5cl4MPZc0/fRH3JQ6iet/DJWCMqznrLlqe2o57w5egzRRNPInTqs4x9SREyoukp5PH8qAczUtI4OgtSd9FmLcolmWHm2clIX2GlZsLyOeQYeDDrKYL6Rhc7NYuFbABkPs2nIyCs0JjhP2vf8xPMI+jayv079xjyNiE1xJlWpLJdXnfqhNAqA1beFojfbZhI0a7NLu9DDz48/INO3fiE7jqq4guTAJ0xJUnR6k3oKSLbpshH6RdYg5stXCyrpYWH4GeATyc4pdn6Gu/77L2gDB6Q6VH2ZQw574PVTqbO0uNlrmcj5rg6NWK83p8+mvQy6PooRcU1GJYB49ZRsk9z2Hcr+7RsmBXISBgbeuP9MArmDAeRj5Baz7kIj7H1On6PsSNbRuE1Z+RV9GWAV/KcwKS+R2ZFb3juwH8Rb/ehg0HXOzfHXoDsLW02QuqWas5weld0nvC6W+6WxHAF0kq56tD0+JnXyahxMGxwi16GKIFR52jfUH4l/yXevSdyOJjYsIODfWL+9yUIRlqOk4bcV0DYCOKmEbhlKPtYgwYV4lCOKluUxo/vqtcKb3q1+P8LzO3hZRYW62T4Wvk3d42I9WkgQK7P9Hsl6k0iXIBkVgQA+zwPpbTDzZThjsA3iEaNI42QCdMHaRBy0NF27SfVaHnjtUlROaOSG0G2E= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3I3h1ZqX3bcBaPVB40kXAjyNMkWx8KRYCREtWNA0leEHQQDNJI+rrDdn8rUkYLLpL3wszodO1ZQSj9fd0PvmeHb9dAhLbSxnqJlxXjuXv1eCrRw4WG+/+Ms9UJd7s9xDxGK8fZcN5gjKuBbX03xVLQLsZB2q4SFt9gC4P1eGOhqKgTm598sYnanDOEJYwSi1FXTuOoB8hYVjFRYQpTEPNGzJTbOyEnmUiEjrLTOsTyqKsAU01EbiBMlI31Fw5aoE3Oa/CjlIL7ip+Nbda+ifrYO+TsjGjCVif2x2N6CGhAdr3R30gQw5nKr6buz+fxO9K/BjzVPAeyntk82bmUpw2wBxdAFLv3BKIKbUMaTO64+O5+OKaG8a43q5C6xF17OrjaLHF66c+gMkLQVI35AjXbtoOjHIz8AAeX5ES9yZaS4YRAp3wMAGb2pjF5TexOFD4dYbbwP45Hf1uDArZP5ZQ6FBWZTmclBzt07pczVVm65osjGR2qX/GlmFCH4N8tuCx3qEA3ky25ZtlEcUGK2VBoy8CYxv+7S1FrM6+ZwNWFRatGWSP17FBueSUOEbgiHYtNudPxZ+z4Ss66+0VeWlV2yiH2TM5UvTK027W5DIQY/c4Xeyw5zHV1UlsJpyJufyq/DTg4BVeEyoxMlw2JtitvWAZYnX7keknmoY4Ri6grjQ8yzUN7dRvpjdBpFM1oemZ6/l5wFSOre3g2D68lo5VWDz61f2qOr8JVO95XFG56CxaG9oXG/jSuE7Gckcqk8WQ2/c5GO3/xeGo9Q9VDEdXFTXa2rIbT855f9EIwDfm/NTAN3J/tNEDPs/cnp5Goe/KkgsgW0ozxAeTwayUunjFb+9AkNZob2fYMl3pUXVuOBnYZTmvvS097CYRO4XJuExcEf8f4g1Fc6LLzWNxEhVVkhOgWOwtM8B0cV/c4oHA6cbohCn3HQ7xkE/qrghD2ne2zIDoo9NfbaoZ6aqacKO0voFOAcNF0BSAjFOjJkjT1yjid3ZG4kfeoNznTXok5cXXnuXt4jNjUM/HF37+Q5P1ny3ESoOqeN8zJrGHeUpcxtjOAQNGVXQW+05cRssTlrDqz4NdVVye1Jl923e3X4Lx1nRgjWZjahME6Wism12+Y41IJSQ3iGhJI9SADn//R/HL7EJ4qR1l0Ai1G4LhqzAFubkGawwyjyxCYz+O54UtTCw1lPo2OqLKXbCySBCXecVFCtTtA0+Xm15xqZGGaSIZCspztlb0IvUhgRwTeBnECutyLz/nwGN9bGofThqH14CpkOrFo+xgzxc70QrlrN68abD6qKyK/nbx8UOlQIRzeJE6k1d8pZLfVceUjSl0QEOSd+Sv+L1E4wyGWuoRE9yycyF0KEf+XyMOFEoJqC0YuvFyhQGkPTckl4evq3VP90ASbvbYqddwJUCFpULh8ViAQf/oM8vyuibPKl+3Cu8u0+DQAlhMq1EFgKasmIycy1wT1qWabQdJQ+9XUtprfzCv/tLUjZBNQrYqwA0zZkiMXH5X8kHIXhfVy9kt1ADvbayffAmmSRQrlYJQ85s+JWZGmy1tN0YOOqrusGGQWaCpcnhu5ovus0AfE0SWm5pOyMZFB7L6J/maLhKbVyvswDaK5z0B+vTL/TfHer4UkNAaYA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 198cc547-d884-47fa-71dd-08dcf16324b6 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:58:50.0660 (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: 8a7S6C/6YiGQdZrGWv2E1buJomf7ssIAtONcw3CsxM5CdOZ1ntcwh9mV49iW8e5TJSzbKX+sc0K4u7jiHtWnmXMvVUz2p8a001k33d2nIxOt113OeiXGolWlK60FZvb6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/sof/nocodec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c index b12b3d865ae30..c0c906a78ebae 100644 --- a/sound/soc/sof/nocodec.c +++ b/sound/soc/sof/nocodec.c @@ -55,10 +55,9 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].no_pcm = 1; links[i].cpus->dai_name = drv[i].name; links[i].platforms->name = dev_name(dev->parent); - if (drv[i].playback.channels_min) - links[i].dpcm_playback = 1; - if (drv[i].capture.channels_min) - links[i].dpcm_capture = 1; + + links[i].playback_only = drv[i].playback.channels_min && !drv[i].capture.channels_min; + links[i].capture_only = !drv[i].playback.channels_min && drv[i].capture.channels_min; links[i].be_hw_params_fixup = sof_pcm_dai_link_fixup; } From patchwork Sun Oct 20 23:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843340 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010005.outbound.protection.outlook.com [52.101.228.5]) (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 00DE4192B66 for ; Sun, 20 Oct 2024 23:58:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.5 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468739; cv=fail; b=ZVTQGkbfQoXYbaUl/8LIwX0oYzm1q8Ouw6ynv79T3bkxOP/d134CrqvVdZ5zJdnaQkBsvID1MO/s6nZrKl6rbIJWzUhLf5+vI0o0drr5/M4O7387prQxu9bJHr3bd6r7/MZZLhhB8TVRBJrSfcFQ6cGXNNUaUjTWhxcq5Rvowkc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468739; c=relaxed/simple; bh=0JuyPGS4VbwTkOk2Dwr01bxEenHqvdBp0UVbg2PblNU=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=CPzoPgaz9Af5sQ2lERM4JmDG8Hp+t+eyv79D5ejTNELof+ZjLaVEgQYxLPiyY8TxXFSl4SPK4Aq+fcPtj5ll3diXaMNZyQw89NjOVMztBfysj9/1q35f+DVb2XkAbFgLsXGcalbhfxi08/m7cgVFcLnDcje29iTbmn19SPxNCMc= 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=AiOj0/P7; arc=fail smtp.client-ip=52.101.228.5 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="AiOj0/P7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hbIujTcczLuwQD9pPcKnF/iOpqKy0oz1FhqrhvCHfA2gZqJQSWGQ0u2XmU1OI31hl98QWC/reqHT/3BqQp14enWPv3YgO0aBckOB1Cc3xD1s32DhqbvBhie2uvqIpf3oabNBoFVxOhj0Ld/ydwbdp21mJ6jcAPolSRki2dm59+/kLrhTIOAxQZJVPG4MYsszVzIq9Lg17i0ZbqrXmdnwlwGHGRj7owBg/NE1OFd0rXyln0NLiyV35X/LgOAwjNTb/6gmFBBViJ5wyLVQK+3OkGm7v8p2x9L0sVxdcFmANw1LFlm9Y6nl9+cJuJAYLdiU4GT8XVCr9nyrgWvEsuxZmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oyf5TLq8Py/lTSeeOBhHx/br0P8Zo0IJRcqO4iKs/Qc=; b=u55HJ7sI6x5TRLGoRmpKQK7xmwNEcUepfCvInyEXyx5YDT6C/jMOgZm5zc6DrqoeT6oeHp1aW/T+FJjB8NDIF89FKKkIb4LvOEowqcrGRWtWQq9u4fByfXYCRNeKBRKQ40JnUKF43KOgmwIceQG24VMV6D5eBGYybJ0OfDSU/U2IWznPC66l0H+4JvV66o7bbIOwoJ025rxrJfOMmeSzPFyDeEkEuIfW/X4x+Ej5sToDlnkuwyQr2vmCRClOq4QXa/5/PezNTZ3xVTCgcbDZzOULkF2Jbh68qIWUW6JOxE7UjlhsfAJf+RKB1EEGDYiPQ4OyrsbWRTFL8DwnoPfSyQ== 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=oyf5TLq8Py/lTSeeOBhHx/br0P8Zo0IJRcqO4iKs/Qc=; b=AiOj0/P7+m0r3Ta0wmEdJCC3bl4HYPpnMXgihkuA8nfZ/6k4WkK3ga4pxhGdiTjDreU63wHT+Z37RB3znX4fYbDysk/lLkZJgyQLStnde/WKPkU8CD6UIee/ej+EQEhTGOM8dqKHocz7A2uUjg/GjdG5oR+iM1rxQJASX1g2dxY= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:58:55 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:58:55 +0000 Message-ID: <87froq9vi9.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 04/13] ASoC: intel: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:58:55 +0000 X-ClientProxiedBy: TYCPR01CA0197.jpnprd01.prod.outlook.com (2603:1096:405:7a::10) 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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: c03ebeea-34a2-4698-94b1-08dcf16327cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: qitj7//Lm5k0SqRHcUm6Gm4ysnYr8kwyyMGZ8zFIl/EzxC1FHkTUg45fCRHHo+EFSKCLhkpRN9s8OkdfG5s2Lpq/nmWzsXWpS6eciMg9gRIN/JdMDM5gCupmwkzQO/WmG2mPG9vEnrLB/xEiMl9VHJrP7QlXMEUuuyIFOXwnJ57DWUH0Mf8ALKCX173fmlCC7PswtOxwoSNDT7tiABxyS6fCqsKIpruWV0FNhIZU7/ChvQoXNJatbl1Q///s6yLpWmfeEuv7dNIPp2JbKTBZUI0VKlEYbMV2Zaioe0fcXefoH0V6UJK0cV8R+jwzc9096KnHBbfdYv+L5/7GKrTSwJFqIttCUcBegwIfYJDlJYFdCOyD06A3Hw1Yu3+XlVTBY7Y8JAFDQVpuDW6CILTO6wqgHtmGTVh2ViNmliXLxL8dsP1MVWqYzAb3ol5m/fn+BPV5ytvPZ7DZb4HYA3rvIVtHQC+TjwF2N3yenwbZ3ZQ0UlE+RaYMg9g7iaaRLr9Q5E17uKB16LZgrue17DZbiBQbV6Sbx7bQLQ9iHs7OjfUQnoKN0NG6zk+OMgNHb7oPJ63ji0pWzd1iGi2rPImgyuoMAF8jO0Ec4IzsxUBSKZJwnDvZwvwJrV1bh9caKqVaQ3hDkZln9CszeKMmqddr5Tc9TyZAyMBKSjfnbwY+zwvyur57XeL5cZbgtFIPMnkc/TiXouf36aX78482awTyzK0hwRLae1WDs2w05Mg+C+ir8oD8r5GJjFBzdVAcw39ofZlSUySA4wAHB1bTLnmCfv14gBnp1OH+6WsmlMMHbX0+rXJWvxciwxES90Rk/1JoJ7mCqZZozC6g76E1cxTZJkuSj2FL8onU8Q5lZpbwLQdhVwGZkeaqfd9qFVGz3NUFDgAscNN1Y9CMvtWsEMt+mEg6k6Arv9yOvqE5XetXxphdPQW/gcTIf3+k+IAgbM5XBRDSUaaTOo/Ago21d6O1LjabE0IFDBQp9NK+Iz0dZ2IUIcirHod+U7eZ6gjituYauRC6zl8ZyYntEmPTEU3zwOtJEUIAWl1dEY+Q2q8jhjdWGeV/uAvTe3/ROkXuaLY2YYe1s+FTXNXIZtQGpdfJgqFp9Tn1J8+6/rMgdCP/UhTDiatx1czot+2zGfsFBCDbQXQG43r+L1J+LZQYpjvP6dXATsakBfQqYiT3PYb1GNlHZbo+94to598E1d24fyFBQMrkRPQDAh8L9UnOzdOmM9zAk21MbRladREmT8dMt+5QOStcTNmnxCuLDCqr4duIEtxdbHvlprBaIXGq/8qlviGd9TceLDdpUYxQXsJoP3nML/e+Z8DgE8ltXrbWjm4n7n7kmfnAxLytRhmc+KFg/DbOQILEHs69KgDtmMjTkHc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hFOGEVDrxNcJeIwXT+vkH5f7rFFlN9Ld/LpOfGzvLSulr38UaDapt2yo2eOxRMggBqeyicZwS0M/AyS197vvPtVIvBqvo40HhLVD8kykl4M2y6DGa6jr1wB0CDcc0VFE8M0hZeJ2XrrLdMTseEarEOOzeOwNYuqCQHHWWiPHd0YO7XB8lAu8peJ6lpAy+/jcDtHnpcUzs+s+qBEJMsr7YNKZcCK3nVQgjseTd4wWLBCLKf6yt0F10gtsuefsotb13NSmhsFFO33+46ciSZ2/KMAt1Q6zQ2Ms+1O+LGkm+6GxOJoct7RxBBgUMHLdQ2x7Sdz864nh99XduG7Qwdb+MLclbaGgDvYZi1I34ND8xHEDIVW/tL54+bFp2XPgkcy+JQfLRqXhhWu0Ag2m5sWGL1Sjmco6GDy6UA9ZY+yKh9HnwM5bSAcrGDgvV9hSULqxCXdSi3Ci79yNiW62Trcd3Wzqrtm0QMhkZedEMJEDrLP/6eDoYVhJI5uuxXkEmnIDDUaqWWlb109hgs4ZBKAlDf7l/rnuYTbpKCMj94gjXln5Jvfv/yLtnBOgYBB6AMLTzd4YPDPD5boaMySKLZCefFbaclvdd9CvC5G+/RV7jkD3nDBJqBhV/HTpBEYbH2f+QUjkzWX/QXEb5HzjMaHT/S757OX2Ltf0cbmyrbnvTyww0ihK6tbjfY+nLutz6SyDk4YQihRaumH9aDXhQLp0OGlnx3CjuQ2VGO9YaHsbHGpuRkV5H38zjc8ORVAUWWMIpkkqd0W2VXyiVi9z1TealeC28lAkyuZUukwDX3COI5QKtWMu3ho9qcBl66X6mxKABsC/EnA1eO/0rKb024owzVQe+4/llS4lQWKUgFJ1EnQYDd5NSvolIm98EqixONdl/20eNDAloGsbaSYHPqKe0DplwTlb5e7/tLSv8JIhJKlkt/6NxFU1/MJyUioXqE0rG2QbzZnWUPrl0Q60b1T5uvV6fvlud5+G/Y6WqO8/Wv2UHN0TjtGfV4Ar/d/0/2j54hz6zCVZ+szRqKH9E/xFhDCU8ysB3wMiiT4f7bZmdrhXd9mmFMfVGrda3eIQw0sQVIiKifLFpDyrJgq6PRdFAScI1/kq5DjV+T7uqKjAcemflb9XrU26IYVoYfFjLLHkTxN6vA7I9LtOYawUPLEwcIwo/TdFYJ74mlsV/KOu3yDnqnT4pQcAsOvVwPo8jAbf1ne6ZOSwVR7WS02Zp5Uz5wJrQrioNh1a+sQ6sY97GTnorXfjnrQ+P63qZ34NajP+CtPjHLGDV3JEaptFbX6zsTsnmXWHbUNG6fjAVc5hkbLAGfzvEKztC8oVf1QuukuJnl/3xFWGzLkSLBFR/+NhaE+PjeU/EgNv2V+xIcKw/O5nBEMfvUMMDLrJBXSZjjzj/Wd8fdrv3fzhq693QbmCtXhoEH5uxoNUBqCmCQk/Z4LuYNQtAI8l4Zu7dL6KOVhsIhS2+dx+g3y1SSOjvhpWB2l7XH8zy3C0Pep6iR3s8dLmIgiPQTPvTapBrycb2WgUoxpTV9U+J1M51azVUzCeM3jxahF++iUwfkyUFjUUue9bLeaIAXlRQp59L+fa/kcNopiqITDuecQUvFtBbLKvPUVGx4W3drriWWpVC6JNSBw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c03ebeea-34a2-4698-94b1-08dcf16327cc X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:58:55.2182 (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: RxyC7EehZnDBn/1sDuOnpfZbJM7Q9t+/aKe8C/Sx4LV6qDoUWVAFIJCcJM9RuJNjjtJqmDlYhWQ+jOtlYjrRodJ2mKjzZkm63/TTcMHDHnTXd7bsnZFJuEYI1lJAf+5k X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/avs/boards/da7219.c | 2 -- sound/soc/intel/avs/boards/dmic.c | 4 ++-- sound/soc/intel/avs/boards/es8336.c | 2 -- sound/soc/intel/avs/boards/hdaudio.c | 4 ---- sound/soc/intel/avs/boards/i2s_test.c | 2 -- sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 -- sound/soc/intel/avs/boards/max98927.c | 2 -- sound/soc/intel/avs/boards/nau8825.c | 2 -- sound/soc/intel/avs/boards/rt274.c | 2 -- sound/soc/intel/avs/boards/rt286.c | 2 -- sound/soc/intel/avs/boards/rt298.c | 2 -- sound/soc/intel/avs/boards/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 2 -- sound/soc/intel/avs/boards/rt5682.c | 2 -- sound/soc/intel/avs/boards/ssm4567.c | 2 -- 16 files changed, 4 insertions(+), 32 deletions(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 80c0a1a956542..93eba4fd27710 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -203,8 +203,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c index a31aa471a1c21..4dd9591ee98b7 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_only = 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_only = 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 c8522e2430f8a..426ce37105aeb 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -233,8 +233,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index 430c070a1a0ee..cb6d54db71892 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -39,8 +39,6 @@ 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].platforms = platform; dl[i].num_platforms = 1; dl[i].ignore_pmdown_time = 1; @@ -160,8 +158,6 @@ static const struct snd_soc_dai_link probing_link = { .id = -1, .nonatomic = 1, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 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 7e6c8d9c900bd..4556f105c793e 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -46,8 +46,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c index 8d550e82b46a8..6570209c1a63e 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_only = 1; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index fdef5a008daff..6f25e66344b7a 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -134,8 +134,6 @@ 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->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 082f311d8b840..ad18c4e9a6704 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -131,8 +131,6 @@ 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->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 6ea9058fdb2a7..bf902540744c5 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -210,8 +210,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index 9fcce86c6eb48..4b6c02a402047 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -184,8 +184,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index f157f2d19efb4..e40563ca99fd5 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -153,8 +153,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index 1e85242c8dd2b..94fce07c83f9e 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -173,8 +173,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c index cfa146b6cf087..30588d9e9ba3b 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_only = 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 44f857e909691..b456b9d146654 100644 --- a/sound/soc/intel/avs/boards/rt5663.c +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -171,8 +171,6 @@ 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->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 0dcc6392a0cc8..335960cfd7ba1 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -242,8 +242,6 @@ 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; *dai_link = dl; diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 63bbfc30f35e9..cfef00462f661 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -121,8 +121,6 @@ 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->ignore_pmdown_time = 1; *dai_link = dl; From patchwork Sun Oct 20 23:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843341 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010008.outbound.protection.outlook.com [52.101.228.8]) (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 BC00D192B66 for ; Sun, 20 Oct 2024 23:59:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468748; cv=fail; b=a/s5LWFqVfq9eGTtZlhFnmXc4dWy8ZSvpwUHFpRK/0xMXkLXZAxkJ2dgRSuDC6joNA+h0lRtyolCU+6FmaahHiflStkguAY3KfXQfjdI3RHIYhPWBgxRD1nhmEhoeKxypsyzZvIUC2H8jkuosXRLBmPXWle26bkjQW7NX4/g9OY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468748; c=relaxed/simple; bh=3Ucwkp19BWOLUvwEfzpYyj34fSVgp7Xb5x80wBTMSQw=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=ToMWVEO/oCdQkv8Lh4B9nShbwLTOij2B4q3IIZ1Ladd32GM2YslnrI/ver6owD2HUJqk3SrbzbeQcBH7Cub/7KMNOAzp1q2jwxzDsxkxjYX972dgsZIQt4gNMgoyCSRAkKcJnReV0rVt/2ZqB4uwQnTVPXxnVdKU0vyshExZi5Y= 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=c38Dvzg9; arc=fail smtp.client-ip=52.101.228.8 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="c38Dvzg9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H6m8ueQCY/zZHRXpBEa15bVo5JZAm46HW0g0KpRBDsLRWFjk6KQc7OHuWOexvyhdioBTHo8mumSyoJ2altZ6ESEr+JiyhxE+u+aMg+Y4f3XMxm/OQr1ndrrV1VHmgJN96MS7Cd/DUXEkryey5IgpjY5DohZcH82HOQjZvnJFvFcFWIuVyxe1nDj+8e6xqma/F3uo7WUOjGbQ1N+U9CUwM1QU19/BU447SurPMHDwlbfukCnblyJ389Xo8n53Zy7Tl6Fgi9yjWzZx/m2PWijLBDIjzriIegheaYtwrgphk5Bs2fqhup8JcUg6ge7pNZAl0BBkz6DqOFsd3YHBvKhMig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=J2e2Z/10bLUXv6KLrIS10LR6wlFU2KJ/Og2wMV7fWUg=; b=Xie2BKWq8VEXfEV3wLQauP95/KXGFB9fTLh9RAkWpgD1V28mO0gtzYrLxLIg8SrOyvnUtWUTdcwhdhYU/HH5ObFoNpyLUWmw4OHEPiRQj9Cc1v4sdHdVtpX8j8DbiMfwo5wztKKk+56Mo7bANbV2cnEqR5L+01IdhLc3PfVjNvtLuz0z7rcUepwldG/n3nmxGpl9ed1nBKq4CuUhcFDhjzL3C3Ua9fdRTcdMfJ5hi5hMKmVRqVFu9K+MUNaq9nF/YfOppfdHn1AfeoKYNZRHPq/Py24ZlUglhcmE4W90S3r5ZXztpqqozr3pMS5+8enS8zPC1HYlZUQGaQQkNUvbBA== 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=J2e2Z/10bLUXv6KLrIS10LR6wlFU2KJ/Og2wMV7fWUg=; b=c38Dvzg9Km0a2jBayKlKLFxKaiuStIx3tohTeS+3hXZwokpznf0ey87RRqtK89DjUsJsmoHZr8BNNWLkroV7GN2NfmoWUUNA6filz35ZBgVdhckDSAS2Fh898skqKzp2+7uPOjHDYt55D4D2yGOGIiy03KDrKgM5RqQMgQn0ywA= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:04 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:04 +0000 Message-ID: <87ed4a9vi0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 05/13] ASoC: samsung: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:03 +0000 X-ClientProxiedBy: TYCP301CA0052.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 321e6462-1f25-40ed-5435-08dcf1632d03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 3doB0T0g3DZyoRaQXmLlvMzieOlu+dbm2a/tMo2crwETiAjmav6F8f1kEDyBiKLbh9Oe41p680ogUBnHXTOuBF8w5H+GzpKqLBGjnUn3z0PI7FKP5cnwH+vLCG4dHXkOATikArvPFGjvQYqcic6KILnS1Cuuz5pvLtY6rsbJqdtyyI4sRs5MLgjUV2AdTmcp0GAVvIak1Dm8XJF4FvG5va6xDbLl+HlSNRwZU/SIKgVlgJnGlE8+gNfM5GjZOjGFdQKuNKLDbtMyz/Nauks/CS/4VApaGRdW7rTeh8Nvtc0Mz9wfGEK0NXv1OKAhjJRU41L91ln+WIY/1+gKymfKqrItBEhNVpvfHrmIkpJW8R8jZd8P2r8joMciwiNBZ2JXH2zczm62IZGKcSsD9h/5woZPYPk0XYkMfEXFmqa4daC4RM6D5849fek5D7SpmyhXU1l8stt2GYuihUqhHZrqYrAaQ+1wg5m0aFSxQ3e0xPAlTnynOJlKPbxkIURLw5nii6WsMhoZjT9l9x4yKLP11pGmUHM7vbESJTJoucE2rY/PbJjwHCIJsBrd2F0B3790V4XTsaqjN00dFnJ6OKcLjbj9G/iwHe3sq13D+AxiW/+BLYxMZEPJx5q0xyxLfRp21LKkns2m8exQF1vBLmRo2hkiQ5P71ue+6J46EZek6UMi8MXulAeJN5DwWJXbkLRInQOh+GTT0i6quivYEHpoRyXBGKSKR/cyg+4Xi8kvLC87B3qaVnV+CSNgO1vTxn69aD36Q0+yHXgrDKmCLisgRYx++Vh/LhnGHv2U4TQvEQH76deoutmY1CHA2KsvCwzx//5Me8kgHyC/NPF5Jr52IleUg1P/N6Nu4eETVPW7MSG1mijIGzxbouaDdSep5h6CsylDEsSzu2RTkI7xfHswPG5U6ee1weXMmvplkoF+iUm0/AnB8Lt7vm2RQYApeLu6tWsOYeXjVAwsO0UEJ88l8Xv+76BHJhA6J7utwiiKaQAftmRoXAk0Nxq9hVpKMcK6HIa/B05L/kWh85o6w+sFqTVcHjQkNmrBdWxZkajWBj/V5Zw3a65PGoVGh/31IYx5GC4IvYlcov1NlZFWjAEY2kYDfXOFD+ebxun0oKcpWJ72JFLjXfitXhxWyW8A6R8DcETeRMbXMMPJKzUgIswC0GGtbfZGf6E1DIPDzrhPseaCbnJ/IMaw2wuUyYNTJQppYJlUHZjbAfTyO7IpmGW0riK+INZqG7WdHY+VA5nP4jWM4L+VBYk4keIMk2JeeZjvCz/wpeuf9fUqn2YCVc1pGNqAHzRUTq4yQATGrND2Gt/5oOUNQKM3PSjRaS3N3uZuMJw/h52fkihjIJhrcXm1Jc9u8mTsV7+FNMO7GvEnM7U= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TP6J0jev6HIs9/3OVbrI8318em+uNJrC8DPH77hdGgxCM+bmsh6A29hDzksRBaCvupVAVfej/8ZTArEvYYFXnzSj6PGQ2Jq1RPvS3ttxO/Z3i99AmJjZARnLFie1hS7IEv2lX8BNXulHP8cObgb52EXGeaW056FuEGBzfl9pAouN5phRRS7jGZhBQHrEROzAuf8wN+dVXBTgAJjpw0whZAmHNgsIwJLyTWAIHxDehwEBZ9dvzI5FLA9WM0sP7GuzUFMgVu8PEHp9kImi+3KNMF+b5SCXUdgWPcT9Zu+P8zqACheh000Swx2piJ0ckQqLrsc/yBiQsPgczmsRrLAjn7sTQaam0GXbDYx7JhZnmw+2MU/byQyTNP+o9/MFD789etE4ZPp6180Eve0Je5Fi1Iq1C7vy2q+NAlwfjyTx/EWvhYBJRyAV8Ghvr83TCtrsNT9zi+KddASR2AlaoJvheSKm2isp9e3ouTN9frIpL7fVhXl3AF6TS+8c35IY/xbCqYOotl1PfPDEsoxHNu9NHCU/Rvuz51UUJCpNnt/4g7epjwzu6dnAR3+COAQMFwTBZ+AfV7Hofml/3/uNkUVvhWDyKcH/NKlhEr/3akeY3OOQXVhr1I7uuVOte9UfrjWe0nBbrmzCvWFu2TjlUbb1jr8dHMRqE6XhEKlMXWr5ypPUFjE1tYf0fIXkeWJC+p464HAKOn15YkJ62nlM+Vn+dS3RD2EbbqceqmvsRg7//Y4cqHZtlpBwHAKFGKPccUDMgz8UO2n3ZOxJMUcq69LZYdzEoAKWDyMWJ2HRP1DFRjme0tTJEaqphwXlCcCivurIKCONgenc+UDFCebT8Nf88K4ga9dgv2soU1GFAE1Ztyi+jCcdrOmcIJ5FACO5H06wUPYv3hd347CkJtn2k19ngkMiXffq1VEWUlHvb2tkvXN2VJxkCAfyV6iXX8XTXi4pNg9m/iVPX1iqkhwz03/apxSoH8hFI0KgTFRgvD7MfNh8OdLrVkfTFcGvMaMPbXYYm4pGtlbW+0X32xEC8XuF6vmOXgd1GF8eYp8AzcEdVBszk83ukMW1VkLxcOtjrHTaPLPZSk97yI1dVlfJqPZT478ylRoYn07c1N11hGy3hPA3Uie22Yuml/lyukYOgiNIAI6Cgsu2qlr+nT3XsTWjGoayRrElXfaQusS84zgeWL3unu0bJv+sKOKBhMAqygYsxNWj7ROINvDCxt6+xtRaZOkbDJOwEiKdUomuPXQo8dEeu7W5EZpddT8pBH+DBrzOg7kVb/ZsfqHJ/FQESN2eiIr2GpRX/hsN/XI/0djxwNvbZXPZiHBiWGPB6z9BfJhCmlpTYo15WqC8nppWNjfbMv8vkoD7gVx9gwbDk/3hgqeZLI+wvVOSVKuYncHU9sf27dNKG82W0g3cbRcBvNjf3xYfpXt8KE1x99hIiyI/fPdkiroVdP2mDncAoG0nuLQxyOFiiQgcH1aFrbyg7Pbnw8f12rVRck5Sp+IM124LUbOZH+q6uQXyNhkHruhwPQljk/CyZNRM4c3lWiPDH1Glvn8qIz8TYqUXuEM7IrGLf6sYwQzkdoxgJpwGUoI2xLCL30R5aNtn7AJVtf1cuKVuvVpAb3D2JqzgKrZXCrXN2nI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 321e6462-1f25-40ed-5435-08dcf1632d03 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:03.9979 (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: u+5bv//vEwVXeqI8zVFJGQODAGwBH6F+wK6bHx2WMJAoh4EeUcKLYgNxfaIIhu7/GlIFICv50fOfoXLfbVC4/SLnjNd/q/7OlLOG+ieKdxb+xhlrBtRpCJFe3KL9eL6p X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/odroid.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index ed865cc07e2ef..40ac12c071455 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -171,25 +171,24 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Primary", .stream_name = "Primary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(primary), }, { /* BE <-> CODECs link */ .name = "I2S Mixer", .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAILINK_REG(mixer), }, { /* Secondary FE <-> BE link */ - .playback_only = 1, .ops = &odroid_card_fe_ops, .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } }; @@ -278,8 +277,8 @@ static int odroid_audio_probe(struct platform_device *pdev) /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { - card->dai_link[0].dpcm_capture = 1; - card->dai_link[1].dpcm_capture = 1; + card->dai_link[0].playback_only = 0; + card->dai_link[1].playback_only = 0; } priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); From patchwork Sun Oct 20 23:59: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: 13843342 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011044.outbound.protection.outlook.com [40.107.74.44]) (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 2D37A192B66 for ; Sun, 20 Oct 2024 23:59:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468756; cv=fail; b=FhPa1X6XYTtOzD3jEnGvEGHaBwCQMUEJSGsbgwDTCLQiNNqsP3v6QtVuJzdfRQoBn9v6IIjosTMa2uM4AAjYqu5a41ii7aKbTMHpojLyv5zFxlFcT3VIH2ccmFdogxI/ByOy7yHhVg8BpVA6wiNGJM2JQga+ACvHL17aeIt6WM8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468756; c=relaxed/simple; bh=pQkpjcmPEcGj2ip7jg3igqlrRArmCPbx8KHfvymo0BI=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=jV9D3ZiRnO4CoMW8Ijxy5MBA/Fo27LN3TxCJQh8TP4TPTnR0Z6JvSaQCGQBy/0cMmUtS2dgKa/ORwIHBcZcFJNNcF+YQNZReGXo+0SliJBZVJsktNMW8KK+hkleBkpTMoZH1rgrpkXsbdMgBncvK0Wvn+XPr7hjYB0x519SAYJw= 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=QZfDDdgI; arc=fail smtp.client-ip=40.107.74.44 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="QZfDDdgI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G9V92KiJrp3YmQQYzLVLWNVuZhxscdfcAQfTbMeK8CsyV08EuKtOcu4JrvFitr1pbz5G1rijK1GNBaTqCiHv//beQdAHayfvFyxQBnOSnCSL3WGaw/EonyARM4ffcLcmChqy7bt7sk9sQpAAA6QUocYhTAcAfFhH6uE7j93cnUV/qZQZN7VMOpY/sJKLfeIjcNmC6YpTTJn8KPtRCYTksRUGOYWMVV5zEZ7xI0aY8y3L41CWkyIonks2tC4MmA8wAbYRvOmptcmdHvQJ5ctYZ3oP8/sgP+U+90oggoP1DKnApgVMu5vrnNs3EkD0n151uwmlbzZayFmAXU2nGAXQsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PKSmbg0e1i2JyEjg01uQkSIGGs3KUauyeo8AeJYB0Cw=; b=Z/+7dYBfd5ikOxWqNzPECzJjaiBWEKqh6OaXTjJWiY3f80iRjDPRJx9g8IUoWAiAJupve9MM6d8O/FeEaakVLsC679BEiH5jUnvskQjy61Qw2RntreDZkPBZuOr+AoVlnmIzZc8dwOOl3Yr/sbda/7wGmXBDlyHRsgoKr0Z8U3Bd7qcNhR80RCO2nW1ZOEZeduDlLBctsw0CFE6k1O1Kr03fyd109V5+dx5M1tgCsBNX1qlkG9HBs8/9pl7Bt+yKSCk/+dN0+TdMR5GuyB5hoP9G+IIank6dgMbREWT9clIQw9kqO2nNyJ/K9rh4MJaPWF5eqWzsbzCH8WHBIe3jwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PKSmbg0e1i2JyEjg01uQkSIGGs3KUauyeo8AeJYB0Cw=; b=QZfDDdgIwc7o0IqpbVmK1VmRxcuKcMzpEEOtvDK05+Us1MSSL6cI34qJTdL1XUl+M9gJ0YoWSHBOzWOIFIoDROVJOJt9LeLqDhp/eXidCuoA9XNS+iTxSY+F1CQiKrD5jT8T+TpnNvDEC4whQ9+qC6iWz7i6g+LmO0HLfCnFJUg= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:09 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:09 +0000 Message-ID: <87cyju9vhu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 06/13] ASoC: mediatek: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:09 +0000 X-ClientProxiedBy: TYCP286CA0014.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dea6e51-c191-4980-85aa-08dcf1633041 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 0mrjHftC1H4xY99J0w6LPT9wwH2T2jrz0vyTH8jRbYOAJMXJ5W5dTXCa+tri1v2rz1HLBUNLiXU7nHvm5l6wsJAMGm5AuITBcfBGOHY3wwO/DEXao5CxBUfC64oHyBIJevWCCr7kmDktGXqvwT2TdEa5j97SmpqeaACKOb+s7LI/imFzBvm4V3hZrTHtH6SFGW/EKpmsVqPgJb2LZhsCOTnPFCmcZ1HnCmOXVXTnmKn8QrmYlR+qNhag+4t/xmJVmUyp8uvX92GvegIEtTOJsq/bKhsnXq2SxLZrKS0fxEE2c2EXoSP5O0QLQ9VD1Cdsn+yr1dkg2ivZUhT/FVTqk8S/+l8W8ZxZnTltHd5v9lwbwqkdJmgOUTEJydhMQCqbpxjou+vqPaCGaiQ6KKBc/tFEs8ELyTbmq3DKhrTT2ykvPyevyjU9TKzhv7hegN59PVocBdF2PMopz5sD0yuBPHkB71H9PcfDCQU+4wfNwg2SGToKHpTKP/DfzRF7jV6z6cCm/tnKIkVmfAZ1xZNuWfQC0Bovv3wThmbIRx3vwEapQZfHQJNRgrhXQ4+dqPKQWSwCwFeGqiNzO/bULiUf4gYzqpYY4YjXUX5X3aExgF8fZIOKrNun2WJWHWU1yAqC4uJOo+GTyYSa+mKgYmamcXeaW8OEFSZaOmBPHcfkJda61oGdbhYEmdbDWnr4W/SBvl1lNQxHShlNMmAvvLIL9WLCi+m7aA0Fm9LXHVjfcJW2OD7pHGdF3xFMAEbS4z02mWzMk3P+N2Teif7PaOmdsCZeidXPhghY81o7tpGKOgOSvQ6Pz6LwaIr7ONylNTWfFZ3lytN49N2L5kU384lPaDYCj2yk16vmd2Vm47OMJHaKmFJo0/tSoCVXSvLgJR2N+uooeeXcoyf8fUkwfRvPvbH/FOUHrLMlievaZTLZSA6aKt5IBNth4RABm5VziaHE/sNib14HoSLp41r0tIRYWM/BIm4deKVXLzLpn28HJ262dWFivP4uBUXadEGoJbSp7NNc1mnUnv1edUu2k9PS7QGL96JkYABx+m9xjMBOkpkJYemVXmWz2XLaQwXqtcsQPKvdiCQyp6xgrW2vBDsnOtd4MM2i1wzcp4gEfE55+puHa/ZkjqBHZgKNhE5qKhUxgZftiZ2+YNZcVQh8DOISnQMTs2yLSxVtEQrfq61mQGG4FLAwO8tln8oScZeb+p816tTlBWUW1Jk729x4IJ9dWnjDvmZgxEk31A+lMG0qbT9xcRyw5BOCXKKO9KsPqKKU3T2i5iPZe8Bjn1qPZToapT9B0amVF2Sqpv3xsd3xCURn4u9pCFhIXdYsNFpYkhmp752r9ETYWGEFLPGEltobHLr6N00/pB4mRXJupOGyJMs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sq5kjXby9GYehAUgbgYoq0KECWOAzMm4FPq7QJn3X8UwHgkER9jGk3PQoXRuvjjW6m+BN++sbxa2qINF7aKXyth9k6ZZEDwoUwl8CWnaIVWTJ4NJ7MT62nytgsPb5UUnMebzhEGjTLuIQ2UBANt9/Acy6auxmwoc88zgtfEoeBVm2rrqLr9OJBAeVZQmLO6vMcm2gDTZdGRVFTQA1CapQ4KNU2a+VbVlcv5sp1tAU4EZTKGOuujU5vSSDUZdLFa2VwAh5HYJUXxhJLfs3UlWP7IohRuKDNjjoX84MbjaOJG9jvImfaY6024BCN/+9bOof4lMm9Tlr28Leav70Ro4BDlSProdXpKCAwJ81ooCb+T+sT/BD/lup8zbFq/NmXl62hO8Ohmmj+3tk7kn0jIra0iHeTKo/O7CpAnao/SPHszGDKuNQqCM7YH+kG33185S7SELOpOcxpyNAXMmHx5Hin9GafZsnLJS9rgusj/7OSi5SlT+th5+LjPa2b6JXYuh10Zff5xEhaxdCVRuC+K3P3iUnbm8Zxyg6ikL7R6mBahqyjJeAibRW1ZuPHhQRhTKQNSljpDm375e+qQVOcDACoruZAja+tJDlpBq91Upj49Y3VmyzS7HX4mbbYCuPXtMFXkA6L0sznWLglpQ2b7wGs5ZJmvt8d6UAPiLQ0fyF14aXiReb4eEjJx2DAGQE9nIxFUr/n3RU/bfS9mrCKdcrbVwTy31BFp49nljeBkQah0+pd9utgVZl9BWN88uej570b+Y+peiRI2GS6pInkUbC75CBIB93hphQe01Fb/IFZ1M65eNQVFsIrMejtgjkW4j+5G152PPcwqGHmpGqgtC7t/mCCHpVKVr0+elt+u3nEW3Y636M2lyElcBk1ojronKRoe8Jcg/qmygUd31XQwbk3NniP1N5qvSai30LO5JhAwasIgnMAWQYEZhXbIGhV5ajhpeTlDd4qHRPkzYsXlu8IKXQedLb79jRsxUXVjsQSoX237D8+FfqJ3vh+SahX7Ckh4NmJNsO0FrEdlNv0ovPMt4n4J2Is6FGYxUe6BfZ6Dg9jMQzLQd7FIG2MyO6KZtgyJyVE25PetHP2IjNSf2NilBW/E03p4eqnqfFtf2kZZTbsQGDFe4ivVemNnrZRGCzKwyIx9UlLY7kHrBsqq0HtR2wtsDHs0WFQ4/PPtw+5RSVY+uao1TDMaU6aA9SIpYSuM3sAbRWo4Ij3QAeKVqrIyIJz1TmU9eDpgPIWwo69B7x1V8bAQOoeWTlhTLWvDrEUGlTGq+p10IJJtK34WaJMkZJA3MtncvYtEhM5xeV4DJRoD+cLcwab64KFP75GXhytngrTO5PlSEkPhUx9LLht38yWWlrbsfbCuuza3ZvITJn4anBjzh9wnXxjz8V0YFxuzc4puX804j3ZAWHKU3QPJHKXtiReIqUqfr+DbMBrr/qH4icYABlF2V7Ik/j81nxR12fi15M049q6JBHfd4KezNS71sxXUtdbAflChzom0QNnRI0o3pcrYkl7U5OXTxCn1TJyd9buOypevkpaY6XIzLSJqCk2vFnYdFV//XbuGj6hOwet0AMM9yurlrL9jS5ExeuRiqmivQqjysYCQbiiwY//OOm1ugHB4HuYlPm54= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dea6e51-c191-4980-85aa-08dcf1633041 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:09.4919 (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: L7+KWRB0ncQhFqxEjIL2E83ZVO0dMi0PndlE08uF7fWTMMy5od+QGFtaebW1X3/HLSnHDK/Fdk+h7EgBG0ZZ98krrQySZ/Ncvm3sWU2G/iUi0hJQbI069HAmmCSP/ii0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 20 ++--- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 24 ++---- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 6 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- .../mediatek/mt8173/mt8173-rt5650-rt5676.c | 10 +-- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +-- .../mediatek/mt8183/mt8183-da7219-max98357.c | 34 +++----- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 34 +++----- sound/soc/mediatek/mt8186/mt8186-mt6366.c | 86 +++++++------------ sound/soc/mediatek/mt8188/mt8188-mt6359.c | 58 ++++++------- .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 78 ++++++++--------- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 60 +++++++------ sound/soc/mediatek/mt8365/mt8365-mt6357.c | 14 ++- 15 files changed, 185 insertions(+), 267 deletions(-) diff --git a/sound/soc/mediatek/mt2701/mt2701-cs42448.c b/sound/soc/mediatek/mt2701/mt2701-cs42448.c index 4974b0536b7bb..00a79867235d2 100644 --- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c +++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c @@ -221,7 +221,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_multi_ch_out), }, [DAI_LINK_FE_PCM0_IN] = { @@ -231,7 +231,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm0_in), }, [DAI_LINK_FE_PCM1_IN] = { @@ -241,7 +241,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST}, .ops = &mt2701_cs42448_48k_fe_ops, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_pcm1_in), }, [DAI_LINK_FE_BT_OUT] = { @@ -250,7 +250,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(fe_bt_out), }, [DAI_LINK_FE_BT_IN] = { @@ -259,7 +259,7 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(fe_bt_in), }, /* BE */ @@ -269,8 +269,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s0), }, [DAI_LINK_BE_I2S1] = { @@ -279,8 +277,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s1), }, [DAI_LINK_BE_I2S2] = { @@ -289,8 +285,6 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s2), }, [DAI_LINK_BE_I2S3] = { @@ -299,15 +293,11 @@ static struct snd_soc_dai_link mt2701_cs42448_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_cs42448_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_i2s3), }, [DAI_LINK_BE_MRG_BT] = { .name = "mt2701-cs42448-MRG-BT", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(be_mrg_bt), }, }; diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c index 8a6643bfe830e..2814f0570928f 100644 --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c @@ -67,7 +67,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -76,7 +76,7 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -86,8 +86,6 @@ static struct snd_soc_dai_link mt2701_wm8960_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, .ops = &mt2701_wm8960_be_ops, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index 784c201b8fd4b..daad9544a8d41 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c @@ -78,7 +78,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_1), }, { @@ -87,7 +87,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_2), }, { @@ -96,7 +96,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_3), }, { @@ -105,7 +105,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_1), }, { @@ -114,7 +114,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_2), }, { @@ -123,7 +123,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_3), }, { @@ -132,7 +132,7 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono_1), }, { @@ -141,8 +141,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -152,8 +150,6 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_speech), }, @@ -161,24 +157,18 @@ static struct snd_soc_dai_link mt6797_mt6351_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c index 6982e833421d6..c3d1e2eeb0e57 100644 --- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c +++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c @@ -45,7 +45,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -54,7 +54,7 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* BE */ @@ -65,8 +65,6 @@ static struct snd_soc_dai_link mt7986_wm8960_dai_links[] = { SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_GATED, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-max98090.c b/sound/soc/mediatek/mt8173/mt8173-max98090.c index 0557a287c641a..0724564cee6a6 100644 --- a/sound/soc/mediatek/mt8173/mt8173-max98090.c +++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c @@ -104,7 +104,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, { @@ -112,7 +112,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .stream_name = "MAX98090 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -123,8 +123,6 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = { .ops = &mt8173_max98090_ops, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(hifi), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index 4ed06c2690652..d8e4e70d834ce 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c @@ -139,7 +139,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -147,7 +147,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { .stream_name = "rt5650_rt5514 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, /* Back End DAI links */ @@ -159,8 +159,6 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5514_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5514_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, }; diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 763067c211539..488f2314dbf78 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -171,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -179,7 +179,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "rt5650_rt5676 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -187,7 +187,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, @@ -200,14 +200,12 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_rt5676_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_be), }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */ diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index 466f176f8e948..59c19fdd86758 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -210,7 +210,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Playback", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback), }, [DAI_LINK_CAPTURE] = { @@ -218,7 +218,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "rt5650 Capture", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture), }, [DAI_LINK_HDMI] = { @@ -226,7 +226,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .stream_name = "HDMI PCM", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(hdmi_pcm), }, /* Back End DAI links */ @@ -238,14 +238,12 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { SND_SOC_DAIFMT_CBS_CFS, .ops = &mt8173_rt5650_ops, .ignore_pmdown_time = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(codec), }, [DAI_LINK_HDMI_I2S] = { .name = "HDMI BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .init = mt8173_rt5650_hdmi_init, SND_SOC_DAILINK_REG(hdmi_be), }, diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index f848e14b091a1..1d8881e0a361a 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -425,7 +425,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -435,7 +435,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -445,7 +445,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -454,7 +454,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -464,7 +464,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -473,7 +473,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_da7219_max98357_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -483,7 +483,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -492,38 +492,32 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* BE */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -532,7 +526,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -541,7 +535,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_da7219_i2s_ops, @@ -551,13 +545,13 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -570,7 +564,7 @@ static struct snd_soc_dai_link mt8183_da7219_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index bb6df056a8789..6267c8554c152 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -430,7 +430,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(playback1), }, @@ -440,7 +440,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(playback2), }, @@ -450,7 +450,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback3), }, { @@ -459,7 +459,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ts3a227_max98357_bt_sco_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -469,7 +469,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, { @@ -478,7 +478,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8183_mt6358_ops, SND_SOC_DAILINK_REG(capture3), }, @@ -488,7 +488,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono), }, { @@ -497,7 +497,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, { @@ -513,31 +513,25 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -545,7 +539,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -554,7 +548,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, @@ -564,13 +558,13 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, }, { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .ops = &mt8183_mt6358_i2s_ops, .init = &mt8183_bt_init, @@ -582,7 +576,7 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_tdm_ops, diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366.c b/sound/soc/mediatek/mt8186/mt8186-mt6366.c index 771d53611c2a4..a5ef913743d4e 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366.c @@ -647,7 +647,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -660,7 +660,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -669,7 +669,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -681,7 +681,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -694,7 +694,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -703,7 +703,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -712,7 +712,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -721,7 +721,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -730,7 +730,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -739,7 +739,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, { @@ -748,7 +748,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -761,7 +761,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -770,7 +770,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -783,7 +783,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -792,7 +792,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_format = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, @@ -804,7 +804,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -813,8 +813,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_lpbk), }, @@ -824,8 +822,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_fm), }, @@ -835,8 +831,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src1), }, @@ -846,8 +840,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_bargein), }, @@ -857,7 +849,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_hw_gain_aaudio), }, @@ -867,8 +859,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_src_aaudio), }, @@ -876,8 +866,6 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = primary_codec_init, SND_SOC_DAILINK_REG(adda), @@ -888,7 +876,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_mt6366_rt1019_rt5682s_hdmi_init, SND_SOC_DAILINK_REG(i2s3), @@ -896,7 +884,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .ops = &mt8186_rt5682s_i2s_ops, SND_SOC_DAILINK_REG(i2s0), @@ -904,7 +892,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .init = mt8186_headset_codec_init, SND_SOC_DAILINK_REG(i2s1), @@ -912,46 +900,38 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(i2s2), }, { .name = "HW Gain 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain1), }, { .name = "HW Gain 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_gain2), }, { .name = "HW_SRC_1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src1), }, { .name = "HW_SRC_2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hw_src2), }, { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, @@ -960,15 +940,13 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_IF, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "TDM IN", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(tdm_in), }, @@ -976,35 +954,35 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "Hostless_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul1), }, { .name = "Hostless_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul2), }, { .name = "Hostless_UL3", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul3), }, { .name = "Hostless_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul5), }, { .name = "Hostless_UL6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(hostless_ul6), }, @@ -1012,25 +990,25 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = { { .name = "AFE_SOF_DL1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL1), }, { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, { .name = "AFE_SOF_UL1", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL1), }, { .name = "AFE_SOF_UL2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(AFE_SOF_UL2), }, }; diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index 08ae962afeb92..84abdba9ddb6d 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -932,7 +932,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -946,7 +946,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -974,7 +974,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, [DAI_LINK_DL8_FE] = { @@ -985,7 +985,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, [DAI_LINK_DL10_FE] = { @@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback10), }, [DAI_LINK_DL11_FE] = { @@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback11), }, [DAI_LINK_UL1_FE] = { @@ -1018,7 +1018,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture1), }, [DAI_LINK_UL2_FE] = { @@ -1029,7 +1029,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture2), }, [DAI_LINK_UL3_FE] = { @@ -1040,7 +1040,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, [DAI_LINK_UL4_FE] = { @@ -1051,7 +1051,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1065,7 +1065,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_chan = 1, .dpcm_merged_rate = 1, .dpcm_merged_format = 1, @@ -1079,7 +1079,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, [DAI_LINK_UL8_FE] = { @@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, [DAI_LINK_UL9_FE] = { @@ -1101,7 +1101,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture9), }, [DAI_LINK_UL10_FE] = { @@ -1112,14 +1112,14 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture10), }, /* BE */ [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(dl_src), }, [DAI_LINK_DPTX_BE] = { @@ -1127,7 +1127,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .ops = &mt8188_dptx_ops, .be_hw_params_fixup = mt8188_dptx_hw_params_fixup, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(dptx), }, [DAI_LINK_ETDM1_IN_BE] = { @@ -1136,7 +1136,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(etdm1_in), }, @@ -1146,7 +1146,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(etdm2_in), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -1155,7 +1155,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm1_out), }, [DAI_LINK_ETDM2_OUT_BE] = { @@ -1164,7 +1164,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm2_out), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1173,7 +1173,7 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(etdm3_out), }, [DAI_LINK_PCM1_BE] = { @@ -1182,14 +1182,12 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(pcm1), }, [DAI_LINK_UL_SRC_BE] = { .name = "UL_SRC_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(ul_src), }, @@ -1197,28 +1195,28 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { [DAI_LINK_SOF_DL2_BE] = { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8188_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index db00704e206d6..1aba9c75594eb 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -598,7 +598,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback1), }, { @@ -607,7 +607,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback12), }, { @@ -616,7 +616,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback2), }, { @@ -625,7 +625,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(playback3), }, @@ -635,7 +635,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback4), }, { @@ -644,7 +644,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback5), }, { @@ -653,7 +653,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback6), }, { @@ -662,7 +662,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback7), }, { @@ -671,7 +671,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback8), }, { @@ -680,7 +680,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback9), }, { @@ -689,7 +689,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(capture1), }, @@ -699,7 +699,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(capture2), }, @@ -709,7 +709,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture3), }, { @@ -718,7 +718,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture4), }, { @@ -727,7 +727,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture5), }, { @@ -736,7 +736,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture6), }, { @@ -745,7 +745,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture7), }, { @@ -754,7 +754,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture8), }, { @@ -763,7 +763,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono1), }, { @@ -772,7 +772,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono2), }, { @@ -781,7 +781,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(capture_mono3), }, { @@ -790,15 +790,13 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .trigger = {SND_SOC_DPCM_TRIGGER_PRE, SND_SOC_DPCM_TRIGGER_PRE}, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(playback_hdmi), }, /* Back End DAI links */ { .name = "Primary Codec", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, .init = mt8192_mt6359_init, SND_SOC_DAILINK_REG(primary_codec), @@ -806,29 +804,27 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "Primary Codec CH34", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(primary_codec_ch34), }, { .name = "AP_DMIC", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic), }, { .name = "AP_DMIC_CH34", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(ap_dmic_ch34), }, { .name = "I2S0", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s0), @@ -836,7 +832,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S1", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s1), @@ -844,7 +840,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S2", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s2), @@ -852,7 +848,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s3), @@ -860,7 +856,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S5", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s5), @@ -868,7 +864,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S6", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s6), @@ -876,7 +872,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S7", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s7), @@ -884,7 +880,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S8", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, .init = mt8192_rt5682_init, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, @@ -894,7 +890,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "I2S9", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, SND_SOC_DAILINK_REG(i2s9), @@ -903,23 +899,19 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { { .name = "CONNSYS_I2S", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(connsys_i2s), }, { .name = "PCM 1", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm1), }, { .name = "PCM 2", .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ignore_suspend = 1, SND_SOC_DAILINK_REG(pcm2), }, @@ -929,7 +921,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBM_CFM, - .dpcm_playback = 1, + .playback_only = 1, .ignore_suspend = 1, .be_hw_params_fixup = mt8192_i2s_hw_params_fixup, .ignore = 1, diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 2832ef78eaed7..56b9d2433a1eb 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -913,7 +913,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL2_FE), }, @@ -925,7 +925,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL3_FE), }, @@ -937,7 +937,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL6_FE), }, @@ -949,7 +949,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL7_FE), }, [DAI_LINK_DL8_FE] = { @@ -960,7 +960,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL8_FE), }, @@ -972,7 +972,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_hdmitx_dptx_playback_ops, SND_SOC_DAILINK_REG(DL10_FE), }, @@ -984,7 +984,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mtk_soundcard_common_playback_ops, SND_SOC_DAILINK_REG(DL11_FE), }, @@ -996,7 +996,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL1_FE), }, [DAI_LINK_UL2_FE] = { @@ -1007,7 +1007,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL2_FE), }, @@ -1019,7 +1019,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL3_FE), }, @@ -1031,7 +1031,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL4_FE), }, @@ -1043,7 +1043,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL5_FE), }, @@ -1055,7 +1055,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_PRE, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL6_FE), }, [DAI_LINK_UL8_FE] = { @@ -1066,7 +1066,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL8_FE), }, @@ -1078,7 +1078,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL9_FE), }, @@ -1090,7 +1090,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { SND_SOC_DPCM_TRIGGER_POST, }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mtk_soundcard_common_capture_ops, SND_SOC_DAILINK_REG(UL10_FE), }, @@ -1098,13 +1098,13 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { [DAI_LINK_DL_SRC_BE] = { .name = "DL_SRC_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(DL_SRC_BE), }, [DAI_LINK_DPTX_BE] = { .name = "DPTX_BE", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_dptx_ops, .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, SND_SOC_DAILINK_REG(DPTX_BE), @@ -1115,7 +1115,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(ETDM1_IN_BE), }, [DAI_LINK_ETDM2_IN_BE] = { @@ -1124,7 +1124,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_capture = 1, + .capture_only = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_IN_BE), }, @@ -1134,7 +1134,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), }, @@ -1144,7 +1144,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM2_OUT_BE), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1153,7 +1153,7 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(ETDM3_OUT_BE), }, [DAI_LINK_PCM1_BE] = { @@ -1162,48 +1162,46 @@ static struct snd_soc_dai_link mt8195_mt6359_dai_links[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(PCM1_BE), }, [DAI_LINK_UL_SRC1_BE] = { .name = "UL_SRC1_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC1_BE), }, [DAI_LINK_UL_SRC2_BE] = { .name = "UL_SRC2_BE", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(UL_SRC2_BE), }, /* SOF BE */ [DAI_LINK_SOF_DL2_BE] = { .name = "AFE_SOF_DL2", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL2), }, [DAI_LINK_SOF_DL3_BE] = { .name = "AFE_SOF_DL3", .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_DL3), }, [DAI_LINK_SOF_UL4_BE] = { .name = "AFE_SOF_UL4", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL4), }, [DAI_LINK_SOF_UL5_BE] = { .name = "AFE_SOF_UL5", .no_pcm = 1, - .dpcm_capture = 1, + .capture_only = 1, .ops = &mt8195_sof_be_ops, SND_SOC_DAILINK_REG(AFE_SOF_UL5), }, diff --git a/sound/soc/mediatek/mt8365/mt8365-mt6357.c b/sound/soc/mediatek/mt8365/mt8365-mt6357.c index 42cbdfdfadb55..d398e83ea0528 100644 --- a/sound/soc/mediatek/mt8365/mt8365-mt6357.c +++ b/sound/soc/mediatek/mt8365/mt8365-mt6357.c @@ -168,7 +168,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(playback1), }, @@ -181,7 +181,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(playback2), }, @@ -194,7 +194,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(awb_capture), }, @@ -207,7 +207,7 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { SND_SOC_DPCM_TRIGGER_POST }, .dynamic = 1, - .dpcm_capture = 1, + .capture_only = 1, .dpcm_merged_rate = 1, SND_SOC_DAILINK_REG(vul), }, @@ -219,23 +219,19 @@ static struct snd_soc_dai_link mt8365_mt6357_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(i2s3), }, [DAI_LINK_DMIC] = { .name = "DMIC_BE", .no_pcm = 1, .id = DAI_LINK_DMIC, - .dpcm_capture = 1, + .capture_only = 1, SND_SOC_DAILINK_REG(dmic), }, [DAI_LINK_INT_ADDA] = { .name = "MTK_Codec", .no_pcm = 1, .id = DAI_LINK_INT_ADDA, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &mt8365_mt6357_int_adda_ops, SND_SOC_DAILINK_REG(primary_codec), }, From patchwork Sun Oct 20 23:59:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843343 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011044.outbound.protection.outlook.com [40.107.74.44]) (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 C4C2D197A77 for ; Sun, 20 Oct 2024 23:59:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468759; cv=fail; b=FJ1aSSpz62tkVIeI9p1Xee9uLckpT/GarxvTMf8SpN1VlftKOjmQV3V2WetAE9DOArLFEPTLd1e1sXsLiFqxp4hZYFI6D9f3KA0OwXh1RskvMn0Wex/qk8Nw8tecA5tzvtYF+R4zjLtqMvv6H+jmgZd135QVznmHlx1H9fjTuD0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468759; c=relaxed/simple; bh=n7fERorHze2JmC+6AyjZBH0qej2nC8phi50bjVYRW4E=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=iDEtYD8zfOw3b6biGDsAt8heE+GTyn/uQy7tOnxrUG0BUpfvdhqmiSEKeU84s22wO9f9N30zgbzIP+k2X2hgqUd7ZVeWoxT58j17/yl4sp60Z2hK+ygbUEcKosmi0lyTLpQ8ztpxEewiFw9v/ffkTXCyB4+O/aroMNcFw9cLQLY= 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=juHFNwzg; arc=fail smtp.client-ip=40.107.74.44 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="juHFNwzg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MZv3n+1yaBCWYLfY6MEdGRPWclwKBriXGDhwL/H0g07ab/U1akCHYciqOGa04VwSqA/vIhiAdB7x3N9D2CaLeGWRdPW0OvNlvlcDEcMUWyuKomByPG/lGDVoqcnCKsWygrAjX4Y/MHV50KkKog20eSKB8YcnvdFdvNdjOCER1O1p1SzIgMq2QT8/dpv+/wo4sWZ7nEMnbt+To8NJy00oqHg+yhj20uQl0HcIP2P+1B356wtzUEawcb39Xi37EZn2r86cYYBOhurX83hcsXf0eE4LFFQiMMPRHOkelY4qdkBljxOavmTOVm7P8SdfHYDWWNMiHBYSt1m2IcAvG80hgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VQbtWGqjWwJrlbSHrPG6x4hwYFF+NyLgnSgjClQ7fyo=; b=guBSSIy9QrhlD391jhwdpOMZFDfZ7r1Mx+pyJBlZSPCfFc8c0/uokdzJPeLmL3JWulFwlyrCaRm+MTM4EIOQSJLh/s2E9Hghnro9uudt/mmOfXcYyZaF7VLDN9jCXJKxTtjDNyDM37qXhcMz2MPDSdBTxUg9F3Qrd02H7NubYmz+8ljKf9mgQOOwy9f9xqF9ythRPNrRPAwJ3wybkXTbDRHS/nq/uXBtbQTXTnDxAg2G1dWuA9iJytK/NL1wAX908Phleo12GXoGpQuyuBiztoSXsWjRPR/093hm8nVyn9UMxtt8o/ko1yarm0n2GltHC5X9KmQoTtyV7MjyGnlcCw== 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=VQbtWGqjWwJrlbSHrPG6x4hwYFF+NyLgnSgjClQ7fyo=; b=juHFNwzgv6zWf9FMDn823ubNwVWetjsR6F9rdxTUK62mWdwBVnknHR8ukpnDWxLgpJ8kPC6BMliqfi+W/FIDCCkiXWObPpTa+WsqxEgI1xrDUyDf5mzDoC3cMcqvmUFTkCRJFcPuRgy9yRmqP791NfbPPQKMtGZ4okHmANMWaUk= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:15 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:15 +0000 Message-ID: <87bjze9vhp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 07/13] ASoC: soc-core: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:14 +0000 X-ClientProxiedBy: TYAPR01CA0167.jpnprd01.prod.outlook.com (2603:1096:404:7e::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 75f9ba41-efaf-4382-49d5-08dcf163339a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 21N2EMTJWDHTmJQQXW7o+cYNLOMM0p5ZFSYs7hpho3L047dPqRdVWKIMc40LShAkKyAr1GDEdWr8jV2ggS1kMoYAZto8OcQnquN5CJ/XBTcryBRWl7QIR1Fi5YZVugVPeUAYE8R4Gdi3MCoFfAfPMWXrjJgk0MlCRq2dBCmcw0hwM5LB3K/v6ovI7Qw44DQZSuGneZd6T9lzgHKD7nnVn2PkXXd6ctOhoiBlzOPfAW6Nq02gi3EoRq1zmj89TE94I6qmJeemN/C3qSwfQL7mwDSezBNiCtHtJqOkQTSzWRCm6XqaEFDmuC1VHMXFcMh5L9Fzg3SaQXjIysJnY1GvKHZoFt3IEdjSnp8gcuk0xukuJe89iMokwVcwB7GsJV1ycMfFa501SZLujY7LcZz5uTVGx4vcKaz9DyTkkljiB2dU9Dw8OdJioJooPJp/4CCaRpXqE2BeBTv3B/zfEEToevDheCoFgJG3gUVzp8nhxZpNjqeAEaGCimYGUBDxbbRYdy3a06qX/30ndecF/88TsT5XF45k5OU+FJr1xJGYrHXNg07yDm4BO7A7H1+ndVd8Hv50nIyskUEQlKh5aPxNAmn9fZBwzsWpiS+8VP4EDjaH5q5HxyWaFuZ5BS8452w6OV2ehGU3Lhu22x2Ophu3o1XRljhIyQAmG+d/NI4D2woBA0FKVhnk6B8juCA9FXKvrBbCqAHiydOCaWAfnHco46jpwuLmMN0XdTo4tmD2ULA+Ps0ZTR1E3e2nxA+5S1bSYDLyaTNfZZNUZ1AB8AXAzr92ttGQ4As7Qx6z6MgEGYd4jCX82QxvYNRvLtyluX8/RWSdEQrC/MfLnvSiqImsdKcIxxfDYpAev14J6aDZPjS14ePpfQhRQrxT5CqUytAPEOZYLQpUvHXhpVojcHT9E4/Neorgi6EdNrP/u+1Iq6cwSoeSMX8/84hYTbUyigi007eDfWHVZgMCGXIg/InpAhClgR0FHpsew+b5ruueRLKZePGIowJQ8KQEsLmvLOhgI+ADfyUFsCI4kEp9PE3q9yk10tS6xm+0SiQFRr62y2yuRgClZuZF7kKqnr5cEBEhHIBRm2qVr0XxbcX8LGpsijWIf46+6Gtjdv7fNaHzvqCRX0AZ1s3q1pe1EwMcRFFbHbFA4pgEAjqMqVqqXUxDlZs3yd6ohar1mGSuzuid55d3nyslffrACPzTVj2grFEIrU6arwcS6srypYCa3Q/hiUgxN70Ps+nkuAu79uGt0qdZTUE8524tCkHGlqcsTOkokvG1ID6leKbfdNoAoV34989vPw8LOdTLIBTYUTZhEKkI8fpbQAssgVUHpWjw6ElRn6JB05GOVtZxibKv13U7QO+3oxsWvr/FjFMwwHLgh7Q= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Gpt3xP2hJZq/SfN5acDnG+ovH0an37BkOcHg/Iuv2zUw7wQatyRIN3Tf27qQJSTp1JzvIQKvO5+vlYmHZkZyBCJz8E1p6MvJe5x0tx5ELh0yKPJXdQ1nmd7bwPirwNi7tra2vbKubEcN+ehscz5uWiEs7KQBJUfOsg/kgQ7mJr276KBbt3BUYn/rj7PwPDI+8OzQqON8SEiyjhX70Cte5i3hmkcYjLyCf0CVRnWrpmTpHH3FAgXwnKne4xt1DDV7kEDXlbQ0jUXCfM5OvryH1hzVg3tFS7g389nYjniknZRWpdAYbRLFhtBpUXrwunUzxluuOv09j22YPLk05PhVZCD7DB3DQwECsvsgnKEaCBdoBSIjJIHKEP2md+YUSM6m4xFhwOlchwglx5lkI56oB0xb0zFQGM6uy00Mxb8/g8T//lP21TfOc9MfJwda+MHS144F1+++9jZ5WD9h/btmDjz2N3cxWTcGm4X+sA2b7be2avZzGAKJnHGCcKdVRW0yKF3HtTarV4ZH/kdxVzWh6nvPpKx9qZCgkssQ4KI48R75OUg0gjCax41VH56lOp/gXQ+u0s8Ddz8v+Jnfubqike93y+XkY4yhyPcz9d5qRZx0U4CU8+OjICuitWV+f2RgkEgoYSnQVoqBGwKflfdzSDHnCfjGOM3oME/sNFs0U3s4yH3BG1Zc4tVEOh9tE2/Zk21KPLSl6w1EHhjyA3VHPrRzOrkYf+d1EnXZqjeoy/bvEPEaMD/4/+vaxaZofohHLMAvetlYSuVbztQY5P9JlqZigEg7IxDWpLMI0V0s3y7GpYKZPAMrg1UMYIzd+8YsVWtDRC5Uvwim6A4jF+PVDHecavClOQC2xGm6oyUL43cgVKNVzbcHyJ9gOFwAMM84OOFcok6QXyoyejTfPYB0/qWWHkgE3ggoNjee6zbyPAyrHQu1IOS/X5xGfBVWwPQ5VGERV3m47eXt/EazZa4goKPXL9uZm9osweUA1viBPstZV+99vLBzzExMIu3rWe2AGQWKU48ahyNFhJq3kJfAMxZeUNpZFOeVKuGAwtvY+tK/wMKRWbmPjOXEIQZaTgYZWmfr3Q5bByh3/4rhFbnH3SoQivbofF+DYF66t3xbVcV4mQ7NmAFoNycF/T8+QPYmvm5HMKGFVeea9W6I1i0TJuQkNwIZQ/u8DBOoU8BAYDaTBa/si7/PRz7t7CCn2HBqqaC55w0FdkDhufjP03BfO8joft9QvGZdbu7bqAMrlDEoXMHSkaQbFxgu4xen2cyskCZk0f8D5iL0vWid13A+J3CKVAYsMsr9JdLqbpD11D6LogUM1LINfEE1kzH7h8XnN4/zRSR74bDdjtvQrvTZ5scgXAozjnlsJ5mj+P90eHypELpaMaG/zq0pgBWdcnMyiAkLN6VRjniEx5npTKUwpiST1aB/U+BNGjr5LpbcEQdYUB3g7DfmTlo/OrVtdWfLfXnWsdbwKE9kukApQK1N+EG9l2tocEurKquVDXht8wWNEjolfazhu+pyLCQxoT8wcQSlLgO+vKAKHOhre3ve2ppgF+DAwNhTwNmWeAXeExJvkeR2hL4lTKP9JoRl/NcyPwq0qQirNeSWIC/zA6C/SVHDv9qLM+6QFP3udUJ3W+g= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75f9ba41-efaf-4382-49d5-08dcf163339a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:15.0727 (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: JqOMOElzXLgrBNYm/XyuhO7mY1qVhsIZqoKX6Bkg6ZyzLkNDMU0yGvXFBG5rTxnW+3sYcEQZQTESUCLJeBLL3NFUJSkpEW2pLzedY3pStzODVztJEhPzk8XAY/HMvj4J X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 20248a29d1674..f04b671ce33ea 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1999,25 +1999,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name; /* convert non BE into BE */ - if (!dai_link->no_pcm) { - dai_link->no_pcm = 1; - - if (dai_link->dpcm_playback) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n", - dai_link->name); - if (dai_link->dpcm_capture) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=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; - } - } + dai_link->no_pcm = 1; /* * override any BE fixups From patchwork Sun Oct 20 23:59: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: 13843344 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011061.outbound.protection.outlook.com [40.107.74.61]) (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 4ED1F197A67 for ; Sun, 20 Oct 2024 23:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468764; cv=fail; b=S/k3t8DKXHqsLPWucGbhr8Wzv2FNydMw+Q9LTDTzV9WWedcA3GpK9PfOpU/qPih/toBWws0d6o23tYyL/xXyWw8nSZmpl2sZUzNPJonJ94CGv8nw/i4zCw+OtBrSkSL5qgcX5ZDQ0hMr7jtAHEMMHSbL2DvmsccWv4c40Q3kXPk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468764; c=relaxed/simple; bh=dWJ9aiL0KPdEdwUWlUtMQzWpBBRw5tjhFlKXxKwqj90=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=dJg7jdMhdToTF9z8s5b0UIAkQZQCJWge+0v4toiMdp73OvkiMEfBONxcV9rCQTI3nK360RJ2AhQczr7FUv95uMuTPKUQffPVFKpLIrCKrHA9rro/ENhHElQSKGXf4x2Oo13B9CZXQs7RG/ACtcFeOmLlvPvrEUlxPQe/YK7JXw8= 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=mvt6htHN; arc=fail smtp.client-ip=40.107.74.61 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="mvt6htHN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jpaVOVSNl0rxa5VMD1OwYmde0EBwYX6xEFMH5DTqBtlgXQIjFhmp8zr9mWk3cgTOCzuFeEwS4ccbqg9fqyhXfwh1ZF4T1VVQIU/h8t+1NjKf4qr8bK1hSaMmLibamwFS/5BkTXk4vseUjP/S+ms67L9w0sRtXXB8Hht7OJiYSh3Shd8vWuJEi32yRsqPPrGLAevsHcl1/G4L0212vBV6bCIZEnjh8K2LxhNHsMNYUsS76NN/bSyY5AP3H1fM/DwBQ5apq4IiaTGtPVuW5bxr0ZUcfs4bR1dEx9bjujcKSF3kGZG8iCI+GoCwGjzB1DkwWy1B/Gh+ocVcBWdSnEyncQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ipWWxJjMu/EVkBUzGA8d5t1ousLvweYqHA9t/geTqS8=; b=eYW0SQfFREcYA6fwT2cXxa3vtqzD9wvoIk/5q36Ob2oB1GJl6xeMaKnvUbigFckmOFz19A/HMB4OtvG+9CcHHz1Ze+b0OgvgrVvkcTxR76BVeRNHJ9t2rZaT7rtI48Px9z2OvLY6EAI3N/GUkUzvg7SRalGWipFeHkCMRhHXJ7/YrSWWxbl4fiqTmWbcQ/RIrAuzx3jJ+OVrLs8eQ5y9w0aXbRqLOa/BFH2BfT7FZcJwGXJed0gmEDBPOfvrc1KYlI3cwFx3ADv6h1KYfsI0CVcf6g+4Ats/PdqvCuytvhggT7ad5r4J3fAJ/8SbIM3kNlpxw4zayfq4ZmL+TN5MYg== 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=ipWWxJjMu/EVkBUzGA8d5t1ousLvweYqHA9t/geTqS8=; b=mvt6htHN1PspsdN5T+CPITW6xuFIgWiBen1smRhheNta4KTXYVI5mCIJB2Mr8vh9HPcPUGYO+Mrf5kLLRrTec5Lg1EtJh2N3eVmpLJqXT/3RCle0t0aZiQa8XHveb9OwBVjOsTslYJX2U97Dv9NjTRNzbjPfQo3ChT+cgeJGW8I= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:20 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:20 +0000 Message-ID: <87a5ey9vhj.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 08/13] ASoC: soc-compress: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:20 +0000 X-ClientProxiedBy: TYCPR01CA0031.jpnprd01.prod.outlook.com (2603:1096:405:1::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 7aac8d19-a9f8-4a63-99eb-08dcf16336e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Zito7ZCEkHeGDmtV8bkZ7UB3l8f8MGsY8y0cP087jqeLT2+g6raR9I+zzcXJbAzlwhXLFPjoGULAK5tZItWrSVdzEwJG8/IitGMjtdUw0g65cZOdzA/BJrCKH8OsBSVHM2uNjbSjE3s+yRP4YP21gFzy32orG/igV52k5TrgFVRBs3b1tZ46Dipbi62ofjySjvWtfkcUJn3zQBwiS7KvZc2YiFry7jEAQCbzKXNH6A2xYWugPKSbdO9/LlM84zpTpbqwU9T9zH246ol2FbfAh7aEcMtPbJN0cHYsCkiE7zg8qxxOwIShsOo3CX5pWVFo6xWB3jgz3mYwHsYFuOtoT1kIATvKFy4RZ3Swn62CtoutNDJg5pepnHBRsMbS8OnljsWJ8vkD465U5wNMhYE2bkmh7UlzUwrr57ag4iTj5r0/Hvq37ZM4c4lUMG0S4OMjd7nclhe3s7E60AV4lVC4Qb6/UKBUrxXItVfdN3P5Z/fg4OJpYd7wj+SlUuGM1t/8j1ffmEsGrHaH9xnIHcLfxxGeKUtTCif6jt3Uha3NKN25OZW+TgrAAbwRldKwHLmR32qB/o9VrFS+zQM0lbQt4jrSHginXqttEGg2xwrkyfP34j0hTr6YDNmylmWkS4As0JT5N1OEsTwtVE7rC2tfLKv+3iLzXAT9f3R5UYi2vBcGx+WyfKuW3NXXaD8H6puRt4aCM/3SY2ByJP75TE704twpLR9ZhiESR1a8JWfbcEpYg4LOMDB6E4vffcMgU6//Bh/biarJpM6HzDwgoOHqRzhvkRd4bVEshJR3QF3j4uGhEUnnsqfXrPhoeHj7OW7S/xKldXTUzx5xNkEpM2tz5p8YqTJX4AFqmF1gxLPetHonzNAeWn1CE8BJJI0ohYkiD9wJt4IMybyusHN05HoNR8G9OaBjUQhu4PyXt30NEjkAjWjScH9++32tq/2g7bJD1KziPqOHQ7gODA1IhhyKqu0XZvaoMuibIHNDYigW1ASsh01VdIY4EBtZgN/PkvntfkXokpd/rdeN+I144wa3hMI2npNLIIBiBb0R14XSCAIySYyf19IdR662CkvVlk/4nK32Gb8Dwm/vVqjd0CRrkTY275WBHsOMdvoWch/p19RDZAtnCZ6AVnDPXB1VU5Z7RaQFbsI7TW0ZIvN6oU/f61d7FY9QGteJaBp5LPgUlJSldgnzP6WbNLsM0oVG3pXNm6OxY8quktKQ32ceylndaDX6e5nlhIwFNyYZ/TuWdXrDfoVMGwXg+miLnMxmjHrTUKP9nL0QujEmubNDHk9TtiBZAMuOjDDw3sKHR/FRLMfrYVgEukFy/ViSaAHuengFNouwAj0XLSMmakqK9bt5/P6NVl7LYU3NgK9RICWNFaM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4AULD7sBA8SUmvIZu0qzvaOPn+uAL9kpuHMBnSd4+4YfHuTn27vTdH1k0x9VR3sJrLq0FrSyN0kIVsQ6z7JmqFjuY7H9025hr3qXLoHno/oH9ynrITRNXwG2CfduvhtpdU6zcupfQiv3JOUIKdIzCuSBEv0JbhsmVX9psfYjjtdCHLl0D0bv/lckn29x9iD8oZT0mA5L5MuPsQYeMl2JBlh/bf8RWWl7UvuIdweP3T2jIhef1lN0lHK/nv/4bCZYCEup6I/KM2ez96SkYcPyuVv9tnT0d8BcRA8UYL+KTG6j+r4O5r4PjRSVU/GC7aJt9+QxiycrBAlouQdxBP4SbbTBx/Ry5etj1fpcNDeNSISJ5M7QqDrBJxYv7smnT564SNi9VifHxoYOcDNcwA11dYBnLRVIt5MiiMm4kgM+a5itxCgOBMi+bE5+cx9sHD4NefrYPSnqhj+JgOTgaQOcyGjgxuPyXWTs9pposgEfTVodTupDb9x9FErqqVqMBdP8bmaYRg7zXMl/m4TCk2uVtNitAreaXt3mFCmGxGsYYONnTkurzMiJ+5xPZPuPZOIwalx84scPx4yD+xJMsrwgRNK7CFRfvfQ4RdxYSezCkHI5hMamKVCNiuM/urzTK+g0BH/VxqbxFDhkvNqe2LePqbrGIhfsQH95th4UcyKeQgUdFpV98S1W8x29sSWtrWWVTjS5TRExvF8jjOHUFBjb9dTOY4/OdGDyUULlUaOt8CxXuymm4g+rUwwmcpvlcMblscIgGOnlnL7ngEG3NoTJF3mXwx2wavD7p5Rbul0PAnk6o5fvQjlKfPuriMFPpVo3vwrlmqib1uv2HLBWw+Ni/VWTIlI0diZr4YDRQ8EaMlcJ9IMqP/sokKI5oT0MEF43ap9yahULWPwDAWsAWHy3S2A1ckQW7xZCO+phxfEoY1B/CbmoNoJfOPBCdNiAiS9wz9JwZLFTmil1ucTG6YRa1wtGFnO7coMUIUtln9534s7JletuSNzsRKgNde20ZMeq/8YJJ7Lwi435ofEPxBNzJHw5UB9l/orlWo8JOqX8tU3VGz6ImwyMV01JAmf8eGR1oOVUBePiErx9Ny1q/dhi7/LQlUrlQk6RgwJZ5xb5wUr6/e6mBj3FkaWY+itw9M3T4YNnGF7ihNwpbaCx0m+9b1XGR3hosv1k1JrMzya5pjjEXZJZVOXi+M+735m6Rp6Ymnly1HMqEPXTcPDOYl/b3Kj94QGKdvshSONlKGkJqHDnSH95hMZE42thbBsiAVGk2uBIXFpE/bvCGRKaIqvlfsuPNSL1PC/BxEx950BGopoOeldMwVn9FGmL0+jblgAroTTbwYbDeFNoC26ABAuXoy0obJ1+3GNAHBp+65FO2ycL8A2/Cxuyk326QsjwDJLm9rH/0oQzlE9K6OTKkP9MCv53g27r6A+iTj1/fufko/Yvg8GZOdyOJffBDYLTv/ALNhq+qjAEkKg9cCy13zOO+k6m1JGFBdVeNnL4PG56y0P2CuaeyjmPpBza/oOzpNWERCzyX7G1LJVUpOde8YFPPpCUcTxAiJ7m8wk2RaCD3mynQRk48vO1QFDN2Es73+Clam/5caUUcIfu41xWbS6GpC/aqqCLGEy0MJCJw92L4JY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7aac8d19-a9f8-4a63-99eb-08dcf16336e5 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:20.5720 (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: wxkQtW5utmp3CrTtldGX+uZed2dSqPDvBEWQHoTgJdC9M+hlBrBjcnz0e3IY0GGHop90n470NN22274IlBIefc8EohbhNz6Zr5VpY7Gw7G31N0NTUTZjGHGUZjOen/wB X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-compress.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index e692aa3b8b22f..a0c55246f424b 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -606,12 +606,19 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) return -ENOMEM; if (rtd->dai_link->dynamic) { + int playback = 1; + int capture = 1; + + if (rtd->dai_link->capture_only) + playback = 0; + if (rtd->dai_link->playback_only) + capture = 0; + snprintf(new_name, sizeof(new_name), "(%s)", 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); + playback, capture, &be_pcm); if (ret < 0) { dev_err(rtd->card->dev, "Compress ASoC: can't create compressed for %s: %d\n", @@ -624,9 +631,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 (playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; - if (rtd->dai_link->dpcm_capture) + if (capture) 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 Sun Oct 20 23:59:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843345 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010012.outbound.protection.outlook.com [52.101.228.12]) (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 90436197A67 for ; Sun, 20 Oct 2024 23:59:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468770; cv=fail; b=UPUuH5i5vnl4FHoTx1xS7tF1BgmMGJGvBOrUxEnuQSaF+Qjr5p1SLLUF8cn7cE5Rh/qFstIfmWwTP5E9u8q7istMWvMJtbR1+qp67lY9ubdG/u7Dv4lQyaZfJeL77rh7fVVU4IaZOjO4WhjyIvi2Ox5RVarIv1nQKfTRrhF9bSA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468770; c=relaxed/simple; bh=jL5hztbRGI1Tm1tovWSX7TbyVHtxGpxZwsK/lZd5mBs=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=lhWxQZlqLtOeF790CpEA/gWGgnqvQK7mRJMdwn9IFIqFnxtVO+hUvY7giZnIeAHS3XSjgyXamzNtx+r8yMicTNUm/jsF6Vxw2A0abHw6BRgxwrZuCPs+5OpxSat7Vs2S7GTFxRc8yHkMDBEVPd/SCDL1jPG7gk8XN1D/hgJQlWY= 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=FGs5MwN5; arc=fail smtp.client-ip=52.101.228.12 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="FGs5MwN5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KbhhiGW2w0eMf01i0XcLfv+g1YSRXJT3fgcYqpEWXFZSjms6NhLs631tSKayJrqI5anjm+lgHPyefPD7Stv+2T+DzP7mrJcZSfFzsfsiFww05jEuLIVoNoTFBlfi8kGo0OvHK1ZsKmVgCQWcqJB5ss63hLhkK63G7klry/7xSUhIXPFJYF0mFgkUsRwNLWV/LuDkNTO2zu6hX4EjYeMPHSWY0ur5Nfpd9RJbV6dEtLfAqDua53lMoP6MzJnXG0fkYFj7kdWKylBnhFrYzdcjvyguIHJ8yJUO3U4jjc5O+M5yhWIYqJ4emZX2szkrxUO4LfNOLdGAs6bn1a5lTSrp/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q7YdZX1l6hpmIHvo28d4Vx8ad4WMxH5X72cmvyifWCA=; b=saqaBt781VgqObRN4bTAg5tA9LEHsqfbl+0SXDydyTsRdoXBzxoa4apAbKAEulqOAEtdgdGOHiUsaQXjOUPnqTqIerlfJLzUW0GmeuBsSxaqszDt6xrtBuaXuZRa9ZirywZINyPmaVfJWruUedaRttyDLMHf73bN7ORg4vtbsLJV9ZBx28KO9QZtJEhuei7mEb/O6Y+F0zHIpC5FxM6bRHKTmYZT8glzfZ0jg7wPmpjGDRJWTDT571DO/fOrqSoDDQXbRtCh6zCj9t5+bCTftbxAItCx3+FkyLUsl8PJ/JWf+BeZUN37GCqPA0Gp6a7JASyUxyRzHgkOfs/EPG3nOw== 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=q7YdZX1l6hpmIHvo28d4Vx8ad4WMxH5X72cmvyifWCA=; b=FGs5MwN5iNf0zmiYwgSMhLDVGNULzdbNr7DG0pP5a6VNoFcwbaYZ/Yk8zw23bq+EsArPutvtGkqz+iK5CkkKeNtAFUqbfEMmN+f/RNSEdT67hWAPY/lcu2l7lp4bLhM8OCKB9UeYDj1tJkh3Q1nyVu/CgR6Dy+vWqiO42a6EebM= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:25 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:25 +0000 Message-ID: <878qui9vhe.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 09/13] ASoC: soc-topology: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:25 +0000 X-ClientProxiedBy: TYCP286CA0200.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:385::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f077b00-7f77-4d2a-801f-08dcf16339e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: zGTq4AyvLhpSX/HmWA3ZRaGR2ynCOw1dMrvrrnPeefaJjUm0IsMsX5GYMrYZUgrNXJ6yiZA8vf2IgRcY6zh83BCjEe430AWpCp+tub2tkIBOUavna2NsIKhAA3qFkYJKlSKJgtYD6FHcGQFJyOoP7s8Mae4glRWo/FysGthcPo2svLhnKR48MEZwRcpXzi5qSTUOiog1dF5rvM4wo+Tlk4ub1d1VtSsobOrEdU7A3/vPUYRxUhPyN0TMW006lcAgRVBFCi+f7p9h070WVdobEIcItmShrhDj69nry5WvE0aUIqDQrJAdVPRsgDTrMQmjX2yUAW5LHTpQIPuV4r7JLfdPet9OHc9RfKQPyc6BQuKD0GPo1cmuJChpaJvVTdG06ys/Djshxpi7fXpPcCSwL4CNcg1U1Jpjgqr88t6UMYJXv/kMyTqRxZERrblPXHUoxYytpV4uTtWGEUww+x188RE4liTdMtB2k3ObHNvl/zM7BRgafpheTkFBFwZfW1tNLKytBf+3UIptmsztkoOWNcJgFLIQb4JO8LSnbySL6zsGAtP8K72Ye5NP0JHWs4nKU3MRWmy0j4ZbQ8QBvVxgZem8jLQkDn62FkkmUctj3DCnOO1mOS3sQZMGmUB//UtDu6za6ej8eGmbxWoiJQ9khZQCGO6Rqh8sq4MizmluoBhdkh5VEw1ml+gRFMrXOxeF7j5WDECnjq0x+jLISeirT9Uq0QxL3rHzOd4Hde0iXfZ3LDf7MJrK7qw5YHGCaw8zHM5GAOU1OlxJgV54/BB1k/WwwGFcqXSR2SEYc/a9bccCkBrK2a66fmv7mUDD6HgFhPga3qGlgDpDDtKMuEqBHMixUtijriw25TJF4scx//GCiV/Y7evaOP1FkNq9eoEN1RL63Ln7pPN8+MD9mbPOGscxkA3Wrsh7GV7l+lE222V/Yb6xapdqXfso94u7zlRprYATOz50CrexKe/xe7VAFYuG01Bq2jmkPbWqnPX8V1LF6j3jZ0lTdVmi5fgxBcWr9ojMmxQ2kbka78ikrkPxFEbUofNCSb4CpODm3Vvwl9LCJA270V3zNFq8A/eL8H1v9ivG6a2Y/EpudshWzinfNm77+Hi2hb6RcaN/VfQfmslzAtJpotRsppNPZXp+d075t0YQsALJslDdYVJpiUnbe+PTT2JZTQt03GNxESFdrTzmpjhh0TmnzLVeHuoAFu4N3g9T7akeG9UqTkJSEztdS9ldJ9XhKJV+yYuog7Rq30MQv6Ia1lNpdRNb/T50LIDKL4wMk/R9SEhaDK214Ag10YiIPmVwMZ//Lyhizaeo/1AYhsCYHjp+bS02pjAc+m09kVDvhZHg2RNK9IMMZpwL+Zf7b6fMnnlEalvR2WV1hoY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xfW+svSEhiftvrw/+o6hygpUcraRMdOQ+0VNLbF6+hrXvlo+IBwKiZm2nSalyATVEE1RbVRXeIqsbFg1KzP3ll6+VIrIyRhhC7YdiJHkhigaIE5uYv4JKI5hgYtCchzfeA4tzba/wLH0rU0uscXaT0uwq0fteUdO78gus13soMJ558LbRVK3Od2tam+BbbVTyrVqiSHi0HktqH+fk235JUzvexLFqu5szX8eTlcgr1LTUo3bd2K9DP93YucaeyRW1apCDukFhtMvr+SrthUUlFOy+vll/U4h48s7lqWQCDtNGa72Rk5aj+5OEcnAnnM3yOyBHJNXSRH4x/d+KMSZ4S3G+/g/TIOu/JgqWqqXLXWzF1xWMYcoXjCY34Dibz/e+GzPFjZ8J9Hl4FrijR11OWixbgfk9ONa1mhzg8K9sFr+Uw46bSEUp2jmbdqIzjTbg+Xk4sKafTVlz+jfJsWljXvsTU8wXHDaLl1KvJbA2gX3nbvgPXfnglbN/5AwVG8ymLZ5m1azWa6QACIoR4tT8S8ZZVZMKApA6UBBM47qH181MkO2dhGjyfNCBtNOU5DbojTcMyP0kJq0yQD/6Yyor6iOhSwM3lsZlhKTRPb94n7pDVlYi7KRkDyM0y5bDGL4c6c6Ct1WHBtQGoV09FWB3W4VvChH8Hfcp5vxD6+T1Vte41EbtDkFmnIIiErSrH6Je1lefNkionwHLhCgUVjgiGT0CCL8g7R1SsshmN0ynk7TcmgEvGldbvKmMTRGkVp2djjCG5/9S+Kt1rshHYLlG+lMSzwyJ79/a/8EzTcMiNNqJNE6ApS7husL2fmmRQdEUZutryHvYvjA3B7aj0EtVEl/Csj2pA7uSE3Po/ICPvawPBeshOkd3xG8SSAkIKMRbJrH+0vURt2G8+9DnTirtiRDQJogy4SiU4CwGJPm60Iws+w+PyFdrXmWfvqXwnimN4rbZq1K5AlAc2vgoybNiF56WUQY+Ey7puFrS1z4Jbjqmfm/UBMfv3PlUCf1QRya8DLdez5tyMYK5H9T8oHkUvLakVNeZu6B7IX4RcXgy3c8YSgByOVdu1eBVDbEHoN+8RL3iWkFMxc5Gfpcv2EseV1d1XbVzWJJK8ihK6RWjDScgpp8ZDmLvgCz+uPaahHnxQM3RW9DWtPfZ8k+3ghBSHGsLq7zApoe3hynqHT1BcBV9YACt907v33dh9pwvNTGCkMHdxh3SsDAbsuE3I4iSEpG10jX3n0FFLN3+Rb8XJwMYsOwE31kNcTjdPYVsMnLQQv88u5X4fF4AI72WqXX1lJh47s/ZM2bRizVfQFxK5KfIdQo14rvnmCDdBffVg/5XecNZNiwyt6nWFZqaT4N6YAiZfMJKbBw7baHgE5f7xwXdksb3UUgoX7O/97P1H4brj8L776P83LyHRI7UtemerBuvOIHzxbsCvKyf6EuOMhr63snl5JTCa7x+ijhIYQKP4Q6SAeAyUFGHVJhTNd4TVIMvGpuiMbfeIXvjzaPp/24RDNILmLsL1/cre1zUyRtARTiWzHQVellWBlGMaZPYoIaz7p8qYbLBJmTUwC/ei8DjAwDAj0cAQsyDsqo/L4jOW//TwuM/BvuVKFd9ymLPb58OxB8wRgCtZW6rXLDB7c= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f077b00-7f77-4d2a-801f-08dcf16339e4 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:25.5879 (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: lzOuaVbQC8Omt03CjSObN3jLYeyclnEJxPERTVKiOenBKS7YTag3H1KjbNeHQcjfRrWoajcFY/PDtUQ53jZ6U1UsMscDczBNUINZKxX36FUx1A/SVdv7/LRPN9YyJbRk X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-topology-test.c | 2 -- sound/soc/soc-topology.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-topology-test.c b/sound/soc/soc-topology-test.c index a2b08568f4e89..c8f2ec29e9703 100644 --- a/sound/soc/soc-topology-test.c +++ b/sound/soc/soc-topology-test.c @@ -88,8 +88,6 @@ static struct snd_soc_dai_link kunit_dai_links[] = { .nonatomic = 1, .dynamic = 1, .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, - .dpcm_playback = 1, - .dpcm_capture = 1, SND_SOC_DAILINK_REG(dummy, dummy, platform), }, }; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 97517423d1f0b..43003d2d36667 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1544,8 +1544,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg, /* enable DPCM */ link->dynamic = 1; link->ignore_pmdown_time = 1; - link->dpcm_playback = le32_to_cpu(pcm->playback); - link->dpcm_capture = le32_to_cpu(pcm->capture); + link->playback_only = le32_to_cpu(pcm->playback) && !le32_to_cpu(pcm->capture); + link->capture_only = !le32_to_cpu(pcm->playback) && le32_to_cpu(pcm->capture); if (pcm->flag_mask) set_link_flags(link, le32_to_cpu(pcm->flag_mask), From patchwork Sun Oct 20 23:59:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843346 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010000.outbound.protection.outlook.com [52.101.228.0]) (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 528C3198A19 for ; Sun, 20 Oct 2024 23:59:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468776; cv=fail; b=TSHl+0w+ujkzTERnBALGFz3sdchgHk31LamCQMBfuSp+o/ramnrNxOTehghhwZGF/yg1Ncs8WcDbX6g15wNUWZJBcy0IQDCjXWXkI9zEDFeODkCqTei1FL2+364O8aPErcczBVKqRRlEN0BAkEOXmmajSXArAnuevkOQ9/IzgBA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468776; c=relaxed/simple; bh=sHJceF9qgO/8XgkLvZwhXK/dmYnmVfIJIK1XVUgl0l0=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=bS0Il4pNLwBNWxoatLo6LTxh8alWM8Y/1ntH3hM3YHp1CbMqtrxmKKJQ8EBcDRkOHSz1KAru5u2L4MeTKkpw01yrsXDz2FT0WTaRTnKhl5YIpNSKVtIk+fdoFDEvXWAJEdhZCeuxMY0f2HoCPv8W6a+BplgBqXOu7Fw5M5GjYzk= 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=CbgxOqLh; arc=fail smtp.client-ip=52.101.228.0 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="CbgxOqLh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wBUg/Mzvu8AuKMbwc+o8fkjvCugUKvsQzZ+PWAv1KsDCr6H1OfZiG90tp7rbrSEFQy0oIEvEwaquCrDpefB3Bofgcc+rGRbAuzUkOMl4t50If6aIGrK8u6IdkU+JzSRppXNrNEvsx07jwOHGs3i88Qj3UWdpnjC1wSgOYe9xF8pmdYzSexHkEL5LXGgG9MeZtd2blCCOXPila88T8YEn4zPM1yzGvuzEtBmzdp7Xli5rqRy0RlNd/wEqJZ6FEfZIjkcCiHyv2ruKjstdMDPj2hjwBbPiURIrBSMbrZBRnDBYEgva/mZJdbP7qijLT7eVvoYM1IK0teAvdyc8uH/7Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2qs4JCdG53zTFye5G/+UbLM1QMcObGvrEDohoMWSvXQ=; b=tY2Uq3k8HfKvcPtnWA8pbZuKO7fUzB8jvl7wNtF73bpsjOo8enS12Yz/Tr0rFuEdELFkEzkXcBUebk6sl01qLXn67fl6ctmOB+dlYsE3AMFBEF9An2OKs38QRu54r29Q/1khS1ibuvM07LcNwRM8sEAJyrgq9QN2y97Q7NrxgsEB3DapF/ChVs75MARvDztAgNOWXo3jGEisIDmaSFIL+cKpDrHB6EjjzpnGDSjXSkhwo1int8cXSJSDtsFYpfneaHrRfjcTQZ9wgORU29T474KrJ8PRvYJYCRdU/AXNNqq7TB0DAPwLg1I8nWPznhiQ4FXwPV+QXtvDBJF8SwbcLA== 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=2qs4JCdG53zTFye5G/+UbLM1QMcObGvrEDohoMWSvXQ=; b=CbgxOqLhgxZ+pNFU06XfpWgoGvLP9eLPkwrwjucdUYMDZesFL50VdN35cGErXRd65jMjGZzUfhJfs1jQM9632ejjixZQvdwqI4bqNyPTz5k79cijYzPu0DD3N+5C7TjN2Z7eNYg7T17o6T3S6kTw/UWfbZ/qpmCK0ywKnMG0yRw= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:31 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:31 +0000 Message-ID: <877ca29vh9.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 10/13] ASoC: intel: boards: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:31 +0000 X-ClientProxiedBy: TYCPR01CA0026.jpnprd01.prod.outlook.com (2603:1096:405:1::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 288cd4ca-959d-4d01-bf8d-08dcf1633d4a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: DXyTK5S3SyFZF2x9nQ+7+BltgL2GEiG5yi2Q2LMuBRv2sux9JPuARJgCvrmMeBi4P1zrxdRODMgd40/pwnj8JJycUtd8AE5luB2HC/t0a3jpi8oYW/G2GDORDTbAI7RARtTrw/USdMYKhiRge9EHKNq9LZJWZJ7N/TzPlLGJjYhuZ3GERZZ4bAEtRe4+10xfIzL9HViTSogaRN7vQuDqVJ/XcXd4jVbCDBPd8QsnA4lhuleDIg9B+bS1BiyKAvX4+GFBjAwjhFs2ip5UYZDwwRg1HP1iEVG7D8GMylRAqqaXWJ2wk+O7axBq2Y0XVF9xR8bNgfnr+cQg6HH8J7mJvPH4KZqkEwML8dexQPSmwreIMIw+pa1rinXFFvyfO6s0eZ7PSe2r9XJSA4DTXdl9dKgZbuySM+H4hFN04XA/rS/y8Y2jWw8mErZ/39gNkaoOsMucsCSH8p4ASSLeFjjO/7VW0cieb45Bom5dbRrp3SJfvr1lQS93B/4thkxUaVjejwdOYGo7BPK7DE04gl/C68CIjJ9FQADc9gV4Ov2kngs3wRmHWReHCOqB+c5GGfyS2ZD1sTBVV2oQCKeZuCDh/f0hadZZhbrdk6o48oDmsTmbBzXnpyyyUJ/mm8TbY3IP8FeWx7Nu7/4Xm3JIo/H+WFJbYsgtBi7V1sLqMMguaeaB8w+Gg4qmfuX4irtVQoI2NRonCDdGVOjbTHiZddfdoF88MVJLD8rY5H/AgY5o+PPyO51qsFfs5Tk3GQH2UPlU9Nijt96bhEqruJ/64zQvlHnNkZwMhIGJmv/RTHDuw6XXvGmsqynwYfCjrEYE0HFmCABnydfOvk6QRxmYTibW8xdwtChxftRXmIxTzgjRClvuTBdvDke5YUs/nnqXXvQ/X7xK+EV/lfmamWuIxg0uMXs2Mn2vGhY02lESIxgBKMpKIrBv89SuyTmUZpw16D9CyaHXY39h27iKftPxSv/ufwwGTolHl4C+ycV2rSMyf8yrQdwytb4T7L2hjhRS/Q0o93OHB/7GRnZDdlBf8sNj4SiEezMLCY5xYMG0Yre5jIs8ziWCjV7IEOQBrXZAPQmRnxc+cfEI0tNh1s9XUk5SdrKlsh+W/FEvi4fgyKhGQr3iYTBThUzcnJG92Y2cYfkEQdE6ICOX0JkzrznhNTox2ORpiGIeUydqSLpvdqVmAdnGam0vnjjjyNG/BP9QxetQWm46j8v4OkumY0dwdOfD593yYRtFDPMTQp78dn4DJIa2f59PNJSDOvHddhYyqeRwZp0b+uFQi7QkeM6tM5PpAoIKfX0GYGk+wVwB7GDchr5ABZrlo36GXYXa5+5N/2tZxm5tFmG4AU+/+ot+MXDm8wm/6RkI3D82KAgOB2Vikko= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XYBZETK3sbMC/fEgnL9g/CAjVReAfzGy8qQUUFsgLEO9TABH1tsSleGRUy3Lrpa6DnQv8JJQTflK8Po9KizxemZ1sk3aqirhjjLe/eKxCAvI0OLD0HaRqW1wEi+sy1foddg1LhkMSCjPahiFJidkXzLf3wTXW3uqyLZiZeqFtBCExjJGNRWEp9oIAaaaZlFb4OrrySeSIqmQcJ/kXAMV4ZMC77ixW4RrpB7q/uW6gwwhPj+B6cdgr11s+6e8jTRNdixJaFuDZ7qPwUYKbsn/gpzXX+RHP5Y0HDhQhfOyEY9559UbGnW+rZAHtZB2/l6PDYjDIp/z9gOEGa5lLe3NtvNOpS/V1q2L7ujlLZ50513vkm/4cxWdZIPnJpMxk5OSRC3PdXPWksh1M3xjJh+KyDX1KW1K3EZo15ONTeCv6cOQfzP4SajQcshRacEo5BOakp9oQL5x/bYyYWIyS1R/8ouiegBHlNNJBzVVrWU33ZrgDRF+bf3tXxelj2odmWsu70qbFwAyzplM0Kb1STpS89ZadTDc2lMyQbMkH+k+1SkIgf099KwrJMDiATzqbMXcd3NtNhdd/ykRFreavphqtIHyb/sMppBsYMPK8WRqGq1Nxi5JvFHpW5oqQSJB/TK66L6tI/bWkyeZ6ot7Uft/FlNPYwxT8nz45evtR2tsFHxxw+G5/3ZbZpxul8mEM+LHBGuI6+gpuiU0KzJexaOYbm4vlgMmml1JrQNmvhswfzakmzNu01e6G+kgTin5YjMJAxShatlTo4A/hR687KlFkTkPR/y3OrC6n70jfk4WcfBQ2PQm1dd4Wy4BefeUtqB99HTYjWS67jjAwQWys3/xcFz8L0BGaoJLCjCJXkZE5S1E9IosPW9dHJDR6Isniwsde4YuKN+PBCbo0DZtlVop9P5eUfqVvN9p/pumjhdcz7d8LsGVxq5XZDvScENbGHoFk7+e0AkXjDG3UfooObmp18eMJKQPHT8L2Bt/vEani7rbAy3XBq2R3ZxWueP5BtaTM4nZ8KN8muXYkJ+TlxrSccIMdfimQn/vNhcTHNkLay+CltGcI8J0qIzJkp2l5mrgmF8bzFirlI2Qm5O2FzLFJ5nk5/PHN4s9awuW3QThdC4ON+Uqng+COLV2O4Mv6aQjTAl/UquKnyqGpkNsKFeeLrFFcA9aQXhoxdl/yv0RWF9CK/DvzmVgi1dYODBvNmNd7NyhbfT2I1xFkj3T/t7bktrztE4E6u3Ad1dh6CdOn/i8I9nB0r6ebNdfKZ7v3LWTRzz9RJ+wp9GZtJxiLPDU7t/5Ve20mkE+OROjQFZ8rchWWHafkENH2MKiMxiHKsuYHQoV0HI/emzZlHzQ971x0qHmneTu1/YXJvSAeHu2vdIiSxGKbDsRZxJUKHfFF0T2IsI2U5cFta2eTS5lE5EiHjKy5xre2npII5bkQa0PhTFz9eY3AovseTacTba226Zin9YKNIajQjgKCCDflHe28d+ZxBsZAMBUzQNl1BAH4HNDkGt1pv4vK3PY6UoXVCqjF4lQyrrk6y9So794MQrT7S0giI63m7CJFCn5P5t1TQIGTMOCsKPE3N9T0Ktev5t+OorylAFMOTPsQ05RCNT9GzCNWDbOibuLYhUfmvC2Dd0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 288cd4ca-959d-4d01-bf8d-08dcf1633d4a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:31.3072 (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: +rrGGD9gZeGy8Z5vNBVZQTs1UR6yW4VeY7kWUE960+xt0A2ZW6liRfITww4UEn5VXqVofbSvY0HbG4YDX1OeHJ/02D/kmMFsLSOaAPyaFigDxu9zCNsHWmN3v7coG90A X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/intel/boards/bdw-rt5650.c | 4 ---- sound/soc/intel/boards/bdw-rt5677.c | 4 ---- sound/soc/intel/boards/bdw_rt286.c | 10 +++------- sound/soc/intel/boards/bytcht_cx2072x.c | 6 +----- sound/soc/intel/boards/bytcht_da7213.c | 6 +----- sound/soc/intel/boards/bytcht_es8316.c | 6 +----- sound/soc/intel/boards/bytcht_nocodec.c | 6 +----- sound/soc/intel/boards/bytcr_rt5640.c | 6 +----- sound/soc/intel/boards/bytcr_rt5651.c | 6 +----- sound/soc/intel/boards/bytcr_wm5102.c | 6 +----- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +----- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +----- sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +----- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +----- sound/soc/intel/boards/ehl_rt5660.c | 14 ++++++-------- sound/soc/intel/boards/hsw_rt5640.c | 10 +++------- sound/soc/intel/boards/sof_board_helpers.c | 15 ++++----------- sound/soc/intel/boards/sof_es8336.c | 8 +++----- sound/soc/intel/boards/sof_pcm512x.c | 9 ++++----- sound/soc/intel/boards/sof_wm8804.c | 2 -- 20 files changed, 34 insertions(+), 108 deletions(-) diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c index 3c7cee03a02e6..d25a7188f603f 100644 --- a/sound/soc/intel/boards/bdw-rt5650.c +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -239,8 +239,6 @@ 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, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -256,8 +254,6 @@ 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, .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 304af3d06d017..9484f34107876 100644 --- a/sound/soc/intel/boards/bdw-rt5677.c +++ b/sound/soc/intel/boards/bdw-rt5677.c @@ -329,8 +329,6 @@ 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, .ops = &bdw_rt5677_fe_ops, SND_SOC_DAILINK_REG(fe, dummy, platform), }, @@ -356,8 +354,6 @@ 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, .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 58db09d9b6e16..523ade9f31ab7 100644 --- a/sound/soc/intel/boards/bdw_rt286.c +++ b/sound/soc/intel/boards/bdw_rt286.c @@ -133,8 +133,6 @@ 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, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -143,7 +141,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_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -152,7 +150,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_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -161,7 +159,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_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -177,8 +175,6 @@ 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, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/bytcht_cx2072x.c b/sound/soc/intel/boards/bytcht_cx2072x.c index 8c2b4ab764bba..68a3d345dc25d 100644 --- a/sound/soc/intel/boards/bytcht_cx2072x.c +++ b/sound/soc/intel/boards/bytcht_cx2072x.c @@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_cx2072x_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -198,8 +196,6 @@ 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, 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 9178bbe8d9950..31141d4b6b256 100644 --- a/sound/soc/intel/boards/bytcht_da7213.c +++ b/sound/soc/intel/boards/bytcht_da7213.c @@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -197,8 +195,6 @@ 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, .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 d3327bc237b5f..62594e7966ab0 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -315,8 +315,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -326,7 +324,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_cht_es8316_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -339,8 +337,6 @@ 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, .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 4a957d1cece35..fec23bda9e643 100644 --- a/sound/soc/intel/boards/bytcht_nocodec.c +++ b/sound/soc/intel/boards/bytcht_nocodec.c @@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = { .ignore_suspend = 1, .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -144,8 +142,6 @@ 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, 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 2ed49acb4e36e..410eb36c37c93 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1546,8 +1546,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -1556,7 +1554,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5640_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -1568,8 +1566,6 @@ 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, .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 8e4b821efe927..67c62844ca2a9 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_rt5651_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -793,8 +791,6 @@ 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, .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 0b10d89cb1892..a6dfbcfdf74e3 100644 --- a/sound/soc/intel/boards/bytcr_wm5102.c +++ b/sound/soc/intel/boards/bytcr_wm5102.c @@ -462,8 +462,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Baytrail Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), @@ -473,7 +471,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &byt_wm5102_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -490,8 +488,6 @@ 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, .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 d7c1148588331..36984de8a0679 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -351,8 +351,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -361,7 +359,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -374,8 +372,6 @@ 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, .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 7651b83632fa4..4afb292d4f13a 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -193,8 +193,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -203,7 +201,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -217,8 +215,6 @@ 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, .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 ac23a8b7cafca..b977a2db73a3a 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -448,8 +448,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -458,7 +456,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -470,8 +468,6 @@ 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, .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 c6c469d51243e..aaef212cf44ec 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -358,8 +358,6 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(media, dummy, platform), }, @@ -368,7 +366,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .stream_name = "Deep-Buffer Audio", .nonatomic = true, .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, .ops = &cht_aif1_ops, SND_SOC_DAILINK_REG(deepbuffer, dummy, platform), }, @@ -381,8 +379,6 @@ 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, .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 90d93e667bd9e..ebc417c04a500 100644 --- a/sound/soc/intel/boards/ehl_rt5660.c +++ b/sound/soc/intel/boards/ehl_rt5660.c @@ -178,8 +178,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "SSP0-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &rt5660_ops, SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform), }, @@ -187,7 +185,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic48k", .id = 1, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform), }, @@ -195,7 +193,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "dmic16k", .id = 2, .ignore_suspend = 1, - .dpcm_capture = 1, + .capture_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform), }, @@ -203,7 +201,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp1", .id = 5, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform), }, @@ -211,7 +209,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp2", .id = 6, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform), }, @@ -219,7 +217,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp3", .id = 7, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform), }, @@ -227,7 +225,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { .name = "iDisp4", .id = 8, .init = hdmi_init, - .dpcm_playback = 1, + .playback_only = 1, .no_pcm = 1, SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform), }, diff --git a/sound/soc/intel/boards/hsw_rt5640.c b/sound/soc/intel/boards/hsw_rt5640.c index 1826a4dfd0f35..9bb2822ba63e3 100644 --- a/sound/soc/intel/boards/hsw_rt5640.c +++ b/sound/soc/intel/boards/hsw_rt5640.c @@ -85,8 +85,6 @@ 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, SND_SOC_DAILINK_REG(system, dummy, platform), }, { @@ -95,7 +93,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_only = 1, SND_SOC_DAILINK_REG(offload0, dummy, platform), }, { @@ -104,7 +102,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_only = 1, SND_SOC_DAILINK_REG(offload1, dummy, platform), }, { @@ -113,7 +111,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_only = 1, SND_SOC_DAILINK_REG(loopback, dummy, platform), }, /* Back End DAI links */ @@ -127,8 +125,6 @@ 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, SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, }; diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c index 24f716e42d6a3..50e846d67c194 100644 --- a/sound/soc/intel/boards/sof_board_helpers.c +++ b/sound/soc/intel/boards/sof_board_helpers.c @@ -217,8 +217,6 @@ 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; return 0; } @@ -268,7 +266,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_only = 1; return 0; } @@ -326,7 +324,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_only = 1; return 0; } @@ -361,13 +359,12 @@ static int set_ssp_amp_link(struct device *dev, struct snd_soc_dai_link *link, /* codecs - caller to handle */ /* platforms */ + /* feedback stream or firmware-generated echo reference */ link->platforms = platform_component; link->num_platforms = ARRAY_SIZE(platform_component); link->id = be_id; link->no_pcm = 1; - link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */ - link->dpcm_playback = 1; return 0; } @@ -407,8 +404,6 @@ 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; return 0; } @@ -448,7 +443,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_only = 1; return 0; } @@ -496,8 +491,6 @@ static int set_hda_codec_link(struct device *dev, struct snd_soc_dai_link *link, if (be_type == SOF_HDA_ANALOG) link->init = hda_init; link->no_pcm = 1; - link->dpcm_capture = 1; - link->dpcm_playback = 1; return 0; } diff --git a/sound/soc/intel/boards/sof_es8336.c b/sound/soc/intel/boards/sof_es8336.c index fc998fe4b1960..a927078768519 100644 --- a/sound/soc/intel/boards/sof_es8336.c +++ b/sound/soc/intel/boards/sof_es8336.c @@ -455,8 +455,6 @@ 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].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -496,7 +494,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_only = 1; links[id].no_pcm = 1; id++; @@ -539,7 +537,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_only = 1; links[id].no_pcm = 1; id++; @@ -569,7 +567,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_only = 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 8d237f67bd067..68380b738d883 100644 --- a/sound/soc/intel/boards/sof_pcm512x.c +++ b/sound/soc/intel/boards/sof_pcm512x.c @@ -246,12 +246,11 @@ 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; /* * capture only supported with specific versions of the Hifiberry DAC+ */ - if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE) - links[id].dpcm_capture = 1; + if (!(sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE)) + links[id].playback_only = 1; links[id].no_pcm = 1; links[id].cpus = &cpus[id]; links[id].num_cpus = 1; @@ -294,7 +293,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_only = 1; links[id].no_pcm = 1; id++; } @@ -341,7 +340,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_only = 1; links[id].no_pcm = 1; id++; } diff --git a/sound/soc/intel/boards/sof_wm8804.c b/sound/soc/intel/boards/sof_wm8804.c index facc6c32cbfed..51922347409f0 100644 --- a/sound/soc/intel/boards/sof_wm8804.c +++ b/sound/soc/intel/boards/sof_wm8804.c @@ -167,8 +167,6 @@ static struct snd_soc_dai_link dailink[] = { .name = "SSP5-Codec", .id = 0, .no_pcm = 1, - .dpcm_playback = 1, - .dpcm_capture = 1, .ops = &sof_wm8804_ops, SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform), }, From patchwork Sun Oct 20 23:59: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: 13843347 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011040.outbound.protection.outlook.com [40.107.74.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 A36C9198A25 for ; Sun, 20 Oct 2024 23:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468781; cv=fail; b=DtajM5AjEPhWLraeeZDxYrNp7cW9DWN4qcoOMwRuwV7SbKYiE3D035D5Q+hwp7nPRArLX3mnkz6RP6jaYnar1OG0VpcxmuHDVqmou+OjDtldr5O8LdFR+sgIhIT2pwWhkfBaDwR76ZVAVGYPFQVsp8ZzwebaxO2csky+qQmftLE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468781; c=relaxed/simple; bh=xP2X8aAnobhEdyDs795dU/bWbG6tfLueL6B8Rgx0VK8=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=OcHubAoV19DNMTmd8ZmeFjuvO/1AgK4yKm/1ddHOwK5OViu4yHwJP0ttPwTC5iTueL0GVEFIZBTcnzkChnAXa+U/fc/2rH+3oVlrhydjDHyXM5CY9Y8/EL/Mzv4cKWEPm0I+pb7gnbIzLbGMAVvi1rXYZ2aa82d28yYyZyI0gpA= 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=mmJzrJ7v; arc=fail smtp.client-ip=40.107.74.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="mmJzrJ7v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YBK/YfTtLpEwa1mXV46xFembEDFkBG3jdL7QQ8EUwayrn6zEo9nC4f8Bsi37blqaAVfca8XtBInvkiDXJo4Kwx3IuHAH8Rmkixrm6GwY52YNrWDNrvSOepJ2CVBS8MopCTkV11flc5GXLEFtUf+kzjtF0XrMUKpwR+W4zmPl+p4Bety/VFOkrkEqWa7WqMAnesEsT884XiZKqEwGF4NP9dedYZGFFsKdBfdnkVhfpf6/EsrcfftcbpDZ3Ym1j3HVsJ4uPT6pZ/l9GGRo5/W6Jtfypnbqr2Wc96uDnRTxycAk3n5xIBa4I3TWpv6dTxb7f7HlJ+X/aENsW6g69VHFzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ipkSOmeON/ZiCVwUItpOj0MUDy//xaN1naeVDuNPPJE=; b=BQ2fdSZig61qUwl9kd1rZdO02qKxhvvy6Y1TbVLWEH0Z/0D53iGY/LqQhtwvQo57pIfjYUSEVgWTnoLZEBPybq9cwn9MJurZtKASHz/696sDdIbOzvuDKtkDNIZHXJi7IF33wib4JHieVdOHBPyI2B9H2+yDBm0imWItcs1IGJvvCm7SGHeHY1z61c3bzLBPNNYclhKJ5CtyLhrZ7pArtxuwdI6znvXYUnTNemcnJB0OvVeYqrJcuSYJTtOxMw1SM2JY26MwE58yrQg+R36eglqjCtBz7Ef/Y/xcDGKJy4hoNKWhr132r8cfxffgnrHeqP4kFc9B33FaeZJJTJa2Iw== 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=ipkSOmeON/ZiCVwUItpOj0MUDy//xaN1naeVDuNPPJE=; b=mmJzrJ7v9ugIrbe26q2+HmHa+Lu7Jbj6DWFshceT3tMJAbVYkfe2VGfhqAoMHBQEw+5lUZuUMEQy02dZfidaOqA8qyaRLJUi4bYhduIuwy1doKFp1XsqMJ23x8GjryR4Kp9F6rVQk+H0ApOf31DJ44T/7sU8ylsSEuhL4gRUYro= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:36 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:36 +0000 Message-ID: <875xpm9vh3.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 11/13] ASoC: soc-pcm: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:36 +0000 X-ClientProxiedBy: TYAPR01CA0195.jpnprd01.prod.outlook.com (2603:1096:404:29::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: c67cfd80-07bd-4975-e3bb-08dcf163409b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 0XQBITJD1/vgvRFV36C6zdx5bUKmTmzXYJVYpP+mPFEJZdnDrfcHr99rkPyExJbuI0OO4+tAVDGeypke6o3oF3bS+f+tcXElOGNt10A5GkXBIgLE+4fGDUrDZ73tsDDnsfwQ8Yne4k96ty4F4n3X+e5oG9AY9Ianc488AlGXR61ScGj+hzW3EFhzjJB82yqvDWGjioGaLylZPSVdnzlTOy4krdcLgw79Fz0oU+UMNazdFKGdgcccTlYs3w2qT3kuiWYz5NtZ9gKQi5uXRRjENWH/iPMCcNxxzfnRlO62bnGH45XxXrZn2mS0H6FW7t9y2BH/Ou2Of3kcmgYD6QMPibxlnelMtlmGmgp9bLd3sKnZi1Z/EBWoBK7KEeBQKHqnHSdt4NPUltNUVoCOLLEz6fJHKKeoEL6dDFteEduoHFZcsyNAVbcNl4d6kmTLatNuYky8eTviG/i9hP4Rq/MhOkFu9grxQjbnWgOmDZmgNMYaM4cnoT1vaEPQzZ++um7xIihCE3uzrsTA9S7JOylGV+xe+YlKi6fZiICjY1Ujxfb6Gaqi+3NRfs2VcMP84LNjdEV+zNE9tsRy6C6FeZzGDIRfBdSnKVGxhMJJKXQVUx7zOSHISno5hK2iL9wbwWiZ8/SpyXXYPA2zctxevUpmoN4P41J5oDlPjTP9L0NXn5ZQAeBYdMWvFKRuzOjqj1eQH00qI0a4DNo66xFdx2Okoq1UKXYGSZwMW594RtshTBQPQ8RbYivcPIWllDbrB1iKdKbeHw1JncdmCrCaUNuvmHY20Z/Os2qkrA5LlvFHt1HiHSDFjrF+KRofY6qFWSmchcqqL8cSIwqypUmdWmtUmE0zSAzCyA+GjddtzJuGVKF8NL+9LbT1Qb+KCkg53E0z3Lz9gTPVz4lN1dW1uszxnqG0mXpq58o8nl0qOAuZECnduuCHpbDeDd0yQfYiY36J/mtoKhu+G+kAuYfs9ggKonBonRmfS5CFOVO3gkLqfppJDxBbMG1kTJKAbSjGyRx76nCI198Ssm6GDeM2Rxkmrj+fLAdcmH8/GfDv8atMpjjFYsK9c8VBrMzSY7e6TZSI7nZFMZRPowlaz0PACywxBOgQLh/R03C21meKvOQ7mtNixVLjX5G0W4EKDel01ghzzi1ysPuZ5leEXCof+2+Ydd00I7LrLXR0MbR3fGxbfl7SFfya0YaGGfcxKqRH3KPLfE9yKdbDKiLRajryjrVWur4rFTMtlF3aGiyLoUgw6yo0woHE9Euc5zST24/bmE3F/0RRV7eVVfemaXSo1U4keFuf1pfcjeZli9coY7afI7Y2tdgWyqOZIUeoK+hkILxe5f9XUy6Y90wmBa0d7F+WxsEFD6bgiTfEAhn5qK6gsxE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gwM5RIpK6DhzPHspx4OiE08Oe6miiUE8IWGlz7aNrKsHZ1F67eEMfavGOB7xDbDXnuRn/bhOWBgiRXnV/QW29davnZ5ZQF9kETN57JJMcLSLgp7nhCsulzhu24gg0UoKIU5JHNtt1ngQ8VApID8kBRgsWordM29vxv6DnEBD0kB0EWGlfkC5te6fmRf5YVZrbbDOcA56ZH8Uw6OGQvdGymeNay8pYvz+voYXeaytQ3ynHDTuCNsHmHDvg4gRgFqoxfNxbw9R/zFKvhZffeiCfAbOImpvOePjGvCb+YelunHHX4veiboiyYHs6fGPUorK6bv/G4GoK/5ukGZUXxT/EbWz3UelLG63N+0gMrF+7sxwO+yXXGdE+5tNAVZcT06iUPkOzrHNLnGdUVX+EWo1HVsV4k+dJicTKqV2CzPTZpd0Mn9naWAe/QL25tVcVajGUQww1n6Jh0c14ijOkd0yDM1J8mEByKp7uvX9fNYHnpcE4KXk+Wh13o3dZ5kvmBxKkiA8tQM+31VBC49PcAoKHsw2po7vnpISYfI4T/9PTNKo5Hl/1cSD6T3CWX/l74U6vJysXO7jpQpZU+MRaxjc48mqFbGs2evS8/XxA2dnR28fXMPP0tMSpIx0NTEwgcOQkT7ukQLpvi0hSqy+KqbkuW2bp+NxzbWJ1bP/R3U31Vhju0jpDbwjGsN4MV34KYDd74Sh0s+CcXOA8JuIxAsxnqvBmMuVUH5Ue27i68bCr5FQ+B+ac0gPMNE/027FHqqzc4YgvcdZNupNbdjakorJ6XAOfPm6E7C+MyRKSTcoYD3T5FIZJpnuumsEgao42Ov2fkECB/ej2Dlo51DSW1TF3PMplHMoBZPL9d5DLydBfvhBMmxQSxQuVjiaPwbcr16K4iYFy0jtPRUMgFWDg0h3TDK4u5BrC4QJdPaHvBvbBBPxodAveWkTsKvqs/NrKB2AHO/pISfMfw1Yvw4Amq5jNy+WAeMeR/qm0qKY+tWc9zHtQRXvvivFHhBQJZBVdHr3EyJ2HEh9u1Z6/Z8Rszd3FR+AHLJVq7kMFTZorMLm0nD1DNo/7Iz5+tc7Rf4d7Y7+WaiObD1BthKmo+LxTsBFUfDg1191DPLMec7LLsZyHqoZ8ueczBlbbBLkmPRs4kwbp0zuApS+RAJ8IWj8+6rsLmrMwYvI4PisJSnuwwH8OlsFJAUXokdn5ffgHSaY0p9uRqzSDQe8qou6NyD8ZXYWAiciItim4MKG2BdIaQEs/TNWtg9voNWxmq+tuzYReiTRuF4BXTohhhc/NCbcu2ubt6h2M8gOQNhqrtXkCS4j2KjC4wi3UlrRJJ070aghLBVvDzPGFo5rTy3X1fQ7a3NiPiKet+GTnBquzilX3QBaaZDEMv4MaYRv1h4JM6ndV8VKyIxmm5jdFHOJmCIWXU3GnIC4EASUvYuU3p14Cbivo6fQVQwp7an7AaLMVU/i5XpMfdwL1v/HnlpFqtfL0gNaPv8HhSFEzr780jHUJK4RPWomEpSNBp615alNsvK/ghPJaYh/PzNJf9/HP/Hmi9y94xhUKMeNue8Y5lIGxSK5PLmOOhXaU9D1Ju2KhwFUOTj6DvdbkvPsuIaCpNRgP77sOaTMexXIEEzggnNleUOgwTU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: c67cfd80-07bd-4975-e3bb-08dcf163409b X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:36.8500 (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: Y16Ej4ikkkcrhfYIKNdJQRa/eTJro5XoYnkyYm04HZfZ425g8SL5SXCpJSZgz4Zy3lu6WKYsdDfsJ0svK27/byjqtK41oc3tZpY+MRrizixlzZhkvI/tCAb41ydppo4P X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto --- include/sound/soc.h | 5 ----- sound/soc/soc-pcm.c | 33 --------------------------------- 2 files changed, 38 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8a1db45988ba6..3e72317e2c20f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -820,11 +820,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* REMOVE ME */ - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; /* DPCM used FE & BE merged channel */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index e2c5300df0f25..5142d1abbc7b0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2844,39 +2844,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, has_capture = 1; } - /* - * REMOVE ME - * - * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used - * as availability limitation - */ - if (has_playback && has_capture) { - if ( dai_link->dpcm_playback && - !dai_link->dpcm_capture && - !dai_link->playback_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using playback_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_capture = 0; - } - - if (!dai_link->dpcm_playback && - dai_link->dpcm_capture && - !dai_link->capture_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using capture_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_playback = 0; - } - } } else { struct snd_soc_dai *codec_dai; From patchwork Sun Oct 20 23:59:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843348 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011064.outbound.protection.outlook.com [40.107.74.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 2C0F2198A06 for ; Sun, 20 Oct 2024 23:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468787; cv=fail; b=hZjkj//Nvv1dPkw0oDPbKlwgpfJR5KtuG1xB7lYYjmZwOf1NcPpgC/eQYpVlEWNi/gmvujAH4otwwvm2Uxra75u7Ch3QhjgI8b4jzo0E9Qie4x+aN8lxmpIWrrAgUUJUIOxEYCBPbDT0lu6iWU6bW6YUI/kEwVP1tEdEGpHfk7g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468787; c=relaxed/simple; bh=gb8047m6aUcDhBvJPYS6TSjIVhl4bb/0b9SN+1QCZQc=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=BeLWpuSKeANALIVFR55rmsaVAqSBD5vBdIlwckoEJ7BGMdeQBby+dGbsRRz6TQa5ee486Nkzcxhp1T9UZYt9TKI0q5ElK/pgT8z/PkDo6xcwnncN1nVDxdrUh5ZVmaRVP/o7xDhoSNhO1dZSMNGczzB0BreNs7ZLEL75IsRLhbI= 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=BS59L8qO; arc=fail smtp.client-ip=40.107.74.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="BS59L8qO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=e8cVgzeyn18INUgXB8LSuerfpDvHvHVcsRjL6gedIyiAtw1AGMvLWCbnCLMONmwavOG06GJTI8O4s5P13lO/Mt37tskc13UdxYjB2uV872HWUEEhRQZZA/PSA9GUFMFqSSlSBuCr9hymkN+6uL8gLaZ9IGpBThYnWzA6q167xHjaAOSzJ/So11iwrGMw66GsYSwZ0nkOS8B1Olox5ELe6x3Q7FUL8S/RB0OuxrRILTTAnPCg0EaEzK7s2KESPuKNGQWljvOwUa5LyZXvO+5zmJgRLS92R2Qs1D7GnFKtECBoUdXhD9DRoYZ6+Gyj38jBMDLts7O9LnKx+9nFfz4PYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zF9L7c8BWVpiszPzAdAnNL/OjGbbyqG4WtEn5uBwTt8=; b=UmiWRJmupLAQr1VARXdZt+p1oweWs41q/BsZbC09Gzdkt7kua2R3qtviptgwuLyUmSRkfI74xyGbw6tM2UI9QBHLbhcQQ90MYZkagiXgHcPo+yMTV+meDjsMNp4yitIoTCv+GaVihV4CPHKrbyRg4+U7PxMsBya5vha1repUS+3S78VC7cMpeDoYSO53/yAS1QBX0lTqk7xaKw4DPypUZha6qRmftBabVY8GSSXM4a/3m8Nhi4YeQUksf4UFUyuZ8K0JMN7XcXVFS+f5sn0D5UG8gnzvQpJlQXXW1xYv9CiicJrDYBnE4UjtFxHZxvi8IpEo0Bjc+MCeftojZfTHcQ== 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=zF9L7c8BWVpiszPzAdAnNL/OjGbbyqG4WtEn5uBwTt8=; b=BS59L8qO7GfA7vQEM0sEDKbtf9nfkChSD+cNrrExHojN+w6QbR/pwIIHvhTjUM/eZ6elv+ARtl1KH6kXIT4mk8fmy/+0TaCE9zmJgHRUMg401XVAvPDJpbGuo3z8yJwa0C3cvbU9LIkPyQkhy+gO3SPh1FQsjn4bp0diiApZmPM= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:43 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:43 +0000 Message-ID: <874j569vgw.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 12/13] ASoC: doc: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:43 +0000 X-ClientProxiedBy: TYCPR01CA0076.jpnprd01.prod.outlook.com (2603:1096:405:3::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f37e3c3-fa2a-4051-202c-08dcf1634492 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: ATudatbbk+LYivnVFGelVHq29l4W6mcxJPL7sUwz+D9UdAGgGDR3/RzrPAKYwGtC5AAMQFS9OAVH3gcAtrivUBb5YVafUr+L8V/E7JZDoCZKuYVgQ7qa+DxF3yWYgUoyV1pJcW/Q8+CjonUC6gl6xQ+vryw8Hvn9A94eU0RT9qvk82hu2L0e7D7CqA2QoIWoAVgqIEeNaPi6TUzbNMJ4ZDO7/BXSsIgxi6SygiqdF6HyvIGCW0HSRr6/MtbkdR3/uxA7yc9VPJx/XcH6LU2laS8I/sgcDHdOr7hD6oo+QMErUh9Muq4a+O/VcUBojMOXggZoqeW4sQNwudfQmX4XfwljnXQVwT0mZu899I2tF+s/Yo04ysX9a+s3H+a1kUCI8Gtvbs1X/nAZJU2Rnsw6QngnxzObj+j61HvGbsQZ4xpVq6LECQginGKWseoYgoPcYxJe1fQ3FLPCZIElrRMEeL6brIkT2it7F+8w8GJSVJ0AKvZdBv2SiAErl2rR+ha0ohgDXDvahRQ6LjFtINbe/y7RzYSiUxWT41cEbpCCiwj685nx17xhYejnaNXfOmtP7tLBDkCdLklor0gWq+LHbQkBYZOA37A8f8Hht8hbWOxVOnTVHV2Sx16v1AUqmWavqJIW8X3EwL/I91x6j3wWSapsU3jwvn2v1XeDZoXIh15o0SbeIzwlM3n5NnYOqFVNp2h5KUgHy6AkTy4FktWKbtwprFebbGCZamwyQqkRBJBVI/I8UEx5xnOVsRIwXGp8VSFQZ6ECyFCD1QANgj840qdg8GhDljKrwkaE/++xDCniTOCKjdkYtS2+LiDmVtnUkECadQwZ5/2dvLQzrdgp77am9JV4hJBawW4hqk85XHI/vJ2CzccsnXjilPxBUdVXhhyejYj1uY47OyQUJRorPDY3WX5Zy2MhNkQ5lyq1lvD5EUJAdAOjxi6n4Lfg0GNLBTIAyG9XH5ONoYlctXQavFZM1pz4UYuihaIU0iqSfbDIT1CkBzO8g4zDLa3SveOsXT+U6PI1H7plWvxXix9Ky1JIUXWZ7mKvIGIynHJKoFfYU53fB2CDmCvBuAyzQwq8OmfZwb7XCCtQOZ9NHq+ovqRV9jan5+a/CO6pqnYVyMQ6n6AWqLojpskOv9sy+fMoqjEciSPwq0PnRtW1jU0l+rzkN1J6jmux6x732sBv6VwPui1zqA/wJoDacfWTtXHLyUy+HWjWvJAG1Vhmr34O0rzyOJyoYeW0a/ioA4ZQhed/U6PWSkT/qZtD4IH8qQ8V0TQsmih2/noidDSZd4EezHIG1Fj9b6jV+jMfEHpq3S/DdYrBgpIyhuJlAPXzD3uZaQ8NSccb6uoBUVafcMujzZQJS1afNzWV5hkP65N/hzU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: knIg2K8D0Rme3+1rrS2zRboNuLVM9qQYwTo1jAQR7g8TiOlwjuJPiqf/vHlMaZBhW3mjJ1OW2HFK1mcMRmT/PCjDWOfTH3T2Tpipt9FYLbyEAHM+gjlXGUu2Apo+2tMIoijSlpLq0KHPrvwh5unBsauGpYM1VvbDz3vw5eEqwuxvDPuiDKrz7PkWTWbIeUhepc8yotkIyuIWHmHFOfKQg1Ov1eCAJ45W86CX9crYveTDbBUmTkSV8OOOG+6P6bVuQk8nVkz1aW/V8YajCWAETWRpi2IVPZJpDRbAVMJf/2ocaMB3js8PGpTqvGajvKzS3Nmn1SelycBMeeE2ETXnlY1bpoI0zMhCwblK366YbSdy3Q3u/WWQI4M35kvJVfv27Q3xjBICNpx55YKzQezo8NlWADTCJE9O+7eQ8obQf3fds8q9bkFFxs0GmD1x4KEbDD6ZRpwDZvsL7adc3OkFJd+6GUjM4TZTYpl+HSXL1L0RCqyKGCUcu+QlWOQicJWookUi8QU+Z4tUpZJmCGhRcqht56nQ/zedIw/zd3/7DAybGS04Hr6G28BHS6QSCOfOCfJ7oM/FuCNHwTC1YS6rf6a8o3XQYRH02BAd+MZTMcixDIjnC3hE+Y8pmyGH+blj+qyb5i8l8SlqdqkVjZqYIySI/gqgJveFHjOz5bX+UnDVaRCy7gXfmAVb66cHobyh3EcR8ERUJ4nEaKrIUyL47u2/6hnsQOs9NxVsvAZWZNa8xWx0SDOStimdNXz1IbOoG8l8Uc1rOVIRxiHNjC4L5iHS+lvJfEjtzYpIzu+qmBU9XerHDAsNge8MQJ6QQJeHHq3oD1UWP8Ydd1qnbfTSbb/l5cwCaf+nbjS1p+Sb2NnBhvPwAYu3+J4ZBwx4L+eMQ4e3IIm4moIg7H8CgvrhWKyaAmjVJAF6Nv0uPkWsaGuGU2SUpsYpd6nmymP8C8jRQfT1RaRcP5S4h9oD1ahLo0DZdH/OSGdIj6VAUjBeiKi8NndIDlEjC3VLGN3e/x7cMQ480v7+HUKgXiFtf4r316EwW7Hw/GtxOtWgWOip5LZswWzeHm0DuzI37y16T7TNUcV2t3G4bhXBSdxwJkJA0GggALxxSTl6xPl601g8XMn0LcFc98vR6q+y0SENY9ePFzE03koidXelBRTTe86ta8FBmdDYk3n0iaycYATZZll1P4x1EFaJTaAT9qCQIQog/s8pi/KDZ11TuyHUrE2DpGhDygoWCeNdRLPtKQCUFIAlWL+27R/KhQQx/WPhDNiXcTqwEOzSMUgHATnQYi3l2DeB7V12Q/pKXGV6UzKKnmmWxx/GjwrWrwqouH3CiT0NbT8OQOCzUnY9MqbtS+2ijkMisEXXXtfzQ3/Qu6yGCgWSVmMoHgEZXRTX5i01HevNaEQXVU71IQEMbL7LoBMENP7EchE3uHSkyVmfarHmLiCrF7Qy+vMxVilR506ZIg9nPxFTl6uwenxbeN//0uF3Y2G/dkjIsZF42ggEHqFBpy4jtmwrBSo3UQN5nk5EIOIUTpc5Ig9Eg4hTim426ZUMLXlgFji961LPr+TVMXPc8EhcOYOfbN5KMT2Kgwse1CSjotZpNMIsGFbRbesk7z2Z0K5toIo3OnAfjMyH0gyk19o= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f37e3c3-fa2a-4051-202c-08dcf1634492 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:43.4880 (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: eIsFHXKu7ZJ3r6rjdTuiKXB876mctjm7rgwosIfDNWV9mI63i799s21OUy+g/ZkvRp5Zgb+qPPiUi+LogpdzSYSgvNJhpN/KqtebTFgNFRvhBtwoe0u+Alf++pBjqc6D X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 dpcm_xxx flags are no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto --- Documentation/sound/soc/dpcm.rst | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/sound/soc/dpcm.rst b/Documentation/sound/soc/dpcm.rst index 2d7ad1d915043..02419a6f82132 100644 --- a/Documentation/sound/soc/dpcm.rst +++ b/Documentation/sound/soc/dpcm.rst @@ -157,15 +157,13 @@ 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, }, .....< 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`` -flags. There is also an option to specify the ordering of the trigger call for +set the DAI link to a DPCM FE with the ``dynamic = 1``. +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 start and stop sequences). @@ -189,15 +187,12 @@ 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, }, .....< 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. +the ``no_pcm`` flag to mark it has a BE. 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 From patchwork Sun Oct 20 23:59:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13843349 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010003.outbound.protection.outlook.com [52.101.228.3]) (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 C9E5E198E63 for ; Sun, 20 Oct 2024 23:59:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.3 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468794; cv=fail; b=NJruUduMruA6S9rqS2ELyRbn/azOYzS3tFxW8cqDElAcCHUvbP7hSihRSW2UzIqoMwUrWz9g7CP8VnKpU2nVOkx8ayizZiuL4IEGOSY3YrVod3ahleA4RbBJMmPlMpMbvD+62o7yBQISFMAgsWt7oeXWgAEkNVVVyEX43Td/Moc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729468794; c=relaxed/simple; bh=q3K47Ix06ztqHR2fT471Jy6zPSf5frK7N4iHFcqYa9I=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=GZ3hKY3LCfVXBBdrDJ0eV0wB/SaN7JMsC2ewjfP8IJc9zSbP6yNOG1gO8u5vvp1nw++wKl6IQxQN1JHBlxIcyyL7BC4GCYwOwET4q8jwTUFgX6Q++7iTbKcXdM/DiXhc0arqOfGdb2/VSOBrxtrn/pO1bqyQAn8Jl61q+kfcqu4= 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=e2uCXgPv; arc=fail smtp.client-ip=52.101.228.3 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="e2uCXgPv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QYE16JRcdnq2YJPJEWFQkjov/zUH2HwsgmTgEkUaPmr5n7E1T6Oi/XrpEFfsMFetcGRmZCL2mV+qneUETFhn4pRKBGiT3HnOYf2EL9f/P12xAz6GSvN1a+plL38C4KU5Sk/0UvdtxRmbY/lwAqHDR/GND53JtIZcoY6ek8riff4GgJkgeiRcaRGJJoUqHRLVX+zhn48xMKaikMwY8feJZGmL0s2sBozEB+DpXhuvRLEkfQXd8mGIlQ7QMbeHBDzOvx0gzI8J6iIaqpzR4vz4KENh5rTOahcJfAYu8ZLyu/J6o9N4uEPlcMk40yP4EHklJwiKKDpzzVzF97i5YC4tDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OPcoVuxjb4OlUhRC7ptTQhVcWoYjTj1nqw2QrQKd1QU=; b=kqlDh7gm5L3IzQvLpc/gnByTDGv/PaGMLVw+YbElnDpiy8Q+B14Ih2lEb+kdMULsOip5T6kubhDo+N6ZPAyFLSxYQrPUjcNz6uyhJsYOq2MaBrrkxw5mc2twWlHIZ/Ie1pt+1u/xjA/QgE1jWZ5Ajcxy9PdTwB1bGFb+cRrewXBMPcqS9o0YYDZ25dLc1Mm3u0AqWdYo+b7mEHTGydCKFK7CAu3IaweZBHSltJBaAoEbdJR2LBTCtIhKeJtsy48LxP6jU+rjee+6dzPXMgsf6qnyXWB1o9Av8a49l32+qZ1jDN5secvuSEBL12GtR7ElhJ/Nwc1eAZd/UD/2vnwO4Q== 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=OPcoVuxjb4OlUhRC7ptTQhVcWoYjTj1nqw2QrQKd1QU=; b=e2uCXgPvKnCc5YkzzJ7bHFkXjxguHKBXGb2PbFCqXrHcsl8qfV1u915MwzKgX4Hgj02tKkO/8qffX4vn9WJ9Vl7Zz23Kd2r2YpocvYqf/JSvHbHVr0ZvPFRJoxK8jpXOje9Bqjo08MhKITXL2OCaLeuCgPpZ7Tb06pRSEJ3VJI4= 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 TYRPR01MB12916.jpnprd01.prod.outlook.com (2603:1096:405:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Sun, 20 Oct 2024 23:59:50 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8069.027; Sun, 20 Oct 2024 23:59:50 +0000 Message-ID: <8734kq9vgq.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v5 13/13] ASoC: soc-pcm: merge DPCM and non-DPCM validation check User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Mark Brown Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> References: <87ldyi9vje.wl-kuninori.morimoto.gx@renesas.com> Date: Sun, 20 Oct 2024 23:59:49 +0000 X-ClientProxiedBy: TYCP286CA0098.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::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_|TYRPR01MB12916:EE_ X-MS-Office365-Filtering-Correlation-Id: 917bd1ed-fb31-4ea5-359c-08dcf163486c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 0Yh66Y0ji2GhU/gAIJOJ1YmMZZG2YsOTg1q9BbhcfaZGz7ZTbQLIUjyOnzbB4ylcPayqtB/0DbVPj4HYdkiE/2jreKceL8zYCuePaHPNOZK7LPToirAMz16qKOqXIPzdWhmnFcRSTRxDQgrTFip/byfj4iKfrMusEc0kJMJ5JEcwiUmob2VaBtpLcnn4xFbNGKa828acKSWYqpxE9G2iytBU7dm6iFJUkh06LsfLc+zArzUsfeh7sTWI/iI1IuG7RcYfWpIO9kF+y6t6L7fy6dkthGijDhPmttohRVRhYw/8BwtfVDH/qwHtue2FlfQWZPRplBJQBCEd1ZGX0/TtccYJXn0kTcXZKIpGjMZS/pCElGjKziJ3nO3FF/j3hB3leeq91vywxZmxc3B4vZhxE5EzHbjz8Fd3RkT/gnvBNcijmzEVi6uReLzMMQ02PeAwjoig1qHKMG3N5vxNlL7UaX/UeX50vCkwESQCfEiBdJpdZSsZ9kyk73y0xZz8DRbWi7NUtdqwcAjV4250IVsIjZjrn11SGOBfA9+pQTggpWPUzpJcStrH25KkP7b6d33qEBoJ5QmV6xu6Th11jUeAAgGP47JuBXt22c3kSuew8buRcFt08JgV9bKiLpZex4zxeDIK8kjTPVELVgCiE5wWd/SjA9Pz4onkcsR1eB+aLFlcClwS3a6QHMdxISKc/DTGkQxrwpL8SVNvMPJ3ix6RJmdCUyRYwOW6y6P34C/bwuTv/BSM0Lw41v4bd/LflOSITdsVn4Ut/2jKlNFSRS79hTMAWDJac7Ius9LL5FKEWgcdQjwa+hS4Jpspdj65GoukQETSRQ+FIUBfrGATVvkGWqSOGCXcN6khq5SRCMqaXQBigHJecdYj7fa5W4uMpyQhhB7jhxRKrRHZ0nIVRyogIr+3XENrUh9qYRRXB2yrqonyITJtkmjeLqlF7nbvWLIejvBK937lkZIcZLfFXJEGniAlk4SUfFSPrweV9gvZkXvwl8FgP0E7kOgNJ5MSmo76WLzRm0K8RkDlSq1LryBoQ5OUY2Qvg9Whdu3C3xcQ8IN7qUTKESd8xnR1B13RtkdUvPGgjEeHhEdy096TFBq/7I/C7K1XwcGkeKvATCvIUh9pv3S9AR4xofYvhyIUo4t3++LoXibVCmP7qOrl7ry2G+CJJ48blQie7U6fzlMroeimeQTfx99i06Z6uKpUqDU/HQGF134i5xC+GVfeiIiIdc/z814q9W0zkVM8XPymALeaCnsrRCcuseoKd/TJTQKy7ul5anRnkPczOoGf8yv0q5xtbAi6h9l8CQJoXW6A7mkMZJ/1H2oeQ5i13xO+b9O3vxHMm2WrF8SE4OL39hsZtZqUji+cfQ5DcCm5u3LqT3Y= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WD4J+Rj8olK+b2rgzYPPZSwYZlRvHM3rMhxymNgCBXScgnbYVpKkVAeyDFU6e1SdV3teXplZlFbA3AW77n/wUKgbM4LMIDkOKvsE5omzKZC0t3vsZtPKrdv5oDzAs2kSMnKZu9k/x2RZ51rTKDO6qiezUkt8BSZu7MA1Rw5eki/NRFZPci2eg6KSO+Fysb+9cpLjQgqNV9jEXOhXE4uq6iZGLLhefrBjcid7Kq6nj/tq8HfHWEiFFP8/rM3OVq4dkq1yMxnX8adm+W4pYF7Pdo5KKwbO6+ypcwIaVnQwTGYRZBcQBr0Vf79Ydv00oZyEmgZrpJf2yagRhT2cizbV1Ruq2XyD1NUrjstrep118r9eayd6wtyjuhXDGuGL/GjKuOI2mTo2FdDbeiLaDnmJo1LcMf885hdjPMLMDN98oKMeBxCo3cJ1XZuS0WbPoiaDmy3yF20u8UYmZ8jSVFr7al7dF2sTT0z9l0X69msoF8B5ygs5QdOy40v2QUBoLEsRVTvgeyPNZgs7dR3qCmNnUad7JVVwcOhrX7qdrto6hvw7yhFOgXroJPQZWbboLQoxOsADTsG71s1IqqjNJHOUCm2DEIEJHjOlEMCGvoBQMHtOloy1V8yTTPLu9/ksC+AzcYDhAj4VhMtmOLprf6ZnpleYrsmAo1Ssk+h+sOL7Vw56j1Fkwzr6o/t5HGyo1bvAqILggega1BiE6sH6TBtG5Js/GaoxtCXfeW05p4BUUFRkaAM3jnFyd+npVFYjKVcLUn2Ycu4f2fGP8KPI51TOchxHMhcWu5YMLWyJ7pbs/Bdhx3VlmumbBHUoo6+3vUeNv9mnOXInMPe8YccE7Q8vZr85pW9aHECQn88ErannyIOEAN00a6ueU2yh0kz1ui9KhcKIN1F6B9A0t5//a7SSdHfTngt4+oKDJ+rRqG94PUqVh11IXRsXUZj+oFmpfIjyI2LdfX9ld8EGcicevFKxGLgI4iJ/j9XMJhMP7UN/ua3SHuJh/qFOkCQa/45s9icF86QptMdjFdix7iFludQrypvVpQN9kCA+nGwH0elBIjzUhF5K53IS3LZLQwhwz8d5qPZEsx5tgXbv92rQEPG0Ibc2GAKKjCmKHEfwQRWXXO+1Mo54wL56VBPFqs7eIjFOhRK3bOC8RIdv0E7/pRl3pC2GNU43ubgSfYoF6c/Nrg41S+jbgyfpMWFamoiUG7ID1uTcUzkR+DYBpeiPWh4+/Zq0j0mxh+ZiqnOPaV46cIIxV35vt31+I9kK5tiXvCWILHFe9QGCy8dPCCojPSrD8O9ygLrgtHtkm5xKjzbTB52RREXQt9OOwdCSFIXPZody+uyvi3JR9uCFEmmrYII9GYqKYyVhoYqqSHiamJZLBeWpvcQvt2+5PdhA+TAfwzddjbr2IE8hoZmTMOvNXM5+HZBtJkNjfsX8VFl5FQcxYO13l4dU4xEV3CFENKme3dR2JNMTnEq29nV3H/YLw9iGQ/nmaE1UB91QOvNS6UlR2rELaTBWIThohQG5dQ3YSYC7B23clMl6cfgCfX3zLpdKEhHnauB/cTPofnRg/YlkOCZgADe1T+7kKpqx3hKu1KsjEvCQN8QidD0VyqvGtB9zVd9HK0Wtu4zqF8AkajovfCA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 917bd1ed-fb31-4ea5-359c-08dcf163486c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2024 23:59:49.9992 (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: 9V00BquKKYxVxX9mbVDc/7wy0+Yrm1R/9x5Xv27NKxwdQTIXW2DURQHYplmh+47xbCsJfWNbmNON4S7Yo2iXyEuvgJJrv5oinKyUvQlp7AkaZvxdlk67Q2YXXG5zViR7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYRPR01MB12916 DPCM and non-DPCM validation check are very similar. The big difference is that DPCM doesn't check Codec validation. This is historical reason. It should be checked, but it breaks existing driver/behavior. Anyway, if we uses dummy DAI as Codec when DPCM case, there is no difference between DPCM and non-DPCM. Let's merge these. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-pcm.c | 62 +++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5142d1abbc7b0..678400e76e53b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2822,7 +2822,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *codec_dai; struct snd_soc_dai_link_ch_map *ch_maps; + struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc); + int cpu_capture; + int cpu_playback; int has_playback = 0; int has_capture = 0; int i; @@ -2832,40 +2836,38 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - if (dai_link->dynamic || dai_link->no_pcm) { - - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK)) - has_playback = 1; - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE)) - has_capture = 1; - } - - } else { - struct snd_soc_dai *codec_dai; + /* Adapt stream for codec2codec links */ + cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); + cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); - /* Adapt stream for codec2codec links */ - int cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); - int cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); + /* + * see + * soc.h :: [dai_link->ch_maps Image sample] + */ + for_each_rtd_ch_maps(rtd, i, ch_maps) { + cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); + codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); /* - * see - * soc.h :: [dai_link->ch_maps Image sample] + * FIXME + * + * DPCM Codec has been no checked before. + * It should be checked, but it breaks compatibility. + * + * For example there is a case that CPU have loopback capabilities which is used + * for tests on boards where the Codec has no capture capabilities. In this case, + * Codec capture validation check will be fail, but system should allow capture + * capabilities. We have no solution for it today. */ - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); - - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && - snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) - has_playback = 1; - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && - snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - has_capture = 1; - } + if (dai_link->dynamic || dai_link->no_pcm) + codec_dai = dummy_dai; + + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && + snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) + has_playback = 1; + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && + snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) + has_capture = 1; } if (dai_link->playback_only)