From patchwork Tue Oct 1 01:41: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: 13817314 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010040.outbound.protection.outlook.com [52.101.228.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 CCE568827 for ; Tue, 1 Oct 2024 01:41:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746885; cv=fail; b=YQD0hh1VIij35goBsycE5CBVbYg/T2NRQSUqPwM7Y8kbzv4bRsD9th/eMPG0Jlv1NFTEDLVWx/Jy9X8CaRG46Bm+l0C2M75qyCMy72B3Zj7MqgCczDli4h65FlvNTXwnjmdj90iUwLooC3CTbjF3SatMrWSQ3mllUmphSaiZE1s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746885; c=relaxed/simple; bh=ALhqrd65SuVXb7aafbJ+b3Dw8tKpMD5/3rouNSlrXMw=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=NTNIpubnaMlSM8OWHHbwvLkMudGRoR7N7He6cFPyAqKAdxY+bDbeDzEz9q5kddg2tx2Ext2SEWVUlvQrxKlE561tdAFRZJz6gCv99dI3ICsjIg9EaBAxLa/YSYP8tDtpcl92/JmmfYze29r1DFFm0YUKGITZQ3p/3KxuPya/v1I= 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=jHDAb//y; arc=fail smtp.client-ip=52.101.228.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="jHDAb//y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GHekD3aI9RYV7xSwagIA4qljxN6+VFZV3MjVAhRN0JUsyfPym+yc6ts6ylXyJPekTHexMBageKOiEemPm4DIotZx4AEIwZIEDOOqxe16tWLipFDJUC+vL8q6xUGbZ+zXfOer3mD+ZRmNTRk0w/syt2KFERr64aEO6b0IFw+G+Jvkt8nDaHvVR5dba6hN/KsJMsJmAPaYuAt3KJjWxMictOwAww+KaslFCQD+F/qYoqiewwS/r37uHIS/NaaWMHq3+nPUxbLfPg8T4uqAl7bLGicVTAovFvnxl6UsDhIAKYQyNIyKI/yKtatYEb5jGQ+PN69d40BpwwC2RRzdGhnv+Q== 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=W5S5aFI6c4nSVcLcbE70zRaees1vSSlb6aG0QUAAGaM=; b=LaDR8gbSa7QiGGSkAu7a2cEAWjWFY1duL/Oy2RVjUICZl7UheyaBn9UFub/I5ORj8jlZbNJnQu9SaKEDdEUji9/vHVrUSVX+BZ7Rmxky7BnU6toEUBd0etfjRCQ8I/kf5iQNRjKwwWXswAp79W9HlN/3p48d1J/9/GsrbbnFHd/KQKmoNSZ6pcuYXHadV3Na/4O305ij/26dUMgolZIWT+LYc1u5/AdNiz4KfqSH9A8sxcgbQyq2RyuNQEBHpxXrj3Qyni7cZFM2JAH5xzXPkUFJ7LUpuCrk3iEXHCKeu1HCxd1Oa2uAwrOzzbXBarYZoZzgu01WFr3vS0qN4ImwYQ== 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=W5S5aFI6c4nSVcLcbE70zRaees1vSSlb6aG0QUAAGaM=; b=jHDAb//y3iZicMmt0KO6r4q65vG3AJCWB5+6fCvjURHxl64S9B3XZ2M4Uo8RHUM3JkQwBN4UazQzTde3uiqSxv7DGkXGGZ5jn9AjEECU7+VtK0LuIicUlRnIOhcltecwUYSXPCb2aCumKNaWyiFC9IV73lfWAMjklzfC2Md3AYg= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41: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.8005.026; Tue, 1 Oct 2024 01:41:20 +0000 Message-ID: <87wmisvbun.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:20 +0000 X-ClientProxiedBy: TY2PR04CA0021.apcprd04.prod.outlook.com (2603:1096:404:f6::33) 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_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: d00d91ef-6c17-4bc0-dfb0-08dce1ba2684 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: upJ6/uPljjlQk0eF7NV6PKHbGGPfr9c+OTp/YpRGmX+qqaLj0WiGzka7IJGplxTHU1cLJPZ865y4WtToDrScSnhdunzIEIEDeEBCO/Re2aaUrYt7IJomgBTI/e/P8lqc9eJ+xrHVoPZsOj73lw7/2b/+7x2xv4n0LVLP8PbKFC/tUmZCby9iS2muRyBs7V2DUkchVUX6JCi1sED3K+IK71vfrTBeBB++41/0+0+53ngX7RLTDlmZAeuhKvVTgmUPfDcGMnZDU1oBlfij9COFYtaAZvw7nmQ1ui3Dq98Dqv84p75duQxr8JIteGz+vQ1jRQRTWjiN7tVPti/y8KO/O6FQbIQpzlFejGIwRuPrx02C+KY5KsZhpdiH46AdKci3MiDyTq2R5TL9KLQss0Ho05F3F+aGNN5toj28fJSmKKtEAYlRokjRBRzu07oJ/12GCCeJbEObc8NcMAOkKBl9OqIPYgHZfxn89itv0ux2o8S3J+vpxibh24rxGkn+dzEZUme9RM9GKYO2Dpb5UcZIN/l3BW3dHEx7WNA/6P+wLDjWoJqreHrGUJK7yuxC9dIsaM6GRe479V3YHz59gXOHut+P7G0utAN9CzifKB5K8/zASfl6/srWNcWWyQ9ywOfu9DFrpdBteZ/X835jDWH+4E4JaGqqKuw+7QSKjPFo/e42QqA0dJZqvsJ+0qV/1wySWi1h8jSx2N14xEFP0o/GGUVN3AWBl4ZQ6dLnJyTkmmiMDtazRs0cXFFP1Vu2jmrWPvwNH7cjet8Zj3fPjs5ovUve450zoY56BvrkzgQMLs350iMc1e+mpZ91W6nbluIxVfOTb++2ptFD0gSEOSKrl/MFJda3AVKwGS7+2MZmEyJbul738XDlXzGDVgwUhaZMsFW8swYqjaERPAZsmkeZX75MnGF1IRkjHfPZPZ2sMwBymlpiqKO1rUxUimAXqrtg2KOTwgM8G2lQv7ApvS2mKx0XP0AoK+to8+Jt1kmG/jx2EBQCAuY+KKSM1qPq8WqkVk3d+AsYu5W3am7AdCfLyeajkVTgVa+3kJuT1/nTBd+I4/c/ec9TjH4nCqByoNmA2SvEnAXgRaZ9gOYAledyG/KC18q/jeIYo7Vpsdd5OhHR3jGXrVUpHgelagYLvmJ9GViVCqP8u4Dn0fgS1JJgGb/5sSa17ltjfc5q2PcBUb3M1qGxB+uS2hdp59Fnz3s8Kkl2A7qhfpij3OG7DN79xKC76NZkX4A8mVWfCwqlYc6TfyHfkKTwU33jDne1FZ87ylfX4eOD+qvDFv1o+p2IE5ESZZ4d2ncZQvu6QQdIq2MEX2B60qGK38lwKaVKAU0n2Y5gUkHxOBTsbuuWbqHELg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: U1sQAt3KFGuAQLa7av8JRjsVPKwzzyVmMuZmbkUPl0pGuIxfbf/SxbLriNFo07+OmsJmJen16FvTRNf2WyZT6IRxYyIHgQ7Ne3ndA8lV9Q3NynKq84f3KQH3iM9Ti42IjJrGL5yVjrxtWsu2LyY1uAAUXaMqeKF4BBS9+Ho+lztCPy+35vG9DevHTA+Q0AgQdTOUbzyTCYF5ncJciJ+ctnle5p8vxmDc0R23l3JGUrUecZGjAlXCgM0r2MSverblyDMR4IqJuwA13oCXoWdUO11O9+t32XziqhWbRDRf0dtsj0Age5hNUxPMtPlLrcZfp+KCvEs/SH/AWNnneA1ZKFwPBh84W/MaYYHpE+pz8JzLHxs1VkZRd3uRRUR7jgjx9Z/JIiix6udQSjPwPm6LRfLTziKR2yezt24T1QcATQ/mOrXvYjVvg1vZLkFplOdACHclZgHRKbPmECNMXB5I3j5JgeUQ+toQiAAtHsL/CL9jCeUiYx5AT0yS5JfbmdrRlWbaH5yk+8xYC6Sa08yLDbqSQC5T6Jipwm0pC6etDgdzg5fTG4r/URchpMNGLYbYoXAwYsPmlR1I9Z1L2orQbEE9cqOCekNLchKU8QWeJe47mdXM44RMbPkq3TK6FXdn7ddeOpXMEXWVyQpMbHksaHhf7i7WQBwty0IO/t3uwQ0L4w/cwFQf8m+vCA27EM+mHPMpw5VJncUH/YF/FiWyCWqrRQQpZVtv0Ew9JJa+pK5SIPnesrz19oWOG6/W4zSet2NpUoRsrO1ZuYpThtgilS1c2dA+gnJl1YB2kDDfvfQ+SoK4Qon6KFybEMw3BBpfdZeZMoCwnNxxzIa9m1G38k5ZNU7tG07TvvkGl3XQewVFJyNdqRyxspsQVTAmQZeO84H1QQwOUhZyvGXCxkYZC1xBEFyEOaxYZm/H0jH7nJdv+ANM9PwiRAO6ha1YcrAwpkf2OOQ4e1dvZh00O7dL7/rYGAwK1t9UiMVVxLyuOhcCSK8fC+qVg/ZYvRok5hzid//4ESmxyv+SW9g+8eaH57PsVNUx8+RYFJiyhAqu18KOc52yd1sGqkKGiPOsw0jLU/gDvETguaRVizSiZY+GU4D3JCuuKOEM07torkB4lC5EO+v90FfPs5B5RXm0vFKVPt1xOnDuX+z1hsM8+8fE3B14ky9jKGvOJFymrRNqVG0FnT+ynrUw07GYmJgSYG3vGpDpvAf1NF0un7g+xN7NVHaYdYdXw8sTcMyp7znqijvGAEosGbugvM7aaXTaBwWKHEDATnsoO92qCm3uqqmTrY/4SXc8KD+atp0nYT1AS4KVmCp9w/8J/Z6BGdDv8XdGxrA/ADRCRl0zN4wMqwObEv/F2TxkAuRqo0umpLTmThcW3xGeCsnd3PHqybtMDtN5rcEf+n6q7g++mxl0z0kN1ucRXQ9rjA/b8o/cRoFmRrr2mK2k92nbuzJqonc7XiNamD4//meXn+N6OMNVCKKaMqOAuT8VADqf4/CIMaA5n7EantF9/qT1hf9OVfZkGspnM79/mC723pfPb3ptfXKSBYe313KybrpVeGQWpvEd5TYR/79yOZeerXMh9XxiTbHCa9/KmpyOSTvnXLng4AI6LxdA/LnRZpLYMomOo33RgIs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: d00d91ef-6c17-4bc0-dfb0-08dce1ba2684 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:20.6898 (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: 868WAZfbyVbnez1IqLJh8dWVDxDdU1ElKhiHi5VvX3vbR1+E5gDqZfQtL7E+bcZeRCtRj6shb0J460DomzRZ3DNq/7jkc1DQwwQprR6q9l7JWdj9r7+8zb0Mj+Ai/zMU X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 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 77cf72082e73..02b04f355ca6 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 3756b8bef17b..0193b3eae7a6 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 e9ff4815c12c..aa38104b2704 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1407,8 +1407,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1444,8 +1442,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1480,7 +1476,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) } links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1512,7 +1508,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1527,7 +1523,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; } if (drv_data->amp_codec_id == MAX98388) { - links[i].dpcm_capture = 1; + links[i].playback_only = 0; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; @@ -1553,8 +1549,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_bt); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->bt_codec_id) { @@ -1574,7 +1568,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_dmic); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_capture = 1; + links[i].capture_only = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1613,8 +1607,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1657,8 +1649,6 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1686,7 +1676,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1724,7 +1714,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; + links[i].playback_only = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1774,7 +1764,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_platforms = ARRAY_SIZE(platform_component); } links[i].ops = &acp_card_dmic_ops; - links[i].dpcm_capture = 1; + links[i].capture_only = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index 357dfd016baf..4ca1978020a9 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 7878e061ecb9..2ca904db82ab 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 Tue Oct 1 01:41:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817315 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010026.outbound.protection.outlook.com [52.101.228.26]) (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 901A28827 for ; Tue, 1 Oct 2024 01:41:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.26 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746890; cv=fail; b=XR+1odbL+CdbkFIv9SA3ScFM/c2b03U9uUTh9lX52fs1prkfI4zb1Pyw/LdtmhVKnNw87UV50Bx+QfMQsYfbAP6G+R5af+l38G4l5TTrqlQphf5iP3mTwJi807pciM6rYTVtHX8kq19rZHvZbQT8hZUNBUKXvCYWzxbaCuA6M58= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746890; c=relaxed/simple; bh=PbwU6wHqI0RkujWOH8IiK3Q99jsa4tgfaOXE36c1fB0=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=QyAqCizIvJ5CfVBH2B+JmMzSc5IFOdeRNhr4drS8uU/OysXC4xHbEW2xwzPDTdRUoHY1KW0jLLvc8UID/+rwD8qcGWT0mq70gbPltzNbNgwCnzWfnmiW8VwZA6BacfeIkSa1BKqV9TdzEay1zvBsNiaoCXCtJJA5o0qo2VPTpkE= 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=RCQipKJ9; arc=fail smtp.client-ip=52.101.228.26 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="RCQipKJ9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I1vkPyeIHRzj9Rgfx8fkfhgWqJio5lxE3zoYWWFZy0nxNkCxr4XeFb6C7smrc69HinH1A02YOoQiQZbePPddjTXiYsYa7I3iHh/1+oSedGljcMSMZnSNqC8x6FisMS3Gw1BixKw7pr5qX6wAQhDdHUjBxHRHN9DzeD+Jv5B4BcBRe65RCQmT/w5W+PvVG3pmzAMx4lNc+rnwa5PQZKjDD1sZ9/RFpiylDHpYltWGxXBzGhLToRB2HerlUZymXgFtF0R7EdKp5IpU+BjCYLyKkcGNrczIpooYmrPdqfPHBeBWj8EYhernzmNriW7iLV6ZIbSykY9EyrDVzfahi5xPCA== 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=D3f/OYf1H3VinkC65z2yVjJNFovoenyppLGdpNHRL08=; b=sqIT3B26uSqFWpqTd4rxmO7CDWNzkpoKWr/3ggJ6JjeLso2kMCS344RFPRQipAPOs1pxbWdt1Du8R4lBtNb22JlOotkcrRTvoNWoBFGOAYKyxYopSxJ9pfhdMvMBoaVsZmB43zyS1qm76KRhPGIgiRlB4Cs3u8Plk+ImlSWka+sJ2fVtUW1p3rvWk0k7SMaUpPRsVsmpVm8VNKXJNPtV0T4OLlZQJEZAc/X5PfseNO4KWNXcIMwQBH3cPGqCLqt4ay+XEBZsd1Xgiq7Poi0OVfeWK3BJc9BvOfge4gXkd4mYK99A5YzuglKlR7lYpnjnMNS49dc0Or4Ml5cWSawlJw== 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=D3f/OYf1H3VinkC65z2yVjJNFovoenyppLGdpNHRL08=; b=RCQipKJ9Rwk3S5wd2KXPSZU1ecX4w6B2cFXayjEIPnGBkYzitHkKLaZbuuPGYrkYNWisbNrLmxTrn4BLeVG19phlfDoshQTd/ih6pIYA4VguDDf9zIBNdgk9kN4hRmQe1JYtqhk7tP77636nL50KeD0lDOGABM4M+EZkwF0sX7Q= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41:26 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:41:26 +0000 Message-ID: <87v7ycvbuh.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:26 +0000 X-ClientProxiedBy: TYCP301CA0053.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:384::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: ab99412c-a3f6-4442-2475-08dce1ba2a0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: OLXdL6F9f9P583d+KWNSCWof+4/iI8GZeMtG7X5+kkxf6JypD7KkXIXsKD37x8Gc+p5Wzu8d4gw6kL800apvfsjIADpGu9wimA97hGRCqIzTY6UWfZtD3PkzgrfPH7PEYxTGxV6kpZNFHDGTs1+QJweGEkIJkyisEDO1QMIm6ZLpJhAyud/HCVYMS9DX8QFH4GirkpKxMTd4HoGb/APzfbB9+/vvjYLwAlh6l+l0/dAOGPIb53d9rX2v+TL2wiazM2PaL0ENLNQyYfhqYHGKug4DZ7EAiq9vTwBSELgAwTk2F4R4Rs9FWee2jbo/k5eoG15z0LUbN92yIdkpb+ypneoe8cvCsgTGoI05ud7m/ZezEoShmCu6jT2dyQ9rLMxS0rXoiOA1uy89DsQqnX00x7tLAPQvWuwwRXeoMiPRmEmYtPS9kbHJnkKojtrE9Fcv29I6mrbYPwloQU8d+iCF13ihffK9ggeQ1b4QcFWTfL3//CvaTMz7YK43qGw2kWFf78ydmNkMAHSfQ6vzSHuyhuXsovNPIZNIy6yt3fs4di533klcF0bE7gU1/TRenYNZVnSmQ2+8Wz2tsj8vR/uMlnTzO2oZ/xJbU6DkU+8mWu5yfpbxfVmc2qz7fUhpLzBWUNHFY4e50xG3GrRGIjfJ6tjJlTq3kDDBYBFrN/V7tTzyQpbOKYDUMoUmJ7Bo4fjtapM/8EnumH1+yagmtgfRSL6WoSDVaWDqeeS7iT4ChZ5emMMdTTI7d7H6EqM4cUeno5zV1imUepM/wPD2K+mhv0yY0L2uWLT9/mkrFxNNauI9XSrVkQLyLy1iaJVRkh784P61gQm57LYhCWWrduA3biIcNtKN0JQBuI0HhTtkifeyiPeUgP6tplo+cShVHmw46MaURfL4l0A/lXj7C8JyJmXv/A4EQt6pdZu/S0QmkCKILSi6rHDpEC6+uFvWCVSJt+8Q6sBZ1+BkFc/RhzPys5Ur2x/PRDVpisCNbXr9IaRX2n2XiKKN0Aq6tvxaHP4rKmozeFV2dV+6ADupL0G8aIxxFvPVturDoypOgILXKZ9wQjEoZzmBW8d8QkW+chExw3XWrLlxyRHLZVZjcrNyRJ143MfQjQgx6osS73Yeb4W+mMLMnM7k3fD5sU9G5BO9iDKOu2P+n5HUIiD8hHplx31ZSd9/8LYo88zldPmAvFLvFd3y8qc7Y8dq4TMMobJ1x59nwzJaemGzoBGWoiqOJdUDLIVOpIWMXGWo+47CwC62dP4GTi2xLFHOT0fdzaR0YOhT+g/MrvBztoOp0D7VDzh1wuC/mB6zARz2QZ/mj9NY3kvmkLyvJIWAFnyCzkMgSunz5RQvebhgIEPIT9gKnA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aY2oCUgAbM2Q6U1gSfIeJ4fB5ngz5O5pYOHhx34+QudD8plcAd6xprk0ws7tI8swne1lWQnxVUYZkYbDTWFSuLIIjl5AibxYfmAX6stC9KhO7soi14+4EYGlgrapIvDr4tq4B8Ey4E2EM9ul6nY0KxIV+7lbHrjtOMJletAlC71HrLEg8SkTa2p7UpckMA1wuoyfrPO9fBFwleTZXR1TV34ebYsRzXfyc5/erjRdMoYDAVKVadR2eq3CITP59i2qQKfLriJ2nhGvDVNzo9PunBh4dR/CMl7zphyiHz27dQIXySy9p36gINNFaEE45a2h2NZXMg9LJGWsNqbf3S7WNemDXec8AyP0cSpru55ZydgD7LmWj6i8YubkNTl6mk9S1NoEfYmpZYOm2A2Jsu0hDK35Y1uWNPvvYyL9ts0DKGVcqt+A93KQXf7cAfzi4h5ySgbfCsbaB7gaGPIPpHPD3eSIvzMJHMoqr3NO8GAcysApph0vs+W7PN7xXg8Xew+NAjvSGritsRzXZlvkKmCAscXsVOrHHBImVBNxTP5eSIoNEz9+6AHiyEwZu1VRrUJPoIQsfLioltaivVdWAjwo51pChw0aTsmA3inIlstHIpPRJay6Eng8jWeOKJSGVMzMT8j169G37fSSQjRUo7tAsEfIIo9xX5mZVpT/y+QUyxntaBOfMIQtt4fzFPXewzJxL+Hdcj5PQ3y/r/9+HSX/Up/i3JuLTEU1baOdP3Sawh07lXHmJZvtsqDR1L3IvoOyMBCsjTlZYiFR23I1qDaeBygf8zQuazcHtWYEBrl1Idkp/rrf4/q2RceaJhH4GDu/yaW1zj3jNb0S55M1iy8k9hb4fagY3poB8uXCnvZHcQt280C8wuWa+SQEePAxJpXO0aC35iaM5QcNexi4pWfg8OUyXNWkdZnNsgGe9ACQRKvDA3VVkJ3jyYYvmDMBokvNvMibkrot/s2jyHModiUt71ITk0TdaCyyPM0IIR3qE53JjLnH4+rXSJOt2m/NHv1rJR4tskQb4gqExXumt0DqUsoLu9vpP+t6rVYlZIYZa0yum1EdOPG27RybZjxyAm1cCy+ZlVhpFxpmESLfeGI4RBLbshCEZEU2Dp1XFv564AjOz/EnJ3e5ItxFW6Fhdb71mfjUrMC6+hyl11fyML5L8b/47Da2bJsdOvcwGyxhJCeVR0wG7CgxbifCtakrX9gMjQnPXwQlYyGKIAJJ4IQ+n6kMi2rpBewZFGedG4sJghWsFPlXkoFSCNGVSbQLwixBbDsOJWviLfGSdf21iQjkm91wOdQaWVj20MhwCjh9ziTtx+p8TqfzpGEk/iPIEw8QNR43MXR+VSaPJuB2hRMZdNDyKlv9mHhzt7Yyia1SyC491qO4tixVNqsv5gPpOUETW3R8Z1ULUi7fcy3Mi6q+Uhg+uNmeRsFNMqTv8dslrCOg9qG2rLzGp10GNbgYN7Y+9YT0MoLFB8RZhqwD5LRFGl4xzpsrprQeOjqbrnw48YROYE3Rk8eJscSuaaooNvfqqXvW8dke8IsEXfbH7jRt5XndOdWrlueTIMPC7SB/bm/fPPW2XYUexm8cBEdzr1gzht5lKgOlXHjCkopbDdtunZ2+vheWnmKAfS3jIetKHVc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab99412c-a3f6-4442-2475-08dce1ba2a0d X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:26.6180 (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: xQGXVh8uJqQgwuFuEGl4vW29Osda7NKy0B4o71d65o5D9fyHnGNg2cjkjAHx1MIPPT3vXPFLf6V/sGcTgOGliwC2xVL92Nnn2S73lzh6txQLgdYQgpRklLjUvcoDEds/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 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 f6c3aeff0d8e..82ca137621cb 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 6fbcf33fd0de..dcf770b55c4b 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 98b37dd2b901..c4647ba912a6 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -814,8 +814,8 @@ static int imx_card_probe(struct platform_device *pdev) } for_each_card_prelinks(&data->card, i, link) { if (link->dynamic == 1 && link_be) { - link->dpcm_playback = link_be->dpcm_playback; - link->dpcm_capture = link_be->dpcm_capture; + link->playback_only = link_be->playback_only; + link->capture_only = link_be->capture_only; } } } From patchwork Tue Oct 1 01:41:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817316 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010036.outbound.protection.outlook.com [52.101.228.36]) (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 4E35B15E81 for ; Tue, 1 Oct 2024 01:41:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746896; cv=fail; b=n6Gz8iS/0FkfsNAx66nk+Lro6H78Q5eK74p3ZY4GRSv3YlrSHj113HJLo+8zL/K0y7Pc8fQpvTxIkAhvBlzX7JDv7XlaM+DRobnYZDEczwwxMZZDKcBguyQoozbTucihgOKQsOLjg/OWqyUZRZ29A8bPbmQVYqiSpXlV0Rpovh8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746896; c=relaxed/simple; bh=SoqlRvpT8A97YD5/DxkECQEKegqskxT3GPls9mmMcwY=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=rkz27InQIkME19LRSgJVUFDJ0m1dj8ke97nliEjVM2/1RFGnEN/4rN6r/0GIf4JFkp30tfsVJjoCF+CEAVsstHKOaSAsqrhnhgvubd8bIggRjJbyAkRgWip4FH/4GJfVgkQpAsKn4G8YK/csaStiqqrU1KQrJ1JmJoIPmRvgcDk= 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=QzkSXwsi; arc=fail smtp.client-ip=52.101.228.36 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="QzkSXwsi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nDevqb3WODISOjg06bI76NgHVYdwJnTZG4VBhnDCePdmpgw/+CsgLNAYMqkPU21BBF2pF1HqfAdvmoi/wuQ/7FFHbs0ZoVhaSsIxQ63Bn26E+OX3cyLhCtHvWDrNEmcGtCUsl/auZGqTiEzTiRslxhXecBWkfLfswlQqcSvSKLTN0mIuze1JkUy1k0L1s01SazgJ2gLvaEAJA0dWjehQExE1Ng9pwvi6wyfRj7ajzn86BDOEQcHdb9Dm4jOd275JswyuRjm8HO25Bht7pRkWevF+q64NWcvTKRinUS8b5qELAEPc+lkfdlbxBOlde6nz/qYbgC362bez0XHik5JXvg== 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=sWb24QbYDUDRkY8Vom8ra7HaFz9I46gMxQASpY9/BTU=; b=nNTDHkyu67oGQL0BtworEFvIUq49/z4CwMvn55pRRZB4aWSYHLXMbhqXoPR7t+llks8gDI++HtqAt7syrf1rULrrZyJuR5uBq7ipTzpKGRSAQs7WNiN+hybGLEu7MMd2tpTKLj+0Wv8mOmyWqCb74RMchNiMRHnrUVngED5YQGOBfpVR+i/Jn34LTqZceG3X1LjDZJi4IgvJGbhMrVXrmIaKPLpTCGf8IkGHbB3XcGRVzPK6vR6EUBPdqgO1CStmE/hlTbCSmBMv7A30ZZvAQT2Bsfn/fGzpw5zPaqv13XHzyC4EX8qua7L/vpnCDqZWRJSzgOBNaqy+PPZf8M4aWg== 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=sWb24QbYDUDRkY8Vom8ra7HaFz9I46gMxQASpY9/BTU=; b=QzkSXwsi378ez6l9BXXmM0PR7W5/A9vPluRywM1WIcvdqRLfOjZMzaC8NNYwZDLvWdGkt3groYc79doiJdTmz91xK18gQDA/jmJt/SozWQopo4fE60juz23u3f+ZDWDOG0veQ0qfAsl1Il3mvcnBeatnVyukTvCWgXkXfzxueSE= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41:32 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:41:32 +0000 Message-ID: <87ttdwvbub.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:32 +0000 X-ClientProxiedBy: TYCP301CA0081.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:7b::18) 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_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: 145857f0-d41f-485d-e610-08dce1ba2d84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: NxNKv88bAA1pU828TlmGnS+xeppV/Y/IaLMJ4Xx1XBxKYVy0hXjB9Xx/kr8lNH2myM8FB3uI3iOrWkO9HX/t90OhwBIWwOEZdfPcKH5R56SPUWc95Ot0MkiyGvBtsaC5h1jJwCwRasQJABmHh2kvQX8nKfKfuyoNGqNg9OTTNpWucr6nmpB8vSv59p49eDy7ck/6FKuTTjjQGvi/9nmNQuN0y4eUbHLQo/0e5xTdOn7aMdfNlxHJ1D5pdvxxCTd4k1XqYQ4Q8pAJjVQjIs+ZEoXJFtfPw2X77HxOpjs3v61HPjUU64pr8fKSbJJ9effj3TVXaiFODQAR3QlCijTC/OkhigdSv8xHZQtawyfMzAlEI29n2/Ck8sifYv4fyHeDz0kprB09yIXTWVAx0x/eXvZDtam6+WweC0vppxSbP369UZWM0HIBGbvM2mDIwwKg6B7+guC4U+QoxAtzrimFTGfNElXyj/63Ky7zYxSeRa6fFHrWE2LO1cFOlHcSQ6EQCZeCltpzkkdWcQ/YWTTYul251hW1KosBt64ep48Pn5RVWiW2I9mqX1l09Y+8AjlhzLHSc6H/jNbhYDLNIc/jWGxZkLlprxko8mJm0aZyhxJfZX/eFXXkZon+zFUEefUKsZpiOYeN4Nn1d3msGwtohGMp6JKFK9fjsVmwYKEhFOcaken8s/pW5Zutuq5+YRer+nk3xG2M8ZpDVKl0k0fDL0DmkL57Ja+k0eAbOrrEUmulrLYZf5iEtrCfhcunZNa0cH90BR+fXFhYUYrQjZTbkRaUUF6XnKutPf+YjNlMEUTRan646tewdPk3GkN2N4e4U99/lzp7tOUHYrttR0+O399yKMVVnxkWzHLODJF8vb9pbB9Ut3ByiRMJvknltRZhlPUBSRgt7ZBrrsXSTF21Nc6Reswodcbw9fXDelKmthFzuEb0DW+SYLbx//FhvFcMbdEOTKnqYYZVW0+IILV6305ik/U5T/p8BYX2H+iJ+s+LF83jZ0eiMeTFMgtD6KGHHKQgyVkv+KdtDUUFvcZXbi0V5Xbz0+7ocnSLwgWmTHsQ7yYdp0KqDKOf+m59nHKf0iqijakUB1u0F9uojIx8zj10fyLsCflQr/HRFzTgOXzM5nD0o3xU8vECj211VhlZW3eGfAiOyEsbAoMususLPm147ETyQNeD7FrL5ptn24wyAjXlnLRv7gXTC8YyvtnlKa7aj0mZMuiY7ls1zf6AlSKvYHZEQjedeZ2HR6xiDIY/FdqTzurqMV3xTsTPHAzrkTIIsWgc5b7ZY175FXn1arO3hFlB7ycao8Ls7byNIPyNZVzh+hCK95WfR5coYhQgeNISDhmM5m72bJaRLu8rAQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7lnlXo88jyiz9Ub9RLc9k2fKDgyatwQMbqy6h63cRod/ngZgb3xs898D3wN2pQlbhiDMFpCjtILcNFT5CP4POY+k0V++ZFZgBI4PhoEeW/omLeXm4SqAOlz0e2JrXi3xwGQ3jqZjlSc3D8JxGdrwws4Fxuf0J0pJDG0udJVahMUKU+8TyrLX/Agt28pPD7M8RPqbC1M0piw1htaVu/wV2EuNr2qQw8SeXXpY5tb6u1yxrNKZEaWdoHmjG1IAaYM6VtQjLxsYyVDHwIprmm9B10nPxzNgujhnbVipLme0q6nTGHENQNYZK+wfLdb3bq4aWa3NOXa99FH+Z/s3YcqSnW+3LMbabhKvLvt1FqcHigX/5FEzDOgCe1VURDwF1p6Slkkk7JjiEpQuXHrDu4msJ2hg7MjskmgL/DRvG1/vwrwSp559KYg7ItHTl9BTXcEdakxx04hjtturOJwhLUNhkTOMINGl/hHV+A9ZmnOqxMRm9v5NJ2pPz3kcmhjPt+D5jVqXmSQGoxKJW8/hQQJtHbk0q+qviDTfbOgxMloAzXMEfOJ5qBuDQvdgMQc+F7fQB6VFlvz0KeKnCd6hJLctNR37ib7sOcrzSBVuLdPijTqI5eGG5cDfFFXARqr4ejrsJhF8SQRt8ZG3ZdoOmjWjWPsop/6FgIiyK8fqlE+1JFTRNEzQfEfOXkxIyOgXO4ZAeotpn+8MV0987NsAKSsfzt/zE7CRmHOdUO9eAB0DjEQu7n57+CoQ5md6IspqHuVSeJXsrjNObibqiobR9lF5E6SCgDCEixM3BzrzsgQak65bezPUZNdXof9LSHeOnUKhqkfWipWVpp5USybh3+Sq6Gnk/cW8hdbVIjCCmKtbxaRakclRfs9wL0qiHoC8B28jt3YsKEDvqa77a0Yx8spBIGP5GjjhOvodyoH6EGGyzmEQu1tjMtGq+Da4c6z9DIHJJ8B8wrAT3hNPRV31KD5QsnNuo384UovcgqaYs/1qJnbMLVOaRU/62to5HYUf4TwbCCtXUpZZnj3XAumFqWza1j2DXDF2L8GRoLxA6atYlLUJBKCG5NkK/e+wb+x0RGNLrd5l9+2ab3QwqBSNWQPxi2IW2/LwQhWNz1YPZUxfsxV69f35DwhLBZa+dOTWBFtRsQJMd4tjSfp/HH9zi7++JZIfI71OVxHA1nf70pLlPCiZ4Hzioj4Nm43lDsKp6klzPrUCthVcx9BvJ8re1n1aE1SPxRymik8TCxQKy+rupUNFOs5tbTNm2pXpGcOK1POkOIlWz7nCS7D1qbVYO/9MR/MLFzREhalmJL5nVOerWagUdKgSTsV6+eeU+brunNdWn4ncaollJ6Xh/PXcQ/8Gnzcy1458zvnEmU2bBu9Mj2SiR1J2iyDnPJhqFsHTXqac/oIYb83k/FyxUZr+MFgozHXJ36l+wIgb5FKBnX2185odWPyEsbvQ2mfg1CbGwoLZsVO0BCUmH5DCpkFaooLuxtG7RKo/GR1W24BA5+13f3BLOsvYz8PMVYysSIEABI/A1oAPOuy5BpdMKrHNA2YEQkhqFgObFLtjW/PLBCODqwYYjA8OX3ZC+dM7NCtopz3Gbr0jJ3YtYng2OvtMym57xYhV7yFju1dr2gOxuN4Tfgw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 145857f0-d41f-485d-e610-08dce1ba2d84 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:32.4219 (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: 1q1WzRQSn6i9kns3jviA3qA2OquATzzvisLOat6wySqbVMMw7HsZRDhcb3gAyMpflQygvXeHHQrXV6S92hbWBT69qjS6LqtuN5ylglHHlhOwv5n8yvS5S/gJvI5UVhtU X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 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 b12b3d865ae3..c0c906a78eba 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 Tue Oct 1 01:41: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: 13817317 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010060.outbound.protection.outlook.com [52.101.228.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 273DF11713 for ; Tue, 1 Oct 2024 01:41:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746902; cv=fail; b=BYYgxqzwBj5oS5HNRYPsHAdRyPkB9euafCwOMw29b8cUrxG0QRShHsgKRb5EB7Dikck/C5WpeUtd8fszKuoEHD4iSOX1HZosYqaK7UFCvTrzjtVr6XFxVUSzhKSX64lPR7meZMqE2rgeaXgpeQI94rhpSMXNcfycAOO9OI9VE7g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746902; c=relaxed/simple; bh=bxRpl+CqANhmovPfpnJXiezEz9/NtjhfhDS0v5gdQ2E=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=EsrXHuKHS9W01EgH4rj03BW+G7XbP58QSskDSAjlwEHgmzvWBBfzT8RkB/r6Ul7Jn+MibLmfLpZuHLm+D0L/CuS9P/f00T2G8wPPy6aaIM4tgOE0R2vRiVM3ABR6JGIIMHiwyshlfSYc4reQpiJXAD4TC7No4dowqjkORWUD1LY= 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=VtmfXBDz; arc=fail smtp.client-ip=52.101.228.60 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="VtmfXBDz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gav7ZbTf9Huv2il18w6j4vyae8nOQc2AYPck5YObMDuc6KaKJGTWDx0NesNSrDMDqn83u6bBqyml4Ptxu2KqSzVb4GmPLat8yJTvbz6BsbdBQ+g73sGG6sZAxqMEH+F9AkivIFHZOV6YzjsWgPNSgR23DRKQD0zYQC3s16yw5SZO2M/xKvT1PqsykqXAWDLAwjvaVL70t+B/Ca7f27U7YJwmhsy+uRPh/0W6IEwsvUuxcFky+RmFIBDO+4kQTisVqXGwOxPupACydKVwkD/loFv7eaiSMwouRhuxHJzsTBiArQRe/+gO7OJuLMmAqX8xhKmQmEWJZ7zr/W+JUoCtzg== 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=DySgeS9wpZgTE1VvWnEy/VzEhwwIUcnV5MdwwU66t5A=; b=IhItX7uzHclVR9+7b2WLqZSiDyzDAjY+rYBkeCi0cjiMoEC0cNg9K/hmfbaSRiMatp3tD/e2UagfZBdsVL4R4AGnQaf+Lt8isPvhvwvmDAFB04+LMvKOECrI+YyAG3xcbx6dy4khJGa5WNDuL/aFRqwIDU4y6FQhW5jK/Zhz2MwRZa3pNQSX5OLEaAxVWlpHHh+DxAYZdlGWFCZ2fwvUG4TTjdoU/DXZMw6KW+a8Ua+mTMad8brG+dWIrCY+CjOjB7k2NmD7Pj9OLv8hmu/OsK04LC3UFkluvAURqxXV62YP7TZXxfWWkoM7GWyhV8Tmhe9U/6LYDplWzdgk4Lf/2A== 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=DySgeS9wpZgTE1VvWnEy/VzEhwwIUcnV5MdwwU66t5A=; b=VtmfXBDzKjoTcihh+KRKVgxe3fFmmmkbbevos8+jyC2g7Ro1IQQzZ/gRa0OB3nkrdLaa6oW/9AQmrkFFD553NKzZ9t1pC5gZmmnVlBnut5xUCqtmihsvzOSibY11VXViuUB8t1A2QBG6WcQrBUkU7k1Q5NBz3e0MSKl+9/kdMjI= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41: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.8005.026; Tue, 1 Oct 2024 01:41:38 +0000 Message-ID: <87setgvbu6.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:38 +0000 X-ClientProxiedBy: TYCP301CA0088.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:7b::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_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b592abd-0edc-4e31-3a6c-08dce1ba30fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: v21mC61dZlVr8wNGjgfAUu9kHozFA+E99Ma+vRoTglk24MwtGolN/4rU8+tb89zgS8ypCvmiEHEE9pKqraGKqTteBPMggU0vfB7AnaFEcAkxKy1vTslsCaH+E3PtGICiPxp8kX13C6gGD4MX+/8yhzFsfgDQS7v9BY7zHYDJuIA5G/phy/XSu0E/s5RviEYQzwpg2RY+OI0nfzXrIk2egssTT5lh0U/mZD8mw3Mvh9vnMZGZFeCpXcdMOhE0p5H4Abo7pwxRYsQvOYYgpsUedKBpsyqjjbwKjpoLvVvKMW+aTgTOtNKvmy0kJJM/1/aSunfnLLpMaiwMRee6hKRxPwtjbP7EsqGeybnNiJ1t8I0afTgffg9smAqcOm/CYx7gGxL5+D0eSy5YHqVUZSX5fDppjPdNRedsmm3kGF86BixFPBPfTTF6ZTayLakbZXqHyAw2djAtw3lYYTtLIxNlUGs4neeXMUTY99KGQ5q+47xEUD4xF1UK1Yy+ZHMZKsFyJyeqlJXqG2Ry+U4OA4vKjIKtWTT+NvW8Jh7ZRl/iT1SU3QZ+TRFH3h7UzbsgSMRBTMe4QAoEB3yXuzg323/LRvpXbSj3kqUYyoR2CzmzxQm3u+GPu0eXXmk6gffZf+x11KWmn7LGm8LOowe2NLx34eq1bf3PWRBqSCuHs59953usCPC5RUND15D2wVQ4UqDoZTX7QMOWzhVIOYJQv7KEi6y8OmnhPRa20CWX2+alb4ortL/bA6GMarHOGoO4V+JJo0pUPVDDsZ+qeKdJgJJPB/zbYqUndlJEUSpyNVw5ShTOwOOKP7Lty6VHQCEq+r+J6T+0/aCVMHWk3BGUJtz5ZzNQwQVVgi8nkjajNyuk8h70V+EA9CPDu4ex6xQ2hON6elS/qGcddCBwSWe15M6ifE8OIOv4lBkEyIcZnAJ4QqAOmZbiBc1TkycVabmdIVizXU5zGvoiRTmh4cfx7JSk2jb5iFwE8kqjO2dzRvrhRJzqRuMOkrBtxARnl+k/jXNTv8vLWp1OrmX5q6oj5OxDp2NKF91WDohKtLNL5YgcTWKyFpizaoPBbZ94SZIDbJ0rkfQtlgRJhH6kNoNCN5uk9oZqcJ9LBIdTv3oXo7kzZ6urk6hz80IGAgeNRNbtBDd04vqsW7Td8ybtS7f57hGxr4IwbUaHqkSgGYaAqtq+8g4ExbN159k+8X9COdLWUt50MDB2RaY45cXbn1pak3p1JONMA3nB99XLMuW6k0SXn9psjVDrf8cj9k3ymYUNjKcC8AjnhUWaeQW3BSwtTN0wkKoUU0bjBq0c1LKgYWBjyNGUXx7gcWW7sE4qnqQbR0r1pN+NCBwckNm/PFvFIAIckA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T8qSaa7rBsPkKi2U7SuE+Q2ub84WdoVNKuihvuU6VfbjdOu697GmZpHAZ02D3puvwPZ8McCISe3Z0HTSCSv4xer3h2AAalWxPu1DCgS6jxeP4S5ND02ofBZ7TgXUfM5gBrY4nWn/Y3Jxt3RodzBWtIXrhP0R+QkAg1gv/qJ1Yf1Mf8pNLTPjfgXCntptOS6GhZ7s4/XDa6Csj1gpkxXeV0xD0KBuoMkalEUwAlWtPBShtFz08Ofv771T5GvBJ+Ja5cQCAihjXsdjZ9SKEXWuhoI3NgT7/zBS6Rx4Z4BXCim/vWnyGH7kS94GZNIfM94zSZsNl8bLrkK8qZW44N3At160D2VtC4/WyO/SFPsPsRDOqGqMCK/CHZDXJIzAG5Q2kWL5eg8BlyMNQ0IkIBXey4TJWGENQ1Z8iUecmSEHPLHHkXD+6sx7w6K8tqvr4dg9d9u7k4uEP8yueKMpykI4fxzFwhbivl+Io22RavCVBP8CxD/yegSRCOuOsU4Azg9BcKda1WbLEFpDhTrPkKO+HIF2swSoLxIj8ESrvKeTTJkGEqNEpRgYtuwW96o4LbpHeTHkZIPmcUZAZQsejAfqB+IUQfJ01ysI8Hxqz48UMEjhq55fFfTfvRxCU19f3/Ub0bcEgFlggmx1AeFw8SUDwJwImwtRpDjoQen+L56IfQXM+hKImSSaH1l5V/Ge3+OfWoB99hL6UHIEuiqwXKnMYuGCjhuvCwyDcrqhaku67CfLmZWudyMJBQJsjke9mHFzD3+oO6dauV+xSLqA1637W1TXJxk08/Dcwn5RCcRQc3WyLzYnbPihm5CCSyzQfg+6zTYRUSNvxcmeO+LQi0RmPo4hIVKGZ17E/Fs9HqRiBUlK6LVM3R588k8mtl9gH0vhZdPdsVnEcoNOo93+CKA8GzJhW1OjM4738W6nJiM22FRmsi/Dtwy1OcbeD1bKEzQtx539Bv2oXDjXuVQB6D/Xr7jJAGEY24AY9oy+UFibNarbffduLpp4sHVqLY/Wjh7j1a/lLhFpmqm+pMe59oa1PqPo/+8BItMT2OtkQqymJmMSjrHsL9nJgNcjx1Rjb4XfVyFDKJBUoAflPym+ge+/tHHp9Z9MhjdiYExf/HdMKyiImnzPDrW35dnT5odgNlZNOPeyRDFecWKbJwx9qvTk2kV9EWOHkUWUuLp2rMgG1BbFup2mmIOrLB3kY5BSrgEiswZB8yLwe1L7ToEiVosdEqpz+3J6T3H9tcfM+I73vwcMxYoILmcjrLeHqnIUmW1hDswjt6evEzdImXbxSO54NpmOtejQDnFA7WQFyxqX+O+D3iJvv1NoqWztPRNXb3+syyvLEzzT8pZKx/jhRPpv83VMXwm2XJMAe5DyW4VIcdSCH1aVCzgRLmjIzs3pLHuoB2DhCMhKHDcUeE5lWdtheIX5t8WrnXPbyALxhSZ6SeMwdOfQHl67NciW9rkPHX131vseQdOTmpBDmXxAeJHVWZJbUBS2+QBfUX8PDvmJxD84bgU4HiCkiApPcwN/RKGNH6h2b2dfg1XGTR0Ws88iscCFeUCo0WmxCi/Q2KQMhj/7QW16XRDLeSTYshOnmGRLASGKdnd1vjJ3gjSxOnnGztKwTKXuvzmSVkDypL+Id2k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b592abd-0edc-4e31-3a6c-08dce1ba30fa X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:38.2481 (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: IcIbdnhzf+aoiDZw90q5lBRvc3d73hh3yMnvwBcPNkFiykVSazNbtKaQqDe3Pnx85s0x8RztuF+9vXSPIZATeD4PWVjMRYRMWMecwYtlvSkVLku3Vwz6iGKjEV1xSGRy X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 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 80c0a1a95654..93eba4fd2771 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 a31aa471a1c2..4dd9591ee98b 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 c8522e2430f8..426ce37105ae 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 430c070a1a0e..cb6d54db7189 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 7e6c8d9c900b..4556f105c793 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 8d550e82b46a..6570209c1a63 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 fdef5a008daf..6f25e66344b7 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 082f311d8b84..ad18c4e9a670 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 6ea9058fdb2a..bf902540744c 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 9fcce86c6eb4..4b6c02a40204 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 f157f2d19efb..e40563ca99fd 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 1e85242c8dd2..94fce07c83f9 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 cfa146b6cf08..30588d9e9ba3 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 44f857e90969..b456b9d14665 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 0dcc6392a0cc..335960cfd7ba 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 63bbfc30f35e..cfef00462f66 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 Tue Oct 1 01:41: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: 13817318 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011068.outbound.protection.outlook.com [40.107.74.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3074311713 for ; Tue, 1 Oct 2024 01:41:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746907; cv=fail; b=i2zlw2XhYSaSt/lWvR4qn0lVi4xboeKz0WA3uY/GTrldAuMoiWHq7zBVkszQupNOkCZhiBbzAAKSYfPCOyKGzqByRTaNd/537+7RkHbQPWmMlL/IIF5sSlhMS0NTt9zc4/VaC6int4KvnEE/2XPi1OgxfVfN6aV63BOMSRSCrB0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746907; c=relaxed/simple; bh=+KIvJZbiuxT+XDabxO78gQfFLnNNuo6vxDr85Oka1/c=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=VAa1jGrKpz1XsjkJ9ZKErWZHCAblB1yfRN6eEen8Rz1/gJY+HKVYWFphfd61WY1dr+yOAX3dYa/MdW8GnbHmrHOigQq8pjE1t0L0lAfweiEQnDXtoKpf+KKxQCJdRjaccw5Oc6333jm2TpsoAvYnhZDwn8vnWdZLjyvPTaOTK7o= 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=Nlufazzp; arc=fail smtp.client-ip=40.107.74.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Nlufazzp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OzzkKF6HuSMhUUOmHYKNmUnTRN2YvqDTIAfvtg8cdPVJlo3Bk+5bJNbKEM6cr8tHXq2Br8yc0ZuKJpI/aatpuC6xYtaM2b/8P6ecmLrj9I7y+pgrh+hUlZLwmOWFPcl/Qb03iOBtOmAWTn6G9Sjlp4/GnDef0dJDLGTeaMcnPxwRA+W5RUUW6vluvmHuXWDrUAphlgZQhIdPBFe/38pC2A/sqQGFBSvHFamuFexN7jCdJ6JzaA06uciny4mEkZVttxrwIHLWDtQC/Ycm8LDPqckmTY9v7ZBlAXx/3nxKiAjEmaw3chOStQ58x2BVm/B3YFfgODlyx8ZwA1GSZ3db2A== 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=CL3dhQsYj1QBU5i58qDzMRz7pQ0VE208LyD6uWHe3l0=; b=ctLuV1sJdHIRpfFfI58MzpqaEMN8iLt/elKwctmZHNkuR7D0vAWacryd53RCzrylLUL+jh3CtMqSToQLHkXy1+XzuMP1xBaoSYkEeJio/lTvmZL00k9Lx9LY+Cf6xmnEz5xMLbwRvps9PHQ888yW7pA3JQ34q6V9nhEHW0jAeGStnUgc7FCvAbMkUV+zTNoY/CG/PBG+g/LnVpibeMXFXEjR43K7Qr+Qvz403RDuhxwnstsq3RP68Mpgu3LFBnPFE/IXs+FR/Xl3vA2SbMa5edzX2D10BVysj0cjF7NstUoSgYoZn1i4IGhUDrZHjVhYN6P0/orMPncPsPYanET+Xw== 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=CL3dhQsYj1QBU5i58qDzMRz7pQ0VE208LyD6uWHe3l0=; b=Nlufazzphh+iFwmfgXqgr/C/DEwzyc1OQm6Adt7LjMrdhUHxY3p+E5jJjUP5dBh5Oj6qQHu/D1yp38R25mGQYghwSS5tjSi2ucgwJLepltcodcohG07NSaK9+7r6nd12OfKM92xEQ02U4r9oiuIfkQguTQDEFEOB2RucWpeWaoE= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41:44 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:41:44 +0000 Message-ID: <87r090vbu0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:43 +0000 X-ClientProxiedBy: TYCP286CA0030.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d8879d1-10bf-4019-e7d1-08dce1ba3473 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: ZyZ+6TtYzP3ylfgevb9RqajfhziaGRLQsTU0UpjM0yREFUclhWoXAFFiLgswTTeFiSi2NL0lgoZdlT7X+EPy0XjzZOfaZ6Hq8qNvPfXG4QnIyCgEe3f5YDu42a5hubZBCi0jixB0EHqaR8PbyDGvZhhEgq/1Sp7hBF4ohcDC2Ewv/WokGfoOZPaTj/HgsIERmm9rU0LuAv0dWdUd3PKvQU4SEzWNvD66BHECYibGysxYKIRsb1G3s7uNBqoD/yHrepn6XHBBlTpX65t5uxZh7/YjgayyqhZd/HG/gr6Z6AIHDKoLMzV1TXzpUiVyVuFDyf2+rVyuPqSJO/dz6B+71jjfh/A2/Vfqg57nwuzubl3XLh6jSO+egMN3mLQgRDbBkliaK5Pir3H6nPGZcPdCDW6sQvHJYEdYVjb2nLiJDSmO8Cq5ewTPKWn5WW6y/73ueabmmMPx4wD3whwkjx6UEiPvQJk3xWV+jiEvGNHifga1UhlP3PN6te9H844F+GWXoK8VzN1QOAecLJvJkCfsSdqfeWM8+cXy/oJOxgc6g8zZD8hDt90vdMSjpacezZfyBaH59wI1GDiowo8y1D3fT2gSctF3Ujcw8T+V2sxuEnRZ+YdOniZMyfCY8BHWqcmYLpJqM6VKvEr6oRVQe6y4Rcy5xC61KRO06pgAsg8D67E3B/4agKJqSoIo+s03QjskhGEKAHHMe0PdQp9MZwusGmTQbx2vG+imk9uqwJV7DC8vzhv1wLF2No0+Si5qwPwQcfvbKBAtjud2BsY6qpF1HES+pzC2JTCr5569BtHd4/Lx1JF0iaX1vg1tZUgZ/Xxt65clYdYOC4+DH3aNe+CPe7Gh46LREffaNcRyjMtJoo2QZ48Ny8B9Ju6wfAwU06Nx3Q/4u3RmnqtB6a6mT/WqWh6UIhIVPvAc+3VsmbKfHcoj+/AdQCnPsXTFi2C3HQmBcU69KdoddzXEksJqpAo+zxVgX/jfsG7noGdkNnANtJL+9oQvns2g/wioynFBrLdVmF28/wJDZ5vxn20S/r+elzQq4+WkfLRHaqn6LdxIJjQr+rSqPjDwaiIb45U+3m5vJPMEl5prYJ2akLXax7G0GbUKkuP+9n2QCFnJwiVGmHHz9ws28q8ll3Vb/ig7kCwfCEFCxBrIVoFOnKIMl13u91UDopeygdCuoCBkR/7qSPLKuV3L1JvSEHVwPKgYAFWiXPfYNPdaCoeNophNDUIozAnO3r17/kRvK7dle++EVsiM3r8dte/eDIvaoJtNDzh6mwKERV6eGEC8CcE1EgI7P1F0jy4p395Hy6jN2CckeYvg932QxWF47U8CPY91zOsAQlzfhQojxfvAyCRHXf7Eig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8nH+bWY+mCmhtqtW7g+kLKZsF9GQ7rCZVfYOBQ3NIPhzMTAJRPe13y6cpojPgiUrCenkG3wAXZO3y4+Su3kSRQGwYGoVtTLBqBwpPNWJBhrMNt/nb/JDSY5n3QqFiXl5BHtE38Qv0zseWLBr1z45kdjEbI//5Q6rKviXMhTy7CMKevo38tgohng3wxv7tjBt/Nj2j6Ew5X8HPiwAYBwtv7iS6bvsj8XViOmaQB9x5tJ+oYjPF0XXDCo5l/FAqo9m1BjHW4aEo6BB1RCnEfZ9IvlIPwSvtOp3oiy8rpiMLgiFp6G96YYAtBwv5N/OReAz3F3lgQhpfNLH/Y3doE9MlkEQI6JJwHS10YgBLzB0SKmpOUOAW1l+ikbiUB9ppaa8BJt443dDjZ3Zex2WS+Qb8MIcJ51ClPjvTtZf1WmpAXPIF39Mx5w6cd+SPoZO5hOPla7MHh3myCmCubg+369fArTjmsWyWhh5GxE1chaTGgkTubblVy14QvE1XvI69CBKNJ6QJf9WX1ByFf8u2Ju+foEv7iS71tSv5uwcUr6/aET1C4wyVrYy5FftsCfRNpfkR3l9R2/bNbAIy+fgRXx2oUxcKWjo2bgYKXJJHnX4f/k48hl04qOUVNpM1pcVgQneUBvMqoIMB4xxMUHMwn9ru1zfa7g9SAy0nGHGW9zR0O/SouqHjFohL3cTqeK75vMe6X/UyDprJYWNpwr1pLVolWAVpEwAQ5cHIVqNfgakEUdGIpxOF24qm+wyfHP6M9MOIJYGSFZDb/qXX7vDl2WjW3UoZ3Vgz8H6BbQgBNsayTsyMk0mvEqAkwS6AJKowr3AOt3bAg5AcLjUwtdj7eyPUmXO/Tn1sSkn3SRJd6NKNejVxSpi3YLPfT5IGmPbgqbq1aElNcIrT5m6qR8XUhk3clhaxxCDsvHZxpbIprJZX9sH0/thdZnnzU0pC+wyNNTGq/2DAQi6nPQG/ieAsYrsLJwDmeabhBxsg5vjAm/B2uRlYOdXC9cYn5nWzMJXM8Sb16AjzQoiGKeVRM4F1uPc+qSnSxxOKVeLsqrvkOXbnIbigEBCyRI4t+S124/cjSPn0lj99sS8dYGFTzHtiKgdvAFthfDu63/sImQ1FTJZq5CROdCI6YHA9qr3RZg6MzC0tQWaWLWNnpaHB/9APMcmfcQEMSq1Bsp4gl49nLQW/sV0vhnd6l2n2bE6lQMH4Iz0c7i6PTRQArWMWwAJpmZX8IfySMOqqeIIkHmpQNR0ragQvkHqo7S+OpulnCb7fLtWTlK6zW5U8trwxfCuhlTcnCqgNzVAug4/mT4fgINaCNxrvssXlwKpLVYsZ7G0JbT6QsDtwg3nUOFpsT5PNdIKi7c+ZPDHFK1grHcabN+4spYkbUp//okn1rz3KDF7ZRsIAXhA1JmhCq+3/p13YwnBZpULC/1aBbvwdxdRIn+J1hzAKSaQtjsTprSbtobUaw2/VEUOoWCp2plEyL1UpgiUHi3xKVqLVo2qxd8JNtAtRJfaX77roiR/GBvLihWFuEVvmS3OB4GIqJI+1fHjOsATaCWFREwc5dWEjQ5rJHmoI3TByxFEp4+rGqZoBfcq49qgKevW0OCDoo7ps4o7JyyWhPi6qY6sbY4SUGQZ1m5BYok= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d8879d1-10bf-4019-e7d1-08dce1ba3473 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:44.0693 (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: SdX2CBW8YpAGnJgr+3CMGa1UEFWTILp4noR70pzgbcjsK10AQiMvcTSK7nHnk8uiZZvhUN+QcNgD5SxAaHiIceHgKtJi2VeGs+5kr0NDHiirjwYpwqVxWgKmIzj3peov X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto --- sound/soc/samsung/odroid.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index ed865cc07e2e..20e17d061030 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -171,14 +171,14 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Primary", .stream_name = "Primary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(primary), }, { /* BE <-> CODECs link */ .name = "I2S Mixer", .ops = &odroid_card_be_ops, .no_pcm = 1, - .dpcm_playback = 1, + .playback_only = 1, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAILINK_REG(mixer), @@ -189,7 +189,7 @@ static struct snd_soc_dai_link odroid_card_dais[] = { .name = "Secondary", .stream_name = "Secondary", .dynamic = 1, - .dpcm_playback = 1, + .playback_only = 1, SND_SOC_DAILINK_REG(secondary), } }; @@ -278,8 +278,8 @@ static int odroid_audio_probe(struct platform_device *pdev) /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { - card->dai_link[0].dpcm_capture = 1; - card->dai_link[1].dpcm_capture = 1; + card->dai_link[0].playback_only = 0; + card->dai_link[1].playback_only = 0; } priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); From patchwork Tue Oct 1 01:41:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817319 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010026.outbound.protection.outlook.com [52.101.228.26]) (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 65EA911713 for ; Tue, 1 Oct 2024 01:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.26 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746915; cv=fail; b=deGErU6wZIlOUCAMrNGXl1y0sM9x85l9EepMM5ePO8ojFqdaZZ+vkOeVFwAu0gwuKUZrPXLheda8MvMcRYjOuxS93wo0L7+CWHmd0bf/uk36gTzO6HBvsAmSxFPUhNwl7efyNyrAuPoTL1OYcVzpl6FtfRNUNlDTrQbB9hPQnEo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746915; c=relaxed/simple; bh=zC8PRDhDn5am/I7Mqp1nOL8B/c6mn+oC21gaPO1OYnI=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=IacNKguFqKu9kyvAHbzptY903pyJRAupX5rnmiJXHAockq6oOD+dY959+XyS0p6EEsuyPRMzT3NLBvspMDnWGRGPjvOM02HwYQUWgeYjM6KB02dXc3kgS8ouqRRDwSzGLtr6Xo7RIDPNPQg19pbLVY1hEtCUAdsoLuuzPoYS+qA= 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=Rq7ZqsV/; arc=fail smtp.client-ip=52.101.228.26 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="Rq7ZqsV/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TAW+BwFKd15c4MEWSUIZ7QvtzxzrMg4GQhUSr+zRcYXjXwWrzJ1MveKuqwxQI3gdmiNIEkcEf5JtdAyd4AEJwnSzoeOaMA6s3ImYmS1Km28aE6FUYmBt8u5Ico9TVCJChIocsbVRNvc5Ox659gBcYdeZc92xOOJeONw6BFobRLYvHSmLntoqKTbB7N6yh/ipgcE7g7nY3jlgFnOmfcPomsipqlmyanYQwJct+2czNXIn5GEX2tWR8eoUlwMftpq4pA/o/w0gTIrvh03Gm8/J+M025NsNPSXfoa7l2b8tUlwnnYxdC5ELMQ20jFDL5UrY32kFit3KHYtEDVzKMpulwg== 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=UgEtWOGDo6z33jNHh9JZ+ZPDsC2se0IcflZG44j7KYk=; b=SLgmq7ttapYIf5igUTrBccFhs4D+TYkJPDTUkjfxaG5hJtoGnCJvQhDk0xrAJDI2mMUaWVW+qEVGJtmUk85vu1xl1N5OzmCHwuGC3pGzhA39G/NnPhS7fD2faf7btQpfWT3dLXdJ0N0wigZRg85MrpMd3paIrZNb5rekVa6blIC1iupIJ5nH6QqyZzL3ImBaQNuE08o6MfiaJ4SCe7PlF6MPswnsteU9zIVtT8P6PlcTQSX5B9+t/H2or+E0yTiynNIC832l/UjNif5f9WIIRbZHQeBeGrBc7+KVvRze7qgJ9ZyjnmLKglhzcoNhweYY0GSDGYGst8T/LGADt2x/SQ== 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=UgEtWOGDo6z33jNHh9JZ+ZPDsC2se0IcflZG44j7KYk=; b=Rq7ZqsV/KRc9NJ6tK6/PNsyA3Q91EcyLv/L8uKVLrEwPD+LnHUmEbaCxPpmeMIN05zcwTNOEUijaKI4CNoKTqUa7fHvv7a0rauYUZ8uWrbx8rSJgZuWqcHVbQ1PGw1p48JIEQcGXmtKBT6e7/Zsu+ajQd+waHLnkIzJg8BlPLbA= 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 OSCPR01MB13482.jpnprd01.prod.outlook.com (2603:1096:604:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41:49 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:41:48 +0000 Message-ID: <87plokvbtv.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:48 +0000 X-ClientProxiedBy: TYCP286CA0120.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSCPR01MB13482:EE_ X-MS-Office365-Filtering-Correlation-Id: e8d865c8-f90d-4765-29e5-08dce1ba374a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: DsPGTU4krSHSlzxMiYfm/iUM8PGkCj8oEwGzw2/cVWmZEXSNuXJo3LBBmDZAfwRuQ5BAdLvpn/SqU4YocrlEM1lxh5aRYIsgYEGy+/gsx/56M72WgR3yAYvFxeytZaw8FaHZ8muNkQHEL/fZgsNGwuC0fqlKnKRJzTrnFtQvVWES67GEICH2t90gboPwzrs7z7XR6XVzgpc2v4LQ/jyQY9+aOgVDfo0/22CsI2LenW455YY1/5aa5//HZk14l5qXPfqy7Rv4Kyv0FCK7m9RSEDzWo+uyZIkNssBJK3qfaLQNeW/AjLhJ8Pz1Z6Wgz08h5TMYsyzHDZxoXbMzF9yXS2/u+Lzh1lez6HRdLCBHNCyepg9au2dOSvtydvI1rHaaqcgOuGRE5FgkiLNSJtEN4Ukc2IZ7g3rLwJmJlKg0r7BPd17pWv+pyxJBce4Ie4+GGZMjk/ZVU0eZj+19VCEualYMYPiZyjggfUH243jwN9iqhhJFX1Xvmo6JjtPX+FZmUQFx6RNIirC/NyWAmiD4IC5COUDGU/7auoa7U0qeFQvoh38PxBl5B3gyB+u2LX1ihsioq/KVOysFpIOvV+QohJuJOgtJX1AyROVluIGK8xmFxkeofEP8VsaLR4Ttm3fFqHbUcO1BU1crW49hp3Hypik8HjLg0GMca143rRa8vZhijB6K+V7+cy8nSSyVQu4i2DJjrq2bxizaE/46c4DMwWAs1hzsrbN6GXaN1k3/wzKx5RUcMSdV44s3fiHfZAZ+0WppkDilha4yS6vBdwdY0keDRgA5N0ZkfDGfJxX6h+5n6NDiIzssIzS4v7QMJBkge0Q2xUDg9+axk4np0/+wBGplgonr9jJpq2jvhnMRg/C35kZPXDiWbIgvYvsP2zhn+6xs7/JU3G0f+hSX6jGsnG1L7YCopGYINAwRYuFDMA8pW7LvupXQspcGXX/8W8GuXixWNWwuSCMuM/Ex/PfJgJFoqEFHX2jJUkmO0JHYI45Er0a6MkBzt+k+hK2w4b+furBcizxglM/IR1PV7IOJ4U0xJlC5IjxHY7k008A2Gc+msUDY5+83hXZlnPFkp1WEcJ8Ssnue7O3nkF/LENyxbgBvsBPK54ZeUZTnBf6iLI65NFLHoBL+Af6ULkBIPBAyS7dJmWP+UylL/g/QGK8QaaDXGkXEeY/qVpuII6n5i0f11r7BMeHhpQyPzqUu8y3kI2NTeC1gTc4z95230AVnOY7VBZeoe6q+gnZJXeer0bMsbNHjo7v4RtqgvnMrkoeHRkKG5WxkkrePAHwLT0FWbP1A4zeKwwVt3ahMdPXRXvc4/jTqBOWiqLuy3+U09M0nsJg5xx9ImObPZhBzJQtLuw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AdeJj4atmITglbgkNGRGFcSSuCETTw5PEWwADab1PNMsIvcIsuoS27gDsv0FVckPnE3/8k1LGC03gzcoeblkqFGLY6EsqTk08Vha8x0jxydNHsB3w+Lxg5E5dd6N8/y1opyM7p/35y5qnG4v20OpgFUgik9CZvu2BcB2OyX/VNSeaVV2iIb4mLtGESvrZoGom10CzvhfnKY9QVbjtVwRxUcV7lPQjCnuzomX5fkgIuyEn6sOjVBqjbEEVfie6X92h17ErXtUls0eTIbHgHaMMhO1vW0nEeDM7XiL+W9u6Ofgtk0vlcAZv3iWvyERAYxznofZ1YXwOsZ1hxlLS5PM3FMhqxHtSdG5QSpUBuVbxckpVpcraQNynS0Mu9FZjl3BfhNCmEMS9bbQGY2jFjqoCA5heXt7r6nqdlGOUzhJUKijlhh3s/j3HKRDz1CsKuLMnYOM2Ua8BFUA9fZ4tPZhvUrI4sfqmu9ArDmeNZ2e3XxRKVwlFUvETJqUV4O5RizUvFPCKsifr1TEQWFmKq4l+DviGMMej115CRlWfpG1hDQeikXxfWbEHM2oV3Mbzemuwym42mH0zJUKnowkyJEIiVkB3X3opbI2fsXUtGWN1nvryFNUy1Udwk95UBm227tajOGywLsunXlkXILF7HKBK7w8fUV5cNFRlVsHA3Hr3I/XHHPGXSygsvDFYcef8+MYSvcPDHVzX00YDKsEksR3ChZlCGPgq72uLmbUYhdPSxVXMIJLwzVRVJWLT1eGtSTaV7qzDoVk3yAFxG80GAMWoZlh88xE31ql2xr6dVizQNMN3UFuIEQebdS1IJaCD90b0ZCOKONCka5O4N6w8dw7yFHL380DZwTO+ZVr6zlg4J8omKwGifRq32kCBbSTc4/NEuoO8YUgLAd0Y48u59SOnjb7K9zeJ2kir2jre5BvUz462AtKmCVkuT5qq1lmdfxs9bdwjUMBsX0RHnqJfLl4JKJxh1lNYkp48VDjXNDPHkFJ3SOgjuRkJIMo/1RR4Dg7UsqnI6ij+HPfWAUdLo4hs36N6bkGhuJmeLJHtgcj1ut6xqfy81SOWdn8APgA8awThORocMjWDLxibCO5ZMadVYvuDTkScTzP8crU30YeRkb35xUbU8aSSfcdzhio+GYqTcnCTDYQSPMJqbm2hVXKhZxnWmB3Fg9I6vkLJBEfNp8W1jzQdI8XVo6EJJgyB5W9NIPWn9h36sgttBNC8AKfYD2rytUXdyGI+AxBbwmb/UmZX3gV/o1ne1U1xaqa6yBvfEtonA1krHLWU8FbKhHur0oxu1idnbGsYQoFElwEXM1hWYxSr7O08/9jw04Euyv7GKY3py6JVm731VdDRDiV8e7l2cG1vkPFSICtYi9pZ5IGUoxaWpUDuL2UPs2cKy1NrUJNKVKrFUe9RqudMpr/IHheYiDcaDYKNZrNNxZUffwcz360LRKDlgKDCIeDajvjwySQSUO12J0CxVLvqGTNuAkPunrQdcv+O7vTchW3QJOUlasn7bymxMbENM6pfasDD9zdkCmvRDIyz9Dyq3oJW/CfqF/IMlIxX4lezKyQarqAgq5SMZQcOUBuFvNhKqjAc56JNZrNZMwUS6Rzz17Uddi5wEwhYlVGwS2LaNmaI9w= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8d865c8-f90d-4765-29e5-08dce1ba374a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:48.9318 (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: XPYVzQtmnjjZLYMIQHWIBNfoovfqIuI6kca4RdzWWnKdAe53scORUD8velIJNoMOBrBNnbpKwfa9wE9LYDbHrDQrSmIvBgo9SAeL2X6qvrM96NW45IgvIr513FoQXJKG X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSCPR01MB13482 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 4974b0536b7b..00a79867235d 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 8a6643bfe830..2814f0570928 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 784c201b8fd4..daad9544a8d4 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 6982e833421d..c3d1e2eeb0e5 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 0557a287c641..0724564cee6a 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 4ed06c269065..d8e4e70d834c 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 763067c21153..488f2314dbf7 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 466f176f8e94..59c19fdd8675 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 f848e14b091a..1d8881e0a361 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 bb6df056a878..6267c8554c15 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 771d53611c2a..a5ef913743d4 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 08ae962afeb9..84abdba9ddb6 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 db00704e206d..1aba9c75594e 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 2832ef78eaed..56b9d2433a1e 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 42cbdfdfadb5..d398e83ea052 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 Tue Oct 1 01:41:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817320 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011017.outbound.protection.outlook.com [40.107.74.17]) (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 0BC0311713 for ; Tue, 1 Oct 2024 01:41:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.17 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746919; cv=fail; b=c2G0xKAzXeE58wyNgUubMHN0/zc1lNOuw7Uwt5ajv/LhgBP6MwLj08GjmixvGD+cJqOKlrOj7ytyKsXp2zgWcQHFc/lbaDyVhKip6SLU/3k7twyiJIoQQWbZnVpuIDr88P/7IfD9erKRiT4PgTgjcF6Ws22ou52OkTgCJHi4kfk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746919; c=relaxed/simple; bh=qCfCXvPoqfEdNxYr0N3JyHNuwKb5ICKifWL792VqKGI=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=ZsE7SxTpL7F0pxIvO6NIWHRADJps+PQGdrSmjYS2SGAnV4clC9qMOmFI96Pbts6yEYrmpVJql+8aWqhtkehgcRavsYx3+uq68Qm7x9qk48+7cEiZv5Dlf46u+eeJ2zeVp0C9I9ENMPvMpReHTx7rwFt5c/MdyRqzUGpP5pytiOE= 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=Qt+DZnqX; arc=fail smtp.client-ip=40.107.74.17 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="Qt+DZnqX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P4SGesKtMVN7G/0TPTA8grtT40fF7UlGCxOvUgKEWzL5REuiCtDl9QvKB3odun8kTf8UETC5ywMqVIjMk1JOmmnpe7hkq41MdzXPEyv7Y9ufMhs133Ujt83zlF6qoRmQ3H0NugKvAverEEt0QQ7/qFPjEBHSRA1OH0BogWJ7nLX8Bsgy/JKNysfBd3jlCxTQSJllv5PhSzvb974bUZzVIg/pDnkE5ZXJkaJbwQby1EzUcHP1UJUlsrJVLa6cITqpF0EQxXCPBHhL7yKH5Ev9k1CrixU4w6DnhlGuAW1z6vZ78/fFNyQA+0Gg2poudLBR9Ru4M09hMpJMOy4vEBSyNg== 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=MIMtZcbJyIvp0ryPHe93khfXsSDbpFECSAB0hX6kAxQ=; b=D3BH5YD8P9Iln7qNVSqdpB1SZgckmDxG0HG4V8ucg8pQpk3KhwrVb3LxIuT34xQUEJUziQYTrm54/44T2D3GA+aepr8M+wZmnFMMbcNvOnibhkFKPacND3tRRZnZ9xhYef8s9RBzJhnTmuyoAqck/ftxqxj82Xv2ODvfEbdGzvuSWOSEThUTef30HbBRBEcFsCQLPR4Vmt+vY1CqslK9UCyA1r+WMFBud+XK6fRCatlxz9Y4qtMkgRutEVNfQ6+Omj/ifyp61oCDwkRpwUSzr2wMwmYZ4XMQjnLeBHw62Oc4BOdkK9WYaXRAGeNLLwMkNlod7BeabUtK2/tOk2ZoqQ== 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=MIMtZcbJyIvp0ryPHe93khfXsSDbpFECSAB0hX6kAxQ=; b=Qt+DZnqXAL76HTzF++XUhwG9WamIPr98SSxxOsrvnRtULRwYq4eK/BBhc3c0mdKgzI5JS9OnUCmylbZ6ZLQIm8M3ObKNqIDgYabpfk7tjVxeQfxtuoMY9PcHzUDxPJHIh4eptwu/CVBv3F+K64CTGsK7j1//jQDL12/UuAi4zBI= 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 OSZPR01MB7132.jpnprd01.prod.outlook.com (2603:1096:604:11a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41: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.8005.026; Tue, 1 Oct 2024 01:41:55 +0000 Message-ID: <87o744vbtp.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:54 +0000 X-ClientProxiedBy: TYCP286CA0113.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::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_|OSZPR01MB7132:EE_ X-MS-Office365-Filtering-Correlation-Id: e5096ebc-ce5a-4204-2756-08dce1ba3af8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: 14yryLGpeYJEJPkLSX7deTaAMcQtpPOBsVqHEqO+G9n1jf+fCso/d70FOdYFMnsOFQDsyfwsC5vRt5Y/D38pM0ACZbeV+JePwqjelhGCqDZTFMVU6c/PLjvMLrcdIlRJFA20lsnyoU3Fwu5jKUFju7oSOKfdmuq7H8SpzQLbwa6Jwdt2C0VrAAC8+TSmYvMqIGn9n5K3nASeFqHLWFqXsm1XiDG9f+buwcqv6v8qGYNCI/cw+md880NVQdkowH0B+ZUPi0farpqXsCtiNOILs2CDn6eyRH2iDXhhUkjfiZA8llOLE08bDqyAcn0N8VzquYnQK/dEBolYKRUmB4Z5HDhVOj7SZyctc2yYwwb62nnevy9f0msJ1AQ/V1iwt3E5o3TF5dz3Mc1DvyMuafpmHx92kGck68f1QLVysvbn7wp4r62tBSsnYl9G3l0KFRyNccqmUC1d9EX3snYISI3a66LnOA4VRC8Ar60y/27Bc0bl2XuA7j6ebExCRI0eLkAqe0Dh2lbc6XFLTI1KBciKqLa6I9uneXly1G7vuU7NrvNuhLiLpougFiqA4fwDNP/INpcg38xetEpWQNjEAMhDcu6w2F/uOv+uUw3MEHAVRqoMTM8X4bbibQ8ueNJzgOb6Dxn4SDzkQIqiNrKb5Dd3Q+WUxf2xx0uTutjac+hvbz3L+QRGXSu57UyO9r6RnqXbZQGuOnZgyHemhlTnz1x09QGTArp4U0Ydmb5Z1OTl7n2vEi645pl+fIRk11JeRGEZ5zAl01D+pBLHGcvWuYKU+IsBK+JZ+ZFmN6yCgV/s+cXnM65I/19n2iVfYJTeGqvTSXlffA2CTUctkkzmg+AVfTwlDE/Frqe9Rz5ACgMZ5/ZY4MzmqPkR1WHAJ5bNc8tK8mFCoBXG/sZ1LmmMrLzo2+xRpicCBGQYUCHn+SVyXddbcix30FG1+GVmEh2OCeAFcF0hd/7zIPG6DfzDemlPn7hzZEirvLHxMDvOlr5JOwFjHvwUs7NLF0Q1dsCQAcFHSx4iw8Ey5hMeNy9SC6foslY4TU3lifu+xPBdt2dJ7tE0xUuVIaJpl1EycwO2UP9c1APEh5RwlZy8lNuQhddOsiknjoeKoNYsDwRwzngISEdeqOzbgC9oYJkFVB7ARUpCAHhpHEM1K6bxvDkx9c3IU2Pq72nOBzHUPsGXhAb4f+tkjrjYWhi3sz+muw6+EO2p+b7MHPRC4WHBOsJrDPr71VaebdS3yFrC6cpQfQZJCNa/rf3k2bRh5j6s0D/ynAo0Fv8NQyOIfR4Co+QCyM8WMRf8rVIEBPenKlZlO0dxcwFVFFg+6FamG1JuxMxFqey062H/9g0Ul7oQIFKFheYwig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FDVQbchJwty6qtAxSvTRPvTtzdoQls8xhwxlGu9cjh9bptzyMvuZbh92I9O6h+H3xDCol1cRgyVtASFiSPKFd8vjon+oeCCEaaoO0+0f1mNwDep6X1efcOqeCKq3i11hybyMpYkw3sMbSm+eqiI2xBav6VWo0gvCfgWiMGXxc9mTDjqBybTeXd0cuS69GQugbQiGDopk6Gub/582h3Sf66nIwQLkxlzFrLytIq/g6eZYLaZKF6kkwOLAdIAhWnBZB9aJ+fYlhDqLWyzWPsxgvaJ3qyX/Riy0fQdgbLgXezKCFzHFnUokeYcOvPIGjGqFsbzCZuoMi93yEdpeTo8lwYR8+GlCBjWzpqz0ogKdidrwxmsvnAiS1qYWtLjAB6rLOZqvDOBstg+8IQ1WG9iABb4y0GZ8GddU7hTYH4iiL/Jt/LDr8D5RPo9uEgwKHw4nHumP/cx7mIU2fPrcJOUyMLYyR63PcC6DLklIiJP588bgxLG72vYZWlo8cftEf4yeDYGBgnsTDTvr5rn47NIcAA26C6E6goMF8RqVD2/dm1AONe/xLxSYCBQgWDrYIcRflsEoQB4Sr12rwSjGhtQJCBD+kqjDtwJwJCVW+LtaybboSe5k9O86okV07lolM7700OaAh8TUa9k7NbD1X/4Ct7RKggMwfuF3lLMjnqzLbJ0mti+QuzjYeWhJGE+NCLYdqixAJeHPWFUvmJivvZItTRwbqDRQMd5XySV81N1o28caQ4rDhJC/w4ShnJVpP44QPDPymGEO0T/uEUIgGakmwYG8AfIVFnF4WEM2oInVXJNcb5WVtJVnmHYpD1kdhH/jxmVM7+HwgvJUv7a5+Q2gdxVau28UAwYZTt1hl9DhxfSmLZ5s38jAatAMXkzy/8b+WcvnFxduV2PYRIelbAqEFBeYd7vhWqLsh7N6Lr6Z43kD3BUECC1B4OVouxkkj3xaufQGxE55qWuVeahpbGIMbuOg0uuHghgbfHxk/xFGgijzL9IpuZFwjceCKA9eUZ2nyatgGKZEDV1oFk228xzegZBcxNsPxNWqlMum/l9ce8N5CsJ9Mr3IKijRUyb6H5zmjEn5GPGHwVKIxX4PA/EqjNc9GqHz0aWCJZLGlxBfu7cBjPsqCi3MaMaJlSUP5xz+K2UQvZ/J7ZUFzzqLomaLLNBqQUx+NmA11EBKtoT1mUV4fibjZFTbzBEU2f3QJdejedg901crQDdp27x0vHHLGDa7+mFjgLmL9kWQKrQbdXPWDtfZ5mSzbpijlcC6FiwLmlupZJ2M+/BADZGxuvHfMCDuSLrsD9j2gxivY1PqH3somml3quNurrz78olQvc3tGP8YLcQ+xSrUzeSP0kCETnI1N/IIbcSMtI90VJbZXRqmymqhn4PM+brnXGOMAT7y2JCXP6M4pAmVJNlIb4ySbRc6tNoeiz/cJw2TlZhiWP0/FTl2EDI0Bbq0JcwqGkr0FWDSmU5Wab6UfWuVumfCDOmEiY8vXRLBX2jQngw25Gj2b0E2XOZBdnAUog8XZk7UsCF1+5X7raW6weT+gx51tpwJwOoOyVO51GVbBR7y/WXzRriesEELko3TMCoVZVbu5svgDBYlzSyoM1rUoMoDFCEaHQ+3BeFuIyd1CrdV4zU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5096ebc-ce5a-4204-2756-08dce1ba3af8 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:55.0131 (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: HZVZj7gAt67D3FuKpJccRrXXfH4NLlkRDX57KkPNb1M1InPnPYzIKt4xGIwS/0qnGvCQu+y9TP1zxea+eHxBXQkYI6tS6FOYTfoc1OdDTcICCAqX0P1KWKBDnED7nQyh X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7132 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 20248a29d167..f04b671ce33e 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 Tue Oct 1 01:41:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817321 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010050.outbound.protection.outlook.com [52.101.228.50]) (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 AAFE511713 for ; Tue, 1 Oct 2024 01:42:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746923; cv=fail; b=UnhYyLYutBpQJ9m/t4te6hbDR2VfYvriWrk73HrCZZ6MfXaKtllA0CubfK99uopfR5zSgKbpwv+jfZGebZMis/ioYt3g8wvHopUMmg8cI+PJ3YQg1OYCX18aKnciSCjuDzWMBQ2bBM8MdGOFXiXXCwL+t/7lxfL6vC111FeiuGI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746923; c=relaxed/simple; bh=3g/snjlfb2XSX2dfRWXRD6mShHGLmwed8aThlrMzShI=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=QTJeX1dsIu/lYv2lh6dpZFeRm+MFwRtWS8aV74RAHTHomjvnQTn3imGm5ZU9VUBDoXKcsN1LCXPxg8E/5l0TXbfsOVsZDpeQTgGpFW0spSVcmPT+DZ5OlqJVVKecI97yDLkpMTkbzkG57e8Ct6RLA3PjKTh3ov1buLu3ZffxaE4= 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=TeuwCRAG; arc=fail smtp.client-ip=52.101.228.50 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="TeuwCRAG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N+Uz8OKN9ugo6bxjKnKSila9XAOwnPx0QUK+eue9AxPSWKFX0VLtypEQl+zyIw0smDNKsECV3VXqEeCAwVXg889OaZZq/D3OujUo/V4iZbGqgoxB8q4mNIOSKCkpdu0exlsG37J6zj4+StRXnmxbgvSnR9XxjDT7iksCuThZX4YEMnwo0FZaHbAmKvWunjGGjCFXYezeMKW6sIwUlRJLJcdZFOATLctpiR11IlrDzyawVvVALoj6LLqEOznBdk+yA3BjKPoyfDUenrPl/D1FL+hHzkRlUOfKXww0DK5Olr88XPdPUMDhsWowOi8Y9gBJJeo4F1a4JeAw+Uk49S2guQ== 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=KV18HMbNeNn1nP68oRwggkr9QiSOvRe1aZ8FlAj5FWQ=; b=V1yCtViiHFin21Erba9zWYAAwSuSt6E4TSEeiOWZoFNAfPfqBOx7lxSgJFE4L/uq2PmFd0Xr9v2y+z+qAjwpGAW6VBTO2sC2yjh2O/nZT/Qxc7kIGSBifJwgOGTOis2T240fRD9UgI52GkHNDxVHM4w+bc1M6qcRckTJCIjkVSHFGNsumPz7JHsPXJb29ZkgQGa2Nn0mK/h67ojBQszo75YcUXZ9AaI/2p+Bdm2fErnmyUMlOCvd+2LVUVEByRCRppS/NNBeBHGWkXCCUlFeazMMCr5Yu3n7NPWU+tQjZPWtThhnF1CiEsyMYxts44Bvz+K06cSQvWejSdSUPerUUQ== 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=KV18HMbNeNn1nP68oRwggkr9QiSOvRe1aZ8FlAj5FWQ=; b=TeuwCRAGMyH3+E72lBclkbWwTlYUGmzYJWZdkhuTbKiC0o9kHG45vA/zXQ48puKm4h7lu3AC+1mAgZ0i6veiQZP3OY89bpLV4Rre7UgJNovio3SN8qMgwgO9Rh2yGDWiNzcOczt6vnAmVPkwplzQaIoA8UbmGCdAYjVJtoos0JI= 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 OSZPR01MB7132.jpnprd01.prod.outlook.com (2603:1096:604:11a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:41:59 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:41:59 +0000 Message-ID: <87msjovbtk.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:41:59 +0000 X-ClientProxiedBy: TY2PR02CA0054.apcprd02.prod.outlook.com (2603:1096:404:e2::18) 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_|OSZPR01MB7132:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b276dc4-b719-4491-6d04-08dce1ba3db7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: hk7PLn8BB/tl/w4i50wwiro7laoDaRFyxWvSR62iHJ/arTwlAyoBjJZvokzHrdtvT0JWnHI+/GkiLiMbtXb2+3AG2cM7QbYk+98IYRGfhtSVfbdOKG6oJwxeIxSmvke9zvsbAWORMOvfg0jqgy+PAHFs2bE7othkT9BHCSjPXUdfb9ppUnE9GqvXzj1D/wpu5PN8IDRaxc+QkJNZZa1Vuw40Qy5LV7oWTzZ8MDAjpzSlDD0eKlh0QnMeGDG9rs5PrQ74UhFn7hrKp+YKXq44oidDMPl+JSVBBLFxAKIYLEPInzioQ/CEFIoMcEj/btRTgSUiW7w65wXxfeDNv6EJMI9cvXckdT8K9vRPiP2shLTvjrKS1Vc7CnDIQnuD4iNsxJhazCrXGkk6VADGImoCFPiIOUyYV8fWAD/fYOOkxFeGI+C+UGnrGWxQphN2T0jyoUJ59ErAL120HEylSPMqBgNZgTUYUi0Uux+Wxg4PeSn4yRJvfTPxZsO6JNeD/VZ9vQXVaCoR9MiCmT8Qo850GFWKS3vZlIi8ehljqDuG/yGdnWACuL+rqSJRLlg6UdvoClnrS7ERqWOvBphTKMExlo/Qw8nblW8SFRsuTsbkPapLAJfK6O4ZXDu2hyEt0j0jp5xX4BU+LdX0eha/+FOZAXcR7plfa7Ubad9YF4Pl00vKk8OEpsLftcUYR0O9O7YLqIJy3IjraeZ3QyNSRTjt1rnlzz5j70RTZTIRUVJcgx1dc/tS1vOj3PdrKRX8kctGB4OKVxLSrEIkJfutrO+UgPi22YuF/0GL+rn0HCT1LNkWG9/QP7tD9RgAljebco6S8qPD0G+c//UWpggEC8ZzDpL+Ex8rWteU8X645V/xk4uLiGpq6l/ZZzXTPyaPhKxTdyvq/dEdYOjHEe3cKeXq/DGeWLVWKo2TirrzLMWrzv5iKofWmrHZzOJ9ITbdNwbz3d96/XTC2vdElUW3ZjK025c6hSH6i2dFdvUHk7/oEj7b3tOeu/+b2ZtGqC0AziE28G21rHpGuEp/yJk37lHwDnjjA13uWx2Psd+SeU0lwOD6sNrPBdCC877tikag6us4+4x9ZpP/DIJvu10NQbmxI9lqbQoh4h17xB6vDUmAYfZQMGeijN5EJnbcdI/0xnjF2A5IOJCUH6lzeKp3xKgMFy4/4WNuThVsN9wNeoIEHYZAh15md4ynDsK5NUQgAUSpTZL/PJisDjKlonvbUi+elHc5wTmWjqJsYc038XhAzvvDDORNhHRekGwLGbS6XJHxU3pWW8ubKDwG5Ls/9uEgZ1+fZoyd1P7LbkscEHONw26fnpGydkzzwUP4i1ph51vVe1JTXmfapNiiEVIHzjOw1Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Huh41zOQIQ+64SHZD3wy9suF3L/5LGLSP5vcHqHU4RH4GsAPCk42ZpmcL68uvP5PQDfiKtSo09lP81mk+pd0AEpN213YUZNGiO/+x7ixiJIYO+UEg3Alj8DBEKkLdBRhtj3pBBFtrYaNkr31eApHK+aVbh2J7SjJJmLagIJdSIh98E5NA1lh2zA9FAfxnSbam0HICZ3jYkQJqnTcLFzDzXduud0JSxkJ7carIa8R6udMbeGPEu9zTesY1iiiaXhud1NOhR0D7KcmXS+AvWCOY36LCk8zRpOxrc6rKa2TRc1T2jtRK48O90ijCe8BU7VkAG0seYOHjIQVz8o4Xzd7575jvmZLvZgLaCTL2FXElkeSmfJCIyHrYcIl0zHX7+V1dxdErMPMvhvE3wXCblw8lo8d3n/1F/z/z06jK81wbEK5YY6RXBWtRVa1byq9IbdAOenZFVZZR+iw+4QCXDq+TNRNnfK3xNtFcHr9+9xSMX9feDIvFKokhqWCLTNesOzNbratrC2pO4BqSkU9TUFkB7F72S8NLDzsBt41FSKewvnHLb8FR3uD1F8RIBRdxMYaPBIrOE6/StDyY0adf++iykfVWD0zm/h287aG1ZIHAcrabfm65Fisvf4o5jDLoudG6+vCdIZwQaABDgYJNkx3dCOk4+dduwwzJ1nDxL2W8GPEqMJmOkjszjalx7EnBB4uwxO3R7RSQ4JU3a977rqsb2Ky6wsljBzr/+d3gpUDDGuiljv+SDhuzrXMck8dUKC50064gmJaaNWfxq6KmOiJnYf7gSW+PmXQBG7Hvngb9sfjefw8ztZMGIXJ+Jm84PyhyggcbXld1/hyzKqL2xHiFGwJ7ZyqiKuo1Crz5x54Tp6WlXocReH0t4C/9YQ03Xh04jMZiJ+Ri0MUYgvozWlZEQ+l6fgDKMlPQCLXbKgqPbxClaZr3biaQRGxBypkaR74CszIVk8bKW2OR6LBfTfcZGraR96ZcVUyHi5S5RgthZobDw+llj30hvOqCr9J2WDxaRiU3JbBdPEyKbpK2OBDlmPlRyl+TCbWTWdMSRpLF7N43VBlWWZTPCMYKmRbAPzu3XDnzqwOTq9ouq1SkmPlRSLQJWgwiqELnk0Gd35IFIXyLFDXCxBSQkcs0bvb5zjaev3c1ESmGAjJu6cPlogkPwz9TImm3tjTOQlmVU6ODQ3oUOvJ5iJOVQuIO/YiWqPv5yWNsjX9YSd6CTod47d7LGj+MrLB6qrTEPom+5ZQ+AMz0THLkLxsp27psjlGXx54ZODkUJZREaiKIotw0mwC3g83kYhSJpvh5E/P3W/Gi761vowaAaQLbuJqlMj2gZ35ZK3lJtuhREv8OTAqTmzc5ijbF/G9OcQztehJg3g6pHDnuVH+0UK5I9aQYyKWqNpG68P5Pg5ALCHPZxCpUQxvT3KZ857+PrmY0AGcJA5K9/s68sAAccNZAEgwyn1um56cViS/HuDDmfCJ2hPc+I7YQ4tDZUeVK2gvB/nFOrp/czbEg5Nn70FGblBHe1UXtLnzdqYM/K60lbfuYoixW8ni9b29+01veGnWu6Lg/j7WIjIjla5S3eaiPVUhv9/a/Jq0gfYfUTE3aa1sUemZmbFMagav5vNJmbCmmy0uPyP4mds= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b276dc4-b719-4491-6d04-08dce1ba3db7 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:41:59.6202 (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: OqZ4Op2eJMLyHcc7FgnL9Oe55wEKfPYfw2OhNz/wYgEmCTNqz3Lnegjo+6sgvzyZEu2DrcBmmcSLdZ178RiPCtYsAClw0gYuSvcVupnCoYgjYrYxRW9w2m91fw5rnAwn X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB7132 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 e692aa3b8b22..a0c55246f424 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 Tue Oct 1 01:42:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817322 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010021.outbound.protection.outlook.com [52.101.229.21]) (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 9490F168D0 for ; Tue, 1 Oct 2024 01:42:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746928; cv=fail; b=kW8u5ZeswNECvqiMAzgNUFRpr+Mj+mdhc2dTTaqVA1/hqnKWUn1jeoIbkQBaUSW3N4w7aqouYbY6oQ/PHX9qnA674xambgt4AmHD6GUAPh6BwuXnt/bPZa3kdRwpT6srBIVM92pNr9CT3+M4qDD+Yoq8XI7yadAM1sYmJW3tig0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746928; c=relaxed/simple; bh=ZiZp2sdXbaeN9IzAesoXl7p43SktonvE5gj7fS3NF/o=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=S9BQfGSsDZGj0cl85SctutBHglVn/Gf+/uWEETkWBY8ujuJ/fMMBMSeIE22wJbJ7MzPxo86oW1jQkhtz3Z49MonSRNTS+P/a6Dd/G4/9Qsw/9sgMPTR/Dy7nb0F4bXpi1Q/wlJnaSUFpUFlsn6HkZi0Bq426TK6bBbUMqB+Tk7A= 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=KtZ6IRuW; arc=fail smtp.client-ip=52.101.229.21 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="KtZ6IRuW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b6Cme51WwkGo39u8veddao54st5JqxNwJOCGJatbmiNipQInpAYyyOevgIKqKlukcwF/rQLVaVBpn+zQsBw3+Evqw2J+bggM4RRyyqvOfatXF4xQkjOmb58+5zK7ElStYZtYhY6fukmiRoEjG0ButgJ3PhusuZ+GUB59yNgVcXsVNbWW2LHBhDWae2+McNghFnbQ3m/gEqIJltPesBUkqeZ9bcSUwSOoQGtapsss5r3MUG8Timadn4uKWxO/6vtj7iW1zRfwS3YG1eAly9ap9AFK3ADAhVPWU/ZbyP++tf5FJI2Dlxm9krEuFRmmUH4u4f1XCTHoxrfOxF4eXaprJA== 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=GKGoKSaWEjmXNTRJmyK4pwp4FfhWkYsiEQlNZAcmGoI=; b=R0Tb35yuny7pRBkwx7ZfQnKkbtCKDoBmoH0rns3wSFpwwYpGcLyTSmzUa7BHwNR81SgkG+5ZdsuVU4m+0y+tpV0oYYpZf7YWC1j0EQ5FF3UkNMEZq5cr0MO83Nl3hJqBUyFANIHal7hLmzmnVtL3U04QXB0uLiXHNifpg56Au3PUagx9dZMooK/Doe8YlraZw305sYVqH0dNdlBA16EzNPj2o04fRmtgnHvAvuuQ8qslxDuibqOHytzBIYygYcmZgZjD3ySiGfhYAOkVAf7ZMsED+XoFtkl98yyQPdKXWHBIVcqqyPha9Cpe3ZD3B5dxOUZGhNOKfjzx0/tGi6n+Jw== 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=GKGoKSaWEjmXNTRJmyK4pwp4FfhWkYsiEQlNZAcmGoI=; b=KtZ6IRuW5ldj+vejEgS1zkxtwJSS5gA/neWEah622+HLxynyS5pcZfIesF5Py5nqwCoZ7uxWd5HTr9zTX3+oiGKgTdiwbvFBcKTjOryPV96HY1COeHSypj2UvvaVZK7L0PeF9p1KJErkNdj2A5K52diHg77/pyRSar/QjpNV/Dk= 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 OSZPR01MB6629.jpnprd01.prod.outlook.com (2603:1096:604:fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:42: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.8005.026; Tue, 1 Oct 2024 01:42:04 +0000 Message-ID: <87ldz8vbtg.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:42:04 +0000 X-ClientProxiedBy: TY2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:404:e2::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSZPR01MB6629:EE_ X-MS-Office365-Filtering-Correlation-Id: 44135e29-fbfe-459b-0b9a-08dce1ba406d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 66TK9r0NocJsff3Dvi2l73kjypdzJjnwg53TWm5OpE84v3gxB7hW83hHRURRAY2gdKtqjxPAvdf3MpWbem2bKnDqFBxhHH/hsKM4wTJt9xTW4dUJ7To6X1N6j5vu3KVs8LFzN73mq9NntKu5+TjaDjTJYmkKIiJBDQIwI7NYJZ8rinSI5Yu0DkSHoHBNO438sjTvyk+EZWAsT/2Dghj4l78QDatpvTi7f1DLxkvTbNw6OBAKxkyVfK8UDudVbnJmSVyGFSxO2Irg8knYMGDBaBQmJTFAkvTizMrZpaJGrZtS05ahBT2+IxskxXe7cSj0ilQqmXyW4H/MhyJxa7XIx/tK4pXG+H0SPCpqVYph/ca0St/H9OxZ1eCZ5kW9bXX7CDMT28JKz7pTNzI5Z3a9QbLMaJq/Vw/A5y+R6Fnz0FB+wPZgWG8XgCrjHccQbnVHyJ8UGaknqHstiMgaj8GyCb8SWc/+BvgDR1m/KMx9j8ZkpC885VUOQvi0LAUX6+SvrkVckDFJG505axrLPtcoMmRtkG0eMcJzJnfaVFo+/j0W5MGGIsUF3xx8QTOycQCqIU6Pnabr9fpDfUyslkIys963iSvg108yzuPB4bTBr1kphRvXSWvG6HSdgPdwSf/lcF0Da/VeclnBl1vjJW37AGBohosZ9AGKq8sWoKgzQoXpiCzNFb4uTNzG3fH2o0oUPF7A16lwzmLeb4srKrwYXvjFLUjvKIezJYGhK3zzZP4e9lIvC7HuAKQRrfXC2hM6ly8suE7ue7d0HU3hzJfcrdhGGihlI7xvJ2d7MjGgHGRW5gMARYnnGrhEnHO/tZkv+d2SF3UbMgA+iHiPd9mo487lPornZ3sdyuaSrooGjEA7PhQo6FGAl7nJQ1pc48VN6tMuEau3BBTC4YULipwYZG2QvJHo9hxpaFDzEKviXwSrXK03DUiBXzZxljn8RtDIapLHMlDD6KjrHH9xQziRfDFOdIdz53aHc6vRYldT/PdQZBQghAaBg6BdEB7Sef8Ds0nJtsvncEAt2dGu30migpMvOntNGtVTl9bwNYPnR8Yg44N2kRQBwAWvJl8V/c4NLyFgXUV0Bz/ilPHhC3fpxY808VFka2Ir3WISfpfd00F+UeS4wbBX8K8pTAaQG2MUMd4op8c6vR4pkYt6QnSAtVleF3feAcTAxgNu3QUo/QSnU0IUULEPENgKRCCDtE3MtTOqcK7U8BR86UzzP5KmOLKdLu8hTVSpEKCoWr6L7Vw8rEuLMKa87diZnxndql9+3uF5gWstiNSx0uMCGMp97/9TTyjNmQ4+FV3BtMNzkWURRi3lmlWSou9eIlDB0T2cQMaqdpPwEp1PwQbK6oFlpQ== 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)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OHQlnKuhKVGMC383g0krm7WIcek1DpSte3vW2Sz3G01nUmZ1N0Hh+OrEaMfEGI3ro+5GdsnzDZvkXpJJp5RDFfRnsXKcALcDDkTjDzN+mhuCZau+Ipvic7A4YbIE6kPx3/eCS7yfrEybBtonH48HWL9eRjctMaSszDvSx0g9+MtnYmvAS7pwkntbivNqQARoqYyyw5ixONM2UbwnIhVLK/YRS/k+wSk/Bdgee/+MXVV7IbIK4SDHo7OqP32IH/BXi3Qw0l2lkZFj4zuNBFCuH1DRmhU8cb3KBdYJxxU8dqsMunFJjys9gBBM2jpy+vBsxv2/M9Xn7Q9pNLtvOB45JG4odljZveXsMKKKzh7UC6wgjJssEUtMVVwHjirqk9uLTV9pg3npFbO1YiW9gsCEUdIdID9nqPqHI169db/2iCSboivCwUzG7xmZzR5dDa06lcYzjU5iCITAJdPtWM5Qtz90C6BHtX6ED/7SOD5Y/2KespHQL4m7Wg/Uu1a7BHEqBge8dlNAbh8PXLfbtGA4gWx8aATZ22ky4p7UGqK2Vv4S14auF1Yv6oSobzj1cx5tjhVhnjWZnKhWQhCj4dK1kDr9e2+qImmQUqZLLAQJentco6XZpF9us/UCfnY/P72TVYtBVLXeMCfMDSCWoLBUMlwEs/opqgLA57jiGFAf0GmViEQWkGHewCNC525/f+iz/rbRgLXx2AMn6LZGP9GUDvnjJaUKQnEEkcKEa2lvdIrX1fcvVzjJn5aDjsBpwqQEuugDHPoZwfrUu27JI4P/+kJY7HAY7/pJsuPDZ6K0rMRbHJoCqfYhTibkaYDOJlaKwha0QRBtyuCFWMV9DT62UdBCEfdPf4oG4/mdXbG9J3tWDnsyKdkQOP/T7V4U7SImHtp3x12FkkBvLjf3LUmqSd8livyVn7VqvjDztHJnXAKBEmBajfWjGI0PdenzpRBZu6bIDIOk07/aB2VMb3ylbfBDnj9NbTTSmxNl6DUzWhk5WTe0AReb1AGCi9MRA7HoBMeW1nf2tbqWCsyf5moIKBkbXScoejdWu3rXSaV3SzGzszwg2NYLikpZc1z9DHkfqppHzADm3q8SpJcg6HpjqRPeZSJsO4wRlAIvB8PrRVl4RVecdtKi9jQjlOnf7kXYy8Uj1Ahd5fLIpwlfApORkZI6roUHeP6UYu7gveScncOZx+tx1syNmSKonWWkpXwRC1VY1/C80d+ZKixMA83Svqi1WlJCwK42Zm4oaYBvY/891UGk9W50lmWsxewejlkwmdRfzawJRANkziBLn5qmOvCb3+MnFfafULwhPfkiTwY9dEow6LgVlCysgxJhokhmFYGRW0fvT7VMDe5AtlfhmAKhzKEG2qufDRLHCWGnD8h4YGp5wkK6fz95C2ZNnaWG3glvf0fw5L6PM6z8hQCK53hMGIWYxrkOaXsM8hE8U9byT8AFTD79x7gQ0d77ZvP9LNHoK5bi5+tTZYD272LKiELaVwzD76o5Vqcn1WStm9gHZr2g7JLW/QTLspmnrgSR7Xy2by+6k+zx9tBQWgYrCd6B65Q7Ld8kllU3bCgLH1HLjZ17XztWY4mbsrAt6TZ+KXpY19tzInOSHGKLx/SdOf48FUFq4CUMulWDe4Crx9A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44135e29-fbfe-459b-0b9a-08dce1ba406d X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:42:04.1492 (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: MaMJ4LfU9nQiMTGs3hZzZFUxbL3ESgBURXeM29q6CK800PjzIbhyMxM+WMAsywdgdpL7LcH9DLYUPXeZCYWkWvfyqgFWf5AhU8fDH/0IQIpazal/MBNZ32l1uY09UQ11 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB6629 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 a2b08568f4e8..c8f2ec29e970 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 af3158cdc8d5..93d0ee68059a 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 Tue Oct 1 01:42: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: 13817323 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010020.outbound.protection.outlook.com [52.101.228.20]) (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 4C9B1168D0 for ; Tue, 1 Oct 2024 01:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746934; cv=fail; b=qAEk+PIU0PL2LcpdShg3j8DpoVHrGGQyyRt9b/ZMWJQNS/A1fKHdFqPCYKDdO3CbWPBqhRg/j0Wh3LTT5JlcJ6QBplNx9RHjnx7EbyV3Mr17QMwiWrXXWVdS2FPPQGYVacrtckGYOYRnfK/xMwKf5nJtUDVVTUZGp9HbFDaqujY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746934; c=relaxed/simple; bh=Y7EFOhbhppQTdQxKoD3gazTbZ5D8jX8b2Tv6eUm2k2I=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=qwNCKgNx7VLfjN8ddsduDXTWX1CUkxnqOp3UjJy2ecDcE+tC/5XLUT6pGT1ykudoN7m8l6Blbv9y9ZRi6aqGmBkHlr+Fby2MfehuolMgFxj3P5S7OmsrBzIsJOyzoBgI8fo+0Svq1NsEACkyFM+tklIkb7uOQLdUKtGsIETGWQo= 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=VCd7KPRh; arc=fail smtp.client-ip=52.101.228.20 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="VCd7KPRh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ESvGfniiEjbUtdoVuGqYJynwjJm1T7mkWXzVHc+8HqxhW93sSbO962BudoSy8Vq5pxiobmKdAC3Je442vcilCx1vaI4KnMrN0e5ALy5CEfMy10PDnKB4HwGuRJOKAQi1jXDaMMpR2kwVxhC/tkKz2qlleUxXR5rT5cCV6DmerHcyeEQHaiD1DbFboKPQJZalxg7Yi2ap2hb8Ydfy7exRmYFI9jMc2Eo2oqRZwVwkZKbls9TOYAMham2d8Z8OizyIZfBbbI5ypueU2sZMHEWOrkcSBA0FP/NM1kpHyPmde0vhADT+4J/Y+g0CuGCL9aStCKFfXkGZhaiXl0L9XO5RYA== 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=eLyAL31d2UPlbRXRaNoXxUXkRDsbg/QlYTS+DtpyUaE=; b=pKTOZ9dZ9vLE5TcfbiJVxMj/iSrRVewi6y7jQZU0QEV6LVzwnOkLN3f5UtpLZduhBHLm/tLHVkALTWnv9LO/MOI/kUAxSJCn8AQG2QztodyaSPbEld7cYZM5qSdrRQbnCQIAExpsyPuOBjixC5H9f9vjAAcmsb1ud/G5DnfNbd3eltzusymgIYCLygGJgYjLPxVKmMGQiLM8s0YkUYshZpAE4qtfKdktS2HK6cZOnJi4kIodl38s1i0GtTrEC6PxhX7AYEwpgPGG89juKbAgljGE++lzgZPFSEf9eb3tEUXmAjWYGVjq0os21J7cpnlbW4Ar3sEHK0v6TK+L3e+Bjw== 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=eLyAL31d2UPlbRXRaNoXxUXkRDsbg/QlYTS+DtpyUaE=; b=VCd7KPRhcdqjhAdGFyZK4J14kIjZJ1FDm6Mx6jRAHa+/HNECKn99QRvX4dmA97E8BAmhdvvBSinAlToyn2Z5Wtyxx2hLHy0XKijDbqLbMU7sos7rkDC/XpUcWK7Loh6/1x6CtamdWCewVqyZa0kXWN2EvhVViEGXannp8S5pjSA= 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 OSZPR01MB6629.jpnprd01.prod.outlook.com (2603:1096:604:fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:42:10 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:42:10 +0000 Message-ID: <87jzesvbta.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:42:09 +0000 X-ClientProxiedBy: TYCP286CA0101.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::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_|OSZPR01MB6629:EE_ X-MS-Office365-Filtering-Correlation-Id: b19e3d0a-d680-4230-492e-08dce1ba43f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: dYD57kf2MKXIuChM/NpxvVjSaibg1XpsNErzqJXNbn6JeHTbvh1Qffkt7cQVzllJ9a5BWFu6RbYGb7p1hJxmeP6BR6ZqOweKEecmQNOx675PiieL6gvVQxfgq4N591jXP0suIGc3JYnEYhhN2kKVP6YO/mBpNK4XYVju93fjAYy+c38UVjZj9gES/DQXigve/7mPWjJTNU2YrFjAeIG8o4EnCzdaAz7YnjgxOCs6nt4P7i8mNcGtAyWI7MmlNypIxB7VQGybC3svcn7546OOm+iUt7DfnvgPlPwgi7OEulFPEcJM+zr+K61SE3MbQ6i0r+b26Dldcc2PaRl33g7ResiP55t8qtflTdlFie16rkeBBRNz19xNniMx+ZpDonLOVWbzR9R2C9e3VdGECtOcdmsrkI+YFqTleh1sAHC6DNLPp4O7Zht2HbQZA9JgrfwkbIaRvBzQkzsmnk0jD42cIglLC4nCEkqNWuecnNlfGYa1iIy+9gto+z2AUg8B5ZmG4YMz0m2HzaBTsdu79lAkhqLaEHTpkXl2q/1ceSI5RVbkzGUX8t7uhMlLPWxliJCv57nPIjHce2dzT8Qqhl285l1NrXHouT6zwyYLrIJSy2N6NvJTT9OvnWeTfHv2Pa5DUE7hv9JjbrhrSjKpkLoTht6W5Txq/NaRHl7T0itSF0az2jqsCXqP6DNJgEuRWCC+cRaYzvEBGV5ACGqJOwgLtfGDWGwcNiZ4topvjn+6qkyKkDFlHqDUrMJpzKbBgGIf3XuxGNgp5yA8/ft3R1nD2irweQaN7bCQvyZ9FX8NnwNWF56dyyP4bpuVraWjUe3rpBJeR2jg/3YzDIVV2H3+Yu8j1qA6n1V+KyFzxi6WEyJFsnQUZKP+ZkPkuC3D3fXy7wFY5iODSKmVoVShckfSC+HAvVOK9FIijEsas83Kt6Fd9B/SvR/8md+GX1UeSq9Yrljr4H3ZQR/L8mbxu9TVmRDD+qMAIrW+oqkuYAQrmVZOhunoJpmMhnqtE4nVaDpyttWvDLMxcqzsMjnHAE7QNIOxwuxJXos8g20izsmEVtvx/muXVvfjg00vKA1xWfLCZQGaZ4BWJMoEqhZ7dzmxk49sng9JkdZh1uLkye/tqTFsUF0vaDpXhMT4j/TAI1oIvbbXg8Q3Uk7cPuepi8QLctLqKCqbViAOrVSohKNncz0sEGvTbMUQnJ9aS/hVhtCiJlrq2eXUHKRc/j+DWfJo5UHyVjQGXJ46uXK9ab4zm5Q4T6O+uT29J83qqM9LLLdIAb5Lron03etP76LfgJ5e4lyQ3aizJAc5iaVQKnV+P23SoKNSNzmw4nk0E2c3sZec4Ln9/ZYdRI/kbF7YVb7uww== 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)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9tphQdFA+5vzH2fMqIyqBNW4G2i4Tb1FeKt1DbyaJU9lyew+eEWLuF0zSe+wpBjDRWYOJr0KaSrp5nWBRB75bNsdyVVFbcE0j831reFEGrNJNGe5R7eYTVkNVWzLHzz5mpexM21wCp8sPwPX2P91zd9yx1LA19STHgyG34111usfT7mitgTiUEyk/hwBa2MZlZ6WgQNZdnntxrOECBjU/sn5Ce7Z1RcC9UV7eBogVVn9kCQqX7f9CojaPDHIrP2SpuZfMUhZKRDMGZo1ucdGFvhBbrfmXzZ6DCXYUK2P9EYrsI0O6N3Zn9bYqoMOx1+V//yx40LUUjMIqGpn13cDQ1u0uKM02Tc38+9Ng5PBbKZ1HAD4Q8xezBfo0Ybi5RDn2GV25QY4L2xHz13N/jbJpa1WXgZj6/+Y1l4QNf5zd46wyJH91mwNEUoOQaiepxgQOvBV0w4gNhYhLprdPLlLZVepkzMUYgXz3chw8qVGvSw/ab3ljAnKSTVIVv1XlAOO6TVPlGHZxlHi/l0ZTtK4rBo8FKaT1HMIOrNTe3Ob3zEjDIsAOiaE+NPHN36P2v2cGQlA4JEfhkF7IkC5w1ZViDqrx5bDIAQexjw8tO8TCcUv322rZTXfxaWrxg/qixdoPVc8Wd7r8L+7t7Os/9k2564I2bcXKB9or7+wgukx6Eaobr2rRSjpmgP3aqVB3V1IxCtBIqh7aX0CdCY2EGYcJjqxRVHvwLmPNIwbEsbv/YPpUIDr7JV5f7C7RvOXpkMR59a0dJKC6HXt1w+Urn9IFGQfH7f9raUFYUMC35sD1NeHecpFEf7rnp2Xi5GV15Xf0PTCDvNX1wXMzxq0aADKxNp/8RTmkMhO0GutcGfCtks64tBOkc2Uw8N62iMMC/norGAJMtBugnBY9ejlfXmubieqZC4k77NkqyarTDR8tLd69rJPqJYwVZ2C1XHlw45CBRzbncpKwDrJLNlzBH7DMb1i01ce6exSpLLTaAjzymEbHbGYMl1x+2JH16a+S8N7YShyiepThmkewtPh/AoP7LSoWSaR/I9OuWXy8iOAJRqOkyJPU/tfXIS6mQozhj6NUbDQJu6jxAAIy4aUvaOuLdP74gl637gXfFRvdtrkr8g3Q0HMaR8/iSP5aXvmOIi3bgP8mYuKVA6E4b6fTHZiV+NeiJbobenQyyqO9EvpTPkpdUA7jEtjEXtKuiSHni1OJsuDzZbB0se7IlTJiZIN9Sml5ysXkqDefG6Dx4CiP2zKW3aJDMjLSShErmA+7DCAMr1eojqUhuPT3aP1QkHThn0UzJylHtO61/FgyJb2tXelcYE62pGkhwa44dhEszevSuOK/lYiYnqy4UB/zXE5OtrOTz960CLpJ/O5gbOL8NwB4mRuh0Je0KFloe0fcc8utiQG2MJ+ctve2d+nPkqBP/lqbfAQdGuTLx0um2jhpYLtudmIYUnzubHh4TVo/KLqsH/CD9A8Koy7lnQmin9ugKwUGz6gxflIkZdoj85M8Qt8RH0kqbLVkuWcyk9U0tHG8CQJz0aGDRjvG7AKxYp8NANMER1dRfmdTNwDvNNVyfbnQJbBxNJgYw7rEgMQrqtKq8vj4b9DgjObkuyC/4aRh4Z0jUUBXTzhkDptk8iaT2o= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b19e3d0a-d680-4230-492e-08dce1ba43f9 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:42:10.1165 (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: fcYoq8566uTACJlM5fEwQdcYoTjybObHgO7le6Tbu0UMziM/NPoqrulGYlepd6Ey2qdjJCqIKn0NoS0VpmyHIz65KnBp30myvk01PV7qF5mIxrmaQ4aYBC7akFk9pgre X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB6629 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 3c7cee03a02e..d25a7188f603 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 304af3d06d01..9484f3410787 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 58db09d9b6e1..523ade9f31ab 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 8c2b4ab764bb..68a3d345dc25 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 9178bbe8d995..31141d4b6b25 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 d3327bc237b5..62594e7966ab 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 4a957d1cece3..fec23bda9e64 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 2ed49acb4e36..410eb36c37c9 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 8e4b821efe92..67c62844ca2a 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 0b10d89cb189..a6dfbcfdf74e 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 d7c114858833..36984de8a067 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 7651b83632fa..4afb292d4f13 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 ac23a8b7cafc..b977a2db73a3 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 c6c469d51243..aaef212cf44e 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 90d93e667bd9..ebc417c04a50 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 1826a4dfd0f3..9bb2822ba63e 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 24f716e42d6a..50e846d67c19 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 fc998fe4b196..a92707876851 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 8d237f67bd06..68380b738d88 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 facc6c32cbfe..51922347409f 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 Tue Oct 1 01:42:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817324 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010053.outbound.protection.outlook.com [52.101.228.53]) (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 24B1D168D0 for ; Tue, 1 Oct 2024 01:42:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746938; cv=fail; b=Wt0jqOY4Is2DP/x1Kame2Bnn1skEvhtImiWuUatSapXmlSCwT/qf/UPO9X6cEX/wmCeiar0sL24ekc8IeBErVX7dQV7UpqSTX11pBOcZtKxTv9U1Z5qGgcHrM7+FsziUmN4GbXwwkaDsMm0KHr+diOikSoMEpgoeEdv7IPIGz7I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746938; c=relaxed/simple; bh=E2yDpIlOSLWRfFqKIwjn0CpIv0hlhF4TPKa1jkCNfFU=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=dIrZhWuOM5xPZHm+a4H3g2P02Btk0NxZEMFdNRpehCYQaOREmgcxOv4E2L001LdpXDZrhWRR4XsaHXgGWALZ21U6GGWtf2WK4kW4QeQBKxsh/HawSAbk4zEJiGUwdJz2lLRECrMlrUUZTmvBfyhLYD93tfKbF75vhmN+mhA2IXg= 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=gL/R4sts; arc=fail smtp.client-ip=52.101.228.53 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="gL/R4sts" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aHgWW3WoPvnJ7HwAoewaF+9j7VhbeQF1QT/7+kZyezYaKtCSVZ7MMvxMcEBNiAM/Yy1kmVFCcygzApPKdOmXgcwozGwpcoPPPWZucZDMBZwNWynxo45aEMJBR3sx+kcsaIahlH8r0vd2Ngr9Gz6/5KwfqMMDKWnhPrd+KUitat4B/R/qwAW3gbwZ4bZ+xVzXS4HvU0KsFLbNaJzCpOzHjPqZMS34IV1b0gizCpgGEST3oJFrfvQ5ved02V5+9rTTLl/CgJ2PP3ABrN5p/mGBZqcLZh3dIaSUxY+EsuMAuLV3fD8KkeW4zEw/QpuNdAvJmkAFaMuIZCqtCdHTYoUxhA== 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=9e1RMc/IHEAH/sNqylWLLExISaQ39k5QeQNP3WHzdVQ=; b=m/kkjyGcNw/NXmnbFU/cic6VsMwfalllizC/Rd33FhMzOCXNP8ZzYjIFKLz2atyanSG1w9Mp7BityH1QZGiSmcDcuiqXE60flG/+Puv+/z2gjBaJf6E1Cjq9G0TVG4bIU67UlXDmhg5/O45OUw1eSy6wTYsFxQMtIlcIkEsfiPSNTm92eSKyNBAM7Hymn+e9+NF1zui3Fh7bNjz4N6Av1kJogDrB8prGnyVxSiECgpCUvPCwxHg5+IGQjgY3aClRnkgQ0tbz92DvNwMADvvoT4ufe74izZB4GArX7Outzv0nVrTAg4TIZqH5ItIg+W464z1Eq+tMpDTV75kc/vhv7w== 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=9e1RMc/IHEAH/sNqylWLLExISaQ39k5QeQNP3WHzdVQ=; b=gL/R4stsCaYPsY/G6iIUHNUIjb/wPcRm4U9j087WgnjzDFyP0JSL3l1AC8egG3kOtHyqmmQHhttBCo6UJOSgk9QUVYqpXb/qUgmgMKKLRb2ZZO1K6JXah0QhBHO7nkCTe229GxVIC2L8kkw248yfEKzAsiUFVOYEGbcg66k0N+U= 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 OSZPR01MB6629.jpnprd01.prod.outlook.com (2603:1096:604:fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:42: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.8005.026; Tue, 1 Oct 2024 01:42:15 +0000 Message-ID: <87ikucvbt5.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:42:15 +0000 X-ClientProxiedBy: TY2PR06CA0008.apcprd06.prod.outlook.com (2603:1096:404:42::20) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSZPR01MB6629:EE_ X-MS-Office365-Filtering-Correlation-Id: 85a5daef-c0f1-4d0b-c63c-08dce1ba46f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 0QynNM8C1n49eBqCwe8vnm/601QDjm1xlJ7a8MNqEuXKkHxZdVWPbsMvcD6cfypPDCil4/bJ+dH0D4QOwKf21e0XkTyli92jf2KYVhz2/B/BSHGhVhXzrfmBkT2Zhs2x2XpKMTQw4oU4Qpa7g9SuY+leIvkeYbwpQYJRNNpzE4vcW4qHMNjsJhbqdCo+LnqK7bn91Cs+bBJ9gIMjnNMArGGfeKLF9VFfP3LVO256wouEG98z3zc8NYGWMpeSJPsRXjYoyxKCeBTnUFE19zQGsL9eIeAm3CV6kcZY7q52/vEEzjhpJ9kBhlaf+oNE2srKOMa7x+waqUGB2/UaVD+R/i5F4l+NO2nXhjhi5F82NTutzteVpMe6Mf+H1fJoiIJQX7EziACreizLzaydytV0STInEYreCV2qapXQhWI0Vq9+1dmjbu9QazHmwO7i8GM7dbsSXHjTpExzPKu2RAphtFskaNSr1uBAZKt6GYnSWS3C+VAkErytYmkMosUbwxqEOSqRccYo9KzPtnV/KjMekgnjrd0uqQRGGvLHmoPZmxF0iFZTxjAh59vJI2ZCkNIgU6Jgq0/ZMbySMGX+ZQURwbJmZaBSD6zB9fHdQjTu51A6/QoRJhq4eh5efJnFDE+Q4jlzRojVVvC0ydd9uKdAlB9eHYanASV8S7J37ICn1E98NuD2oaQii6B9/UaDmWDjGykRpTfVVtfE2RiTJW1cYdWqSSJi6E00BQ37mW+Osu3NXsUfE+qjFSl6V2ntDk9JfUzoyC8kxcz151iSKs8le/IsS6zrLKp9emVxP1GwkCX8VOI7RSn7JxK4a2eYr4c2BMnkASBLuBBCf36d9I+V+dmMqo6Qaqd7zvnzrAbJo4KtHfrhYtqgRUJw2uXRE1leEJ/ik4HFrNwKRS2Nb2JCfx442WeywYO9QH+lEhnERIOwjlGnQiCcSFutOjQmw75bCzmf2WI2G8NWR8Y70VPol9hCezeoQgttRjIEIfG6cz+gNnGziEl2enVIYtHcdPYG9Q+L9nXFaK7IRAST4wNNC8sCr1CY87Fk9Oskpn0js8i/Oi4fI5kobF4jzL++Mq3lbfHlqqB+Re0NiU7tyY2dE9mIo82vmdkScMFAmRwD8eX3+6QXJp2XURwA2K8a9c6/ZxEUWhxo135uiGxgn6amUxU6CeWIMEIgmkEviWNW2OOx1VHrwaH32emZqpfhrlAGnz95miZ4IwlqLCQMEd4++N0DEqnVaTQn0+NtmV0CRCAe6Th9+/0U6i2ahbb8XOs+PHfNphr1QOdMUJ6sZaUApmdg4tPQ32bUd8gcjAm+3KuEBdHTIXqnzetBs0XCAfF3QBCJQLVdZPjxxgFL3UV20w== 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)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9tpx2zIAa+6juQM90FXO+wzggsJhpOpCiSKch61EofJrNTUSDpy59LRZfdppqpsA2Cv3WbqOiG9HPnToPScxX9uYyrtqJtdiRlHNVy1tVgAeccSKn7s0ClOn08Xs2uaIQRsBmToba+jUozlJZ/Y2f8BtsTIzIRY4/Gcg0gLIwrVRMd2Y7/bUgkq9GhNxtJX1Sq1ISm6tongPgDTyq9C9MXJyRgi66orVU0DxMZpji0B/UQ4D8mCVmUz1WZrlndb7XeTM1Q8li2RDbXsgVTRTQBCre83vq3MyQr1cN/WfaUoQqtERdYG0to9rWBY1qiFNU9AaHjHWcWDkIAAA0EjovCwJtiH10eUNweQ9VwBEtygmQOXONlWccyeb3y0ig7uDPAV/bPooTTyoVwgYD+vCqQsEY7GKuh26KimWD+8kWmcwaA8DrzqfPc6gRdpJStHhWtFKe3wdo0zq0A1lukbV5xXfXwndfh1hE2Uv18LLBheAHQ4ma2iwY8VQgtFT8Pphb/b+pkDA67tQCXvoKVrjP/E2JLAl51/qi359+galxxIJZs6MUB6Hso0uf98+ep3xrmyZV7XAqnx77f6pZ6uzEMFBdaARqKfR/h2DPmcCFDvrcKc65nzEIwvoKJzz6+GIM5VcurcpQwVJTfY9ZJZCkWMUR8iIU9L7G6vGLkaakZIi9gvL81Rmh4TUfYDB+xO5Vzec6uoVrvwhcHykUiQiLVZE7IziafL2i5dGym7zNrqqSGO2hNT68PYHFo4fR9FEeJQdPdsnA4NCk9dqPfmVd316PIYcO/xClfYwWuRb2IomnsXyrUNI1r5tnJtwTo9fQfHS81eDa05Ati74ar5kpJheqwj40jqcBqpkGXkelBJy2NxNVbKswEzh2KS8r5+Z3dYwPkQ8Sq/A8WXIrZcIwG8mFG6eQoGh9EwIQWSIRtFlAwykwJ7YNkgnKb0O8mXydlJTCwe+Q0gL8wegpl7No27ZAM8M3s3dTGyAeojaCfLFsS1QkFFvumx5G1i00a2bP0iPBpLTqD61nSAYxqk6VbwUdO4/yleCBz2KrFQuBKaqv9+6rwMctT23oKp0vOdsB2EYsQhZnAfbA6htBU8XA5u6F0aFEsWQmhLrYCOJ6vAUpZLg8GvG7lrR46faZ7wmMhMR4STZAhtNlrSiEwKe2Km1Aqivd7qESIBHW6W4gnzfVVPJu9JdPnKb5u2z/Z3LYvberDHsVR8revJPqo5gGL/MU2e+aVanSmyVHAvWuY7w/3B5+jfnVWGaATY/DBiH1nw5VzTOgiW+FFXUd6WnIqbvb2JdGjchcNCY/UkpqRgbWg9HfcT0Wqdnm9phioLjAHolzNQMsKCedZ0Ees4CMtdr5tdT0m5529uVPBBPNGxd+roPVa0BU/Ng2zyK3c6i8L6HKyTIUEYvM9rwa4xjEdTxilJc8NWskW+1+t+hz9vGMIIc0/F3MEz2cVm3jZN+fbB522p8dao/rt+jOEMb0t6+u6juDtnRQT+mgaKi4jleNtiIzsZPO0lULPfXDekK7vrFqwqkCUMKF2mnsEtvZHB4kAhzVnD1ASisYlSXJq1YvII6Kbpl8JdT7Qb3IKdGWd84pHJzvu8qycTxj8wNiq7WA8St28clcSJWou40aag= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85a5daef-c0f1-4d0b-c63c-08dce1ba46f6 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:42:15.1668 (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: WON1eWN/VM6sk5MnsTwIH73oS5rVJfQIV6vDs590nPPWIrlYKAHoP7Y2JVXJ0EGR+E48iaMCx5f+NbAHUdQsk6gXQeDYAyJY1I478e+9ohIwyUgPPNtMiOzlWT0QmHxQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB6629 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 e6e359c1a2ac..123a0140a23c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -815,11 +815,6 @@ struct snd_soc_dai_link { /* This DAI link can route to other DAI links at runtime (Frontend)*/ unsigned int dynamic:1; - /* REMOVE ME */ - /* DPCM capture and Playback support */ - unsigned int dpcm_capture:1; - unsigned int dpcm_playback:1; - /* DPCM used FE & BE merged format */ unsigned int dpcm_merged_format:1; /* DPCM used FE & BE merged channel */ diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7a59121fc323..27810f6f8630 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2860,39 +2860,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, has_capture = 1; } - /* - * REMOVE ME - * - * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used - * as availability limitation - */ - if (has_playback && has_capture) { - if ( dai_link->dpcm_playback && - !dai_link->dpcm_capture && - !dai_link->playback_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using playback_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_capture = 0; - } - - if (!dai_link->dpcm_playback && - dai_link->dpcm_capture && - !dai_link->capture_only) { - dev_warn(rtd->card->dev, - "both playback/capture are available," - " but not using capture_only flag (%s)\n", - dai_link->stream_name); - dev_warn(rtd->card->dev, - "dpcm_playback/capture are no longer needed," - " please use playback/capture_only instead\n"); - has_playback = 0; - } - } } else { struct snd_soc_dai *codec_dai; From patchwork Tue Oct 1 01:42: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: 13817325 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010062.outbound.protection.outlook.com [52.101.228.62]) (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 AD912168D0 for ; Tue, 1 Oct 2024 01:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746944; cv=fail; b=oslUAOlvct38aR8FzsT54oLu3D5b0E7Wk2DNK57r7ZJYwyZ5s+fZw9IiPdB5a0Xil4Qq35FOz5aM+HFJzO/gCTryX6MOxPHYQzloii3Ss9ub5vq4mAp7smbcMHqIv5J40Q8LlipwbuUNBkDzqdXXObm1vyGE00m/XGiIZUJc7wI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746944; c=relaxed/simple; bh=stDU8JGHZ81Cv1ZnOvOQ0Z8lRF5ezijdp0O8cg2MXcc=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=SaFtbtQBlnA+qxXEqNcCVm2s/MlHE1oNdjYae2yhlilxGZqUIrqWyfAxxmkgc2h6FbY5RwydRyvUUoGVLbUT+5vNQ5/wFln4tw3lZHvV4gNV8D5aWTDKGN+uPrpkTqb/28skKeTavx3Xc3tEX/wB/2rxOma8AsxS0x9hUXXhQtU= 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=IfP958DU; arc=fail smtp.client-ip=52.101.228.62 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="IfP958DU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZXYBLZti3SfBenAN1kE886qRmYIRjufODjjp1bHhk2AA47NrhVhFiFNf+WhyXrvICeCWjM87cL07t34k3OUZdzLSiUUxLC6JxRMcEZE8G46epiKYjtRjSqDEseeXW3UA9UGqkjwrjV0mp+CFv6nwBF812NhfloRraG5yRbCR2XE02McFkoDF+9NPcgZ4SwDFvG/r0Z1+THQY2DQkggH9OV1Aptxw40cdBUXMtIhxyC04I1qIfaeu73wGRpSVc39En5/sQRrMKQEV8jYmy2FQamTcIlRT9VkeMmAKIf8i7GT/MQxnDiMz8lii+4zsAQkkY+IMHnhwBkACU4c+cjdL4w== 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=6ExHSygHUc+FRACFEvvoxJ7uEx2s+w5hUoii2drGH8k=; b=g3uN3C9kKjIPqkLPozmYAzdtWk5toNZsPHbJqMbR2HVlHER5JaFORgfWsDBvehY4i/kSxopZGGvkOa4oEdUB0xkoVFAvEjgP1Wp4K8MsAovg7Zys8Hl3U0HtpL6HErje/gk0WIcQJIM2LrEqoF4VVsOLNDMM2XjVtZe5sy4BY1yRNPgFbFvR97Ir5sfUebJlTB+W0vGqZRjFXLx/dY5y+BKBHuYFWbGAyddjgTUKC+8Wr0Cb5ugAG4K2JelrSrODrOShgG8/zy/ZvDHPrja5F1Iaz7YVUSbrjNqDcjVCkZjky076ZmVbrnoFk15EFFROMXGQA6AAUqIHOLwIsUQRUQ== 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=6ExHSygHUc+FRACFEvvoxJ7uEx2s+w5hUoii2drGH8k=; b=IfP958DUqRbz1AyfYCC7h6Un15yNY2Lx7K1q/LKWus6725LnqGoW+9fg5CO1zT4Otk2OQPsRtkQH7M6Q9DaK2Q7AMxIvwrX8GJl9sjeuW8TNPass9Y5KVx4PRKZyKpYvu6tuhLmGq/J87eihp3tqLs+1jjdjUCy4MXku+ulYaPU= 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 OSZPR01MB6629.jpnprd01.prod.outlook.com (2603:1096:604:fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:42: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.8005.026; Tue, 1 Oct 2024 01:42:20 +0000 Message-ID: <87h69wvbsz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:42:20 +0000 X-ClientProxiedBy: TYCPR01CA0130.jpnprd01.prod.outlook.com (2603:1096:400:26d::18) 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_|OSZPR01MB6629:EE_ X-MS-Office365-Filtering-Correlation-Id: 4375c046-075d-46db-f1f8-08dce1ba4a3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 0w3YDGnraIbuqM/RGD1gsdin/hHwY+tzhbRwJi7rNhu8tUyzF5/958txwv1g8ik6b0ZcLKopaXkYaA6fXsV1H+7Cfsb45kPccv5tB2d0s2iacwPfNC77syNjXW4AcNPoPgfyeUuTFJnHqlaVo8X34yuhbFonxGY3cvnV1dUubV4t3xI4RJuF27h5VwG5rTYR4t64uaKm/3V46vyikelFcjjq6nILL2OiQP3FvzVQi5qN958tXzJBhXeT1SE+8Y2wnhCRaM4fipdyfumqVuU2tZyOg9DHOrwAqI8tFwpn9xID2tk/M0NlxPIfIA/MakI96hdvB8OsQ05FgTT9ITjh+dtV5K285Xc8X51vHIHVAsAnGMBk5f6+01YmljJztPfpOVik7vzL419oqSBdGACA9dfkqLnU9OHEF08tsNYvcR/N3/G9/rezkNwgVRlLg93xt2M3Hsou0EPQRQ6HdN/pLYQOkeLezRZBCbdqbaNI1QkzTz0PHuyTcdW9uoyDYyGUw9z+NFzqSylJvco6tWgdOnm8CMWVAoVqBPmpxrIcw7WkgD4oOaj2w3Y4RrFai3CYoGbvMWFbeGfyEn2yEF4cgABV0ytRIBnsv2X6qG6THYbRHhWDwZG3Hz5kI+VA8rKQoE0cNX4MZTyJ4VL9bycz88tfWtMinw5H++4S4PKgza7ZWB5ixacrV3VpAoAAWgOSMRXJxyVf25MihwxIm3knh1dEb401/jUw09LgefTq6eKfM1ArdRnmON9iQpznCsbT1oVqI1GAT36naH1HJc8vC4+U3uCOmu/PZolfg5r3tC8JSK51BQkLbkWpb5K7o0PH8DIDuUPT++MLcmY41//eQolfQZmlw5t/ZjwQWNhEbcoB0DwPuh2d6YMBWZR9ul1zrFI+zgPAbIaH9Jjaog8e9pf8FboT4t6WvIAnEzvayEyrURNzTcsxFMau7PpWI5iUWs5Sdn1yVSi3hGdLblWmehZMqMJXcRUq6CVV1z9k/phE2TEcIsMCUslS+2ZFwu/Y8ADJsrhUirExRDoU2wGCKtC3v1AJIlR3QvIxUz20heSbJjht1bcMiGVnrPf4cOk78PPpin7ddlsj/SPmbMyS2LgL2vHkNqXoWPpg9VIg7vDIKFV7XYnxc5QIu73EL/44qwnlZGmq7Oqj9ALqjy3oZb2M5DB3ToAFnx8gsY5Z9MLmTqKwa19wX17ZMmp+XGRWLGPpxcn9F2LQHgXN53pjn0ofopycw8clMFJFFq4yPGnou68z4TrMIf+o09e6M/PX8mu7Bmw7Hz2rWaZSynUYy9xEWFShoLPu9emW+LXMglom6SR0osyyk6L8eqDWDfV3CzCDSU2mAu2tJ5T7IovX3w== 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)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C0ppTN1p+SemkDw8xxGZvxolR/DF1j73AaLFy7xynBiINoedgocg83Cpur49g+Ei+KA4vWzKijSdfvHFF8D/VHJXXh1UitXnLc4xlGIy9D8HXVZNwXchLDtw5EixB4BKlcLev/55+j4nSKKEtabN2eb7ZaTk9PPxyfumGekrZKY+3CQr7FrCtQuzadtcYkeyO36sJvmgfp6PeGDNIyc9xMgdk9nMVFu2a1ZV73EMwccuRsPmdboJxRhILSVY/2W11D/fETQyUuCDCYxBOGL4qLYJMQTWZuHDBm3hmRguwMJyfqTNlcWGYEf26hkJsLevGjfNTAdZ/T8LyedsX5FNowk54MT7TqO7+FpqQt7rD+R1dkPEgmQ+EJrz/FUzUjF2EIWiDmLe8WNRx17WmvC/CKNn7G9pC2ySoGNz+6EAUTwdtV7KhlA50LFZSz2ep1Q2NqfhCrbEVtcegfPFoQzRYeZU8qF90wpSKTu7xpqd29loS7Q+QrF3zUzvOOtg+K9piw/x4PQ8/d45B05kCN5m9qqtOetN5kwTa/G2QjHzAwHyEq6cEDIg7ha46WnLlGdcPjxJOC0WWo0wgpUAY2WJ91z5QZCt/V1hdxO38twsRo1lJBjvuUt1somwV8DUyMGu8G3Jb0n9rBtgyjgc8TPpv7ATUcSwgFE8mzJJKKYcq778XQvvVUzJTZ2G4k2HmRCKdT6ipPOCh7QG/Benxadv4+URK3SAA74di099tTMOWdd9C2hTSlqy4Ycar5WdCKYxJItvL/+oxNMJit66j8qfSL1ijqkEHP4Mdg5wmiGa82pjA0ULUbP4yHJ+xeF3whYuEw73tlkSqJwH8GkEbcHsFJqJk4im0xy4I6z0uFaQKyweYZnbCMd9OIdDEzC52ts145FUb3PufDFsaLVcvSikeSF5pMAkh6J34nTvM0CZm/+/O+yLSYdmbngXm0y5l/OXP2gMAGtFSx6WErJa0tGlfhBvlOH5+UnrS3xUpLHt79kTD+ExpMB8MXSYX4P2Sa9xqLbwLeCl99CTPCJ9i0WJdFCuWLX4K6ZDQZM4uoSa4EUf+9NSn47Gq8rkKgGCgCL1mgMXBbm83qLMjNJMEzZq7RGy9SqTvljoXr/Ofu+f9/Tz7zhhjLmhZ5D3ExYLPI2uiDG8ZAt5i68s2DPHVLELXvTX7MDQY1bitYFQMbQoiijwQqg4QJWMC37sOFVO5/wqL/hSWEBJKKPQATwrlKOxxm3tBBCZX4cULFadZfrTT7m/DAZIuhuk/urLUZHZrDI19fhHERToqVrgyAQVLJOMFQX8cU7CkR4hmuZPKWGNhERtu/sUAbuu40ppALuFg+r20khVKTCadmuoep98BqiaqxcXlAfRZKEBJJZgyXk+sbCXHMuLPafxaTamnlgfr8ImEyAVU6OPEp6x++qGgFwsNfARUYh8A7OBwkHJdb/phL7iT/bZYyHJzL78qyjvcR9KAtX7u4S+xZRvHWSI9wP1s3Wh/CfTioVErBlYwwsBbukHGUA+jVUT54IJD33Aal09cedpUJ4g00FHkGNeAg1c+RY7UaRIIeAq9KO1NyZ8j3UEM3jCwuScRbLqG2FRtg8Uz64Tqj5JsZ7l3p9Y1bFye5KazNKiZEe+DK6ZvNdvLaY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4375c046-075d-46db-f1f8-08dce1ba4a3a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:42:20.6954 (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: qoYK2WeBXIoVlkFmqSInOsAwhswfpqz5OptNAm83apQwjn0n71wkc04bPeLFUgjlyzdQx99hLRqw0TivQcWQn9DTzu6haCWqY8m4FrndZzPZgu4I0e5ksb/VCPGJ+41X X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB6629 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 2d7ad1d91504..02419a6f8213 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 Tue Oct 1 01:42:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13817326 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11011006.outbound.protection.outlook.com [40.107.74.6]) (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 66306168D0 for ; Tue, 1 Oct 2024 01:42:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.74.6 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746950; cv=fail; b=RGNGfwBvxVJ3YFHAP4XnjCx67qx4T1WmM2Mg5HDhNbzKvtmPkmwr07zm0OCD5A8mvNlB8qPIzgIqr+lQSwHnsllgFF/jIY6JJsdmCDHwNwd0UTZT48sKiTGetm3E6kwCiZj2fWpWphh78lqGigz9ONXgT56PfINyBV21NqbBuo4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727746950; c=relaxed/simple; bh=xb40GE4ajuBx0Q+Lh6Rs3kC93iVnTmUTeCWComJQmyY=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=ARIQjlcIcmkMmAH05pB0TYvwtwXYGqacmT79Mn5bP+YcZBwYLzAE22EJN6Zn0mh4xAra4ZmosG8SxzNKoqiGJXxVtnBkHgOFaYBTaY/Ui1TECIM5xeADDHiJbNFFOGnDWZ8mP0CfeqM1uLszcGd6Zi4IRwLxhRgGbHD/Jivbw+w= 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=UnLw2XjN; arc=fail smtp.client-ip=40.107.74.6 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="UnLw2XjN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tubCZQaZCCa6MWRGU3zdKqqud8rPz/JQe1lr/bDfUAxTQKihhs/A8lclaPBeAbOJE9gUnxQhrPd94eG8i9z3/91tHmwTywjcmtD+Pu5l73ghRaV4z1NKggwM8CcSrGZSPS3Fvy94rC41VdSk7bIZIhBqiHQVwOPkaqFMlU7wKEj+qQorLUouXm8lnKNGHx2/QK1u5Tz5ordaH5qHOhKY9thVRlSjyiM9FlvM8QW3zUdj0VtlapIWDsqYVPv5IE1VCPwBgcpHNm86h8EKZm8t6jnYzMLpl1alRiVGMiY0IFKVK6V3XF0WLCT0Qtmcztc6QcIUN52WPcC7kCISdTrbqA== 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=a8k3g/Pk3Ze3aGPoPh8cjDldyCPXvXbnICn1bCHpVcg=; b=mkiEmWY3ntagoDXpF76II0LOgMPlE32rSHE8o2MFEZfCa19OB8sn6ukM7jc+RVDrfnEKH7YVnkSnkYj7QpOeD+Zebb/oqBfKy85z9u9G++P7AqCo+z9Bwcnwlizw2A3asqMJ8w1NGLj0nJ6x4bjfO5GnO4HmSZ0Qg5lBHE1B2FrmJvq1WZqnZDwpZxY3MXzUXojQqb+ATiJqzLB22nLjoo7dyHivrNf/uZcLvN7odw7n8telQBlYjqSjmE9Dy9b+9ZH0sAAIKod9UgfSGAp+jtUUbbAJtbSxNaqIkqsK/u0JWtJgwe5xKUUyZXf8AYdjrEoMoNQjsHFKY+7ZFwYZ/A== 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=a8k3g/Pk3Ze3aGPoPh8cjDldyCPXvXbnICn1bCHpVcg=; b=UnLw2XjNfndxMUarn4Y/BIcanJJK1NY6YRLS1JHH/jlDcZGlQKtTrErWematmGcEqE9Mq+HgshzyfX4moZpLpKn0zy4KtbUKikKbZIU8wQwovCaQ9EEXLfR6EQQenaJAJH9gUOq+38O7m/SDRIQaOMF0I3DiNvIW38+FmalSisc= 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 OSZPR01MB6629.jpnprd01.prod.outlook.com (2603:1096:604:fd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.27; Tue, 1 Oct 2024 01:42:26 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 01:42:26 +0000 Message-ID: <87frpgvbsu.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> References: <87y138vbv7.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 1 Oct 2024 01:42:26 +0000 X-ClientProxiedBy: TYCP301CA0021.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::18) 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_|OSZPR01MB6629:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ee35897-efa0-4b9e-c588-08dce1ba4d91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: R6qPIxNumPuNOnmNML5F81XEQLceJVjrFbX8iHrLLjisjIvioaxHIbD/k28VniLyrcbdAEDs3F6yNdixULn8GVf2znTUZpNFtlxkdQFZ+tqJNB/dzw/uSwEQSZaMPT/cMWJuL4D3PYnFR6uO6WHLRl6O7ghXAw322p110azhhbVUHVMAEl/rWPM0QhawDLEDxy74yBjCPJzXQjgs2ezK+npSPSYWRa2pTOW5BYzd7q0BW5pTVzXhCnYHpwEQ4fl73oKYeS50nDk+DF4G2U0y5swm8uKaI1XEYe2bmuR/RTEoAoS4uiIViOXxv2bxMxjYmMCzVCMNHknwNHlleB75d6FmG7FXiSHV2IGsubaTmKlTzgFsx3gzfAn1UGDebgkl8OI7cfTZGbaWMjCfvTMESYg0KZ5Zl6Y6YPqPfdGUxJ6hXQJlJAbDCg+GExAsNyLx/zHcoLjCXZmEP74zha9U6usvdBQ9ddHMgOlNWXXLlzUZJbCRVqWSM1chQ75ge3X7HXNgzJJ0WrKW5O9UXChLvarExC5dRN/EeMLNl7tKrowzsXzEsA+7Bvnsphor3p2KcqEnaUuXxZJOIedCIoEmf49N0J1yCfhdSoeJig8GRXedNc6PHSa3AUT9CS8W9ObzDmRC6QXp17Li7K1pFecjr+Td2ZY28ehQzt/DHZSaz4rJNxjTuMukxWwGu18Ldz+jFrjBSnPJ1zvcew3677hy0a8d2QeUY6YgQewoRvqrkhc1hOKdshB3yd6uvIHbcmzlA6fVsJbvH5hiLkyZlcEOJ+6z0hQUZqqw0mrTHcf7hIaT06B8uHqdI5bxTDtUuwV4qKhpxhgEqconLPZF6Fa0n0XLOXOoSH3D4YRF43R0GtFhkeEAF5wFXcQybvzYft6toFBGoKPYmFrlJBVKpDdIenPwxyC7w5qGv3fO/GI8G0Vm4kg2jFRHRR2Uaqkn43+ODAMBd2pkip7MYu1hbydxDiXahAN/D3miLXooZob65rFfaCrp23Jbmdj5yrTI2Zv4oIr7X4RRjYbQ6B7KUqQhndyw3FcmFA+czZb1ZDbUBNSQvsoxXyluUdfKrbdf2GQdpJpcCY8ZKX/J9d8V3hDdWAd8wqFo9UEShdmx/+jqW5N9VzcuMseWygpn5cX2nuGOTZgTUjYKJ/co5LsByAoElZxCTmfTOcnolJkHqBAKsm3iU3SAiV5nFYdI09R4R+LE1scgKwXyKws7TLYaf5rNbMxhL/4B6tPlsMInGscDBXRz8sqnvyMXez7oLOM3uyuz66mnOAaztpZd5SUYf9ZGwi8U8UA5x85XzvcBidfSjZyBCiPmAlIheYrDQkYRDAqGW4sDKF/lvoBrUDWzzBIsZw== 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)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: shp6pnBSM12oDBNt8VLqHtCzrbKHJ/PyqU9OlTO3TTiE7Re4Bz5fcb3OY4VBt0vRrXMA+B+RM2ySxfdrAzxrPFhPEFu2frEWMdr6RFUS9jsCF+ttusYqMtGEW4ElAFIfwMxUX+TjcwJJJWjESniV2bQ8lVuDTFbq/j9RqbPYDQkoX45hbptUjBKP5n92y6hSXJj7OoRa32PrF/hzkVAMEJBf+uF7WUCTPvWasP9j4IGK4HKDrrKjcT4KhMlTTf+l/BxDChiENIz4pWKV3K7a8ZjoEgzHLl0ZzqiMfEBX89jvP8rJQnmZNJkEbkf64OPzOutjIp4SJl1cn7w+CMBB/yyXKHAhBtg9topKR6YBlMuKd+n529hhyiKRhLW++34kPjCgh2Fh1yWto0bGBqGtO4C77QctLGU+mYJQv5y2m5DCcL+oJbS3Mz4+jZwgQ69p+ZOVLzf+hFZ3aDDCa+kzCV/GLwiSBZgFQITpYlvvkb0s7u04QNOyA6ixGh9ztnvYLsd4+0LwpbB5q8bhyEeATcbn6ZhNC4SwuUTXwxo+vY5nPkVf57kcQGksJBZyadUZ0SBwkBKjJnx3EwOSKcwAI2QMIE4L525wf/oyWUhopsIiN4qmLFI75/iqnVsl6NJh65FJKyGYX/HO7XIshNUqK88uif1eVm194Q3/x3taBXe6HKCWhroqJmal3j51QNlpKgCVtt3rmUrra+E0VC2HnFMOBJX0XWCKe3IjZq7KRI7+11ZkGU5dktp9UgRHtAjPNZ0rXHeXYHwRRWQ6EGqZABCRUPrDP3WnF57vzNoKx0rQeelwngaFZumuvRhV+yjsSuz1IN3KNDYclSLp0Nam3MLjXY/nPXItZ115mIPX99TxwNXrvg0QfHH+Av69xiXirWDR4I8A2kVpNwr+jsQoK41WXrYi86SAKY2+b5ualqil/UiRucBPH5ShXpxRf9FEEIqQ6vIhy7zS4/LpnSJVXRLcF+GEg+iSWW6RYrp3NKByRd3ciQZ77PFGT70jTcBzmFHnQunZvlyf23oN8XrmxA1n/5ayOuSr08Zb2pOWVEvUiyxnkuHmCuSiqb3GayQstG0WMjHvflXkIO5+I4mDiVMoy3kV9jC1oXIbRw+qT2yMPwBAA89FauVEz9atO96R1xdWbUUBLlO1Uqg5OU1TDbHCAkn8TYyboxpp7MMZRJtvaW1wJwtcfIYiuvnaFo8KplhvayCRdLfsEavSoA/e533qOcjpW1RDAih7ykKivVp8xY5CajVgC1NdpLUXShH4blebXuim0KATx1n/WO1pMYpqt2575H+d5nDrcnbdKRV652FCg5luCcAcGhXNOP5u/H47CcJda4fbPwbV7jRbV9+Ow8L9WTjvP5imWcAQSSja4H62b802JdvxpIIPLAto39hD2PZ/C84sxFiyOSmI7EYGsfXcnwL4F/o5t3GefQOllQTp1ssLAUBNn6dM8ol0Nh6qsiNyFS65qDDlva6rHbyMJWKyjFUvMX3C/6R1cQpWbm7fIcsTXg98yIqiErBdf0zkEhNnXX0HqWDN5jOVTQDk9yhbwtx6JTASRPMu09KjqThEOHy4mff+dMoKC7yi43pqrHkMh0d7Htbi7RdJfL3PpgLrbWdNRPN329aYXqs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ee35897-efa0-4b9e-c588-08dce1ba4d91 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 01:42:26.2450 (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: I8zCzA+vt/pwwyWBANv7Cf3K7LRl8+xPWfx9/yeoXHaE2mS804s6C++NlyOTejiT/7NPw+D3qJISZiu0y+rtlkBMOzAcBth1a9HujIrdrxmN1md4IvumLlbMZUdg6xos X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZPR01MB6629 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 27810f6f8630..76cfb6b11544 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2838,7 +2838,11 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *codec_dai; struct snd_soc_dai_link_ch_map *ch_maps; + struct snd_soc_dai *dummy_dai = snd_soc_find_dai(&snd_soc_dummy_dlc); + int cpu_capture; + int cpu_playback; int has_playback = 0; int has_capture = 0; int i; @@ -2848,40 +2852,38 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd, return -EINVAL; } - if (dai_link->dynamic || dai_link->no_pcm) { - - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK)) - has_playback = 1; - - if (snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE)) - has_capture = 1; - } - - } else { - struct snd_soc_dai *codec_dai; + /* Adapt stream for codec2codec links */ + cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); + cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); - /* Adapt stream for codec2codec links */ - int cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE); - int cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK); + /* + * see + * soc.h :: [dai_link->ch_maps Image sample] + */ + for_each_rtd_ch_maps(rtd, i, ch_maps) { + cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); + codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); /* - * see - * soc.h :: [dai_link->ch_maps Image sample] + * FIXME + * + * DPCM Codec has been no checked before. + * It should be checked, but it breaks compatibility. + * + * For example there is a case that CPU have loopback capabilities which is used + * for tests on boards where the Codec has no capture capabilities. In this case, + * Codec capture validation check will be fail, but system should allow capture + * capabilities. We have no solution for it today. */ - for_each_rtd_ch_maps(rtd, i, ch_maps) { - cpu_dai = snd_soc_rtd_to_cpu(rtd, ch_maps->cpu); - codec_dai = snd_soc_rtd_to_codec(rtd, ch_maps->codec); - - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && - snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) - has_playback = 1; - if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && - snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) - has_capture = 1; - } + if (dai_link->dynamic || dai_link->no_pcm) + codec_dai = dummy_dai; + + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) && + snd_soc_dai_stream_valid(cpu_dai, cpu_playback)) + has_playback = 1; + if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) && + snd_soc_dai_stream_valid(cpu_dai, cpu_capture)) + has_capture = 1; } if (dai_link->playback_only)