From patchwork Thu Apr 18 04:12:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13634107 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2077.outbound.protection.outlook.com [40.107.113.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3267C4F8A0; Thu, 18 Apr 2024 04:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413583; cv=fail; b=J9zl0H60VkZOXWKYIuNrMBvnvHaKJYO0yghk8MhdLnSwr0LrwCmaqtQjIzpMV48db/06Xvl670/1qy57Ve0GsL/QbVnlHJCgUkxnWvAAnpQ363I3k37f6R0bTe01VDLzQNWs9PdfM2/nIzFBS8R2WyjjpCdlrK6THykiDmZ1vp0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713413583; c=relaxed/simple; bh=JnuVnk0Z9minA8HniiO1g2nAXIo6aIenJaNDRrsFfkg=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=rAy1iBJlUM0E2jP4vSqGzCixvOOwSvwHeh+QRT4yIgDa6Jnr1lzXEEeuFj8xiPUqSbW3IWkJPP2Tib3ColrwPAKR+A88ssB5gHcXk4Sm/3G6C+8+DRhz+wam+/cBXZ/B0BMZaQt0dmLYo+DEddbf2fvpHtAMXJ2bogcwVAiYVGM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=BCHi0LbC; arc=fail smtp.client-ip=40.107.113.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="BCHi0LbC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZVEucRrX+na59gkv0YuKmonpptfYagqgT7K1KcRC/6eDbQuqW8vSo6lO0gdCcL17LzONVqA1TGPMFJaRPrac0UJ1AzrZB+62v4gVRyfgu/rDxwFNXnqM/djAQWECKB+nKLRNZ6bSJngCDjtBQqxaAaK7GcyYrD0Ppkxz2NZkkoVNLo4k57LajhybmjsL67tUkW7DgNxuZYDcDh/hEp7SkhvRw5Cr9w/8eX7EeUu3xoh0ssvUoEwtUmk3oCuSqMt9oE9jkNMdU0baa//IrR2fdrtXMtOUUZCVbE6518EmOH9rHPBV0YY9se7ANcR1iP8sMFEWjQd6BS29JMfVy29o6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+ExCgHEOfbbHNJhJRximSp3UYcePnkswBUYV7/yJmQM=; b=bEwkOxiNUu3qAHrCrHnwhEps/2jyT47mJRu6wY93GSOWwOh30YnUJSXo6M/KPxQ7Y/SrHg5kVZW8TMRmxPcAmhw+4Z33cCvXKDlUBF1aGpqeHo/Waw8hpf5oudYImRPJMJrr1vOO0Uavd21OmaoTHIHuS2KyuM1dmAZmP7PszvyxdUZdERH2LsOdeWu+JuIvIkhlh57ZROUlgktQiDnyFMLOYOKuTX4zdfRdTPiZ3kU5rV2NRfXUURSAQFGlDJIDa5kxSkOCvGudhjxDjjcVaKCQ8RAbbK/Azbztv6f/rzAr5W7i72+6/3Lhf5iDF6Ii+x/CbwOsxTJJI/VSBu7Qvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+ExCgHEOfbbHNJhJRximSp3UYcePnkswBUYV7/yJmQM=; b=BCHi0LbC/uQRbVNPoqlRse01oDJIbFhgcvM1Wajx85Cbs3BNa5meykUQ9bikn6OwUe1HICwu21lDXl/UcbKubPb11LMn/kd75ANRWBQbXX5Nnv0RgpyZVDzCnGC+YfJFZCgo0OWL1e/TbcR3NgUzJpAtiJmQ9g9tktgUL7KwjvM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OSAPR01MB7397.jpnprd01.prod.outlook.com (2603:1096:604:142::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.39; Thu, 18 Apr 2024 04:12:58 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::131e:55c0:a4a0:713b%7]) with mapi id 15.20.7472.037; Thu, 18 Apr 2024 04:12:58 +0000 Message-ID: <87bk678g1i.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alexandre Belloni , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Charles Keepax , Claudiu Beznea , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Jiawei Wang , Jonathan Corbet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Nicolas Ferre , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> References: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion Date: Thu, 18 Apr 2024 04:12:58 +0000 X-ClientProxiedBy: TYCP286CA0354.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::17) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OSAPR01MB7397:EE_ X-MS-Office365-Filtering-Correlation-Id: 5044d146-6e62-4901-dcf7-08dc5f5dd496 X-LD-Processed: 53d82571-da19-47e4-9cb4-625a166a4a2a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1C8kDe5Ji0aHgjr5K5xtDLPar6cfRcJGAdCZMrSuhSJIv6KP1kV/cZa6K3Q9PVkstV0LnGvIfgtio3/kdYXiruA3bcSg/EOga6twKj+Iv517tu05jwzzn7QYAhAXz7AKRo8qsS/PKRWJRa4sPvN58lyyfBS10DtwOdCzb6KFKQxsyYS5M+EKVDrq7hFfXJnCBJ2ey9S8vV+Il1E42JOrVdqMGtm+F34H9+99/nrRw7v0njUZdjfXmK/f8IOpB7NiGWgQvv2+zGCDNHnyCtW/WBsUV7SQ6zkbkXJG9Uvr6CWS5+vk8ZwS0Dco0aOp6uOwUSC1XCZho7nDXyVu89Df+zK5YgYytsnDy8EbqNmmoerRY2iuOeJNFfcVeHJJO2w5iU7wp5qsSiO1pePR6il2vsFIdtoebNGrwpWlWbq3CWRlQB7GctVLhJgJCrUeHmlvl3by8tdw6O446S0E7zHOeigbCo+Hmgds8ZRUuEKKwaMDqRxlcen9Ud7nEndoXPTB90IlvaUIwvw72j6twolWh2NgmAkuoS2xYMGGCSLbblZHnjZd79/HPmN/FHWyPKqO3HgBdCIbCkiOgFLGpn8fQQC4fQ1bXaaG1fYzeiWQ3x52L+Mpd8MJfR+ULKpF3XPxpvWnyivRJxW7VFYiglscjbFIgvQsdd7u02PI1UdWQcykzcNEQHaNYv7DWNykBgKVIJgBwmxBM30GWptHNA10w8xeU820Wqrbf80cq7v7wOk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(52116005)(7416005)(1800799015)(376005)(366007)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b/QPaIeyVzq6CZNbX0JxTKCScCHQbnMh4WAvAUyRa3cQxE4sXv45KUpfiPyUiJpw+dJ1190dN3fd2Jo/4ApkHL2h7iBwi7TKfcwBGympuh91DakK0UO57XnUXJVeLLNeaFK6KoTJ8kZZyHGBCQ/6jqzFekB7LS9SqJyMJI2fsAmJo2Of1HYrXgsBIsHzVtM4M5gG2su+rFyEdGnwZoFeQDyxZ6DblNDYIhww1Zjo4ykIzrPFtMZ40IQX3fjrOF5iCfWelT8dJQwykEs+9csnVB9IwG6/qlZp8vhkvY4lp61WO2slhVdCVchZnKSV2AqF+Vqyaau/gnqgjmQ3sXbFbGMYzgZViF3y9zyGYcNuMhTns+SA32QGBVKy/IFdICvvoxFjz/Uuf+mb2A2o0oWRxAKZtSCsu/VheiK/eqWtXxqBqrEbmzOB5KGQZcjfTHkXkUcvssqxLlYV5sRvrPtVCpR85ybc6AwYAdIB+LJCdnA0RCl1eUt0dgHPwkX9MfwG2tZrqaAtbyAShLKspvt0gyaiavc3sv+sEE1A7PmdA2s9XWwbec4PQpFoTWpLLR2VqSOoG6Bin11XSW9eic1Pf2aWsycFHjLDdXCvhDC6AS5Isi0Cxo9nBk2HZTjvTWCc5RFs0kmfS8nZBDxPH85K4aQEsLsG6cgvfLFQ9sC2soupe5h5CKsWdXMhfVJGgVdEDwutgF9oYgA5YWGsuBdevKU/jCLuSDzJG9CkE03u/6uq0fYOobLDpRMHotNkOU+Qz6DXoTlx64MSUq3RUGN3NfVH5AedHFTfsCAW4/Yh9UVFikTGpAV5W/4Baqi0QzOkIElzzyAVUnnOU7aOHCZBqonNBIktv23T9OV9oQrFEszX6Y9WS96juSlx13aAnZsHyGvcFqHrmRE9zcWvWfqd8fSlPU4usPjTKxt8Oyre2oTePjkqNicJo0mqH58/YpuNxFHDmRMfqSuRAG015d5NaKG33T9kfsdz1AHwxBdmEZWvaq5Nj26UxuW3KJmcZq0uTMchJhNmA5zjGaWZmKsZkS5tWrurAfGy3rmx4pouJQ79YgsScO/mLy5x8Q3tvklH3baxieR5EVsglf0k+hx5L89S1Dj+ENDu8rwoGEv/Hiljdg0C+TVZUcWTnXVCIDR8TMY0+L5jusu04swk60QIhdr80L/Seg4R5oGanmWEjyckk4KjTq3IfBdkI0++ICE4zG4RiqAwrC2LGWVNP+AqKtCrrs6PiUgrbpTSn8/u1a6s8i/7zCEo+BiEFEPCXqqZlHZUaC5H5aIotXrxMdaUX2j8FrydDVvuZWKZJKcHA5D4h++yRudeIFkvyypvZIqJXtT9IJzxefb29YbOm+//LpbpWaD2rRd4oNeE+IoVxmB/dt7smnHXmjTeOZgAneX3gBEmHOvxcowYaZFD7hQiBGQ7FIuMktmRxFX8/Iic1cc78EW0x1mkVqdHc8R4vRlFtfuZjOSsvlfln1vkiauWy6U0JLQteut7aeaODZ3wGI1Nz4M6EkYtxJqIOXJTgWnO//zUUaovsJ/b/K8/w9rI/oNMxKOZ3/31ySpqt6Y4a3lWzltlZvOqj/t4gl20A5aGz5Wa+9dOLgbrWksRij1IkQZecqHBtY0Mr0+RH6uKocI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5044d146-6e62-4901-dcf7-08dc5f5dd496 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2024 04:12:58.5317 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6iOVDH7YaytnSK9qoHNvE/eAm69KmT4szsyyYzIUbSb01TfjSEZs3sez2fkf/nydTJ9VOuimPHx3Ez9/FZgQ0W95KkYEXi8YCxVtCBN6eQYOdXJ+hxu3eVc8ClxrNq/Q X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSAPR01MB7397 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream in same code. This patch converts dpcm_xxx flag to xxx_assertion. Signed-off-by: Kuninori Morimoto --- sound/soc/amd/acp-da7219-max98357a.c | 20 ++++++++-------- sound/soc/amd/acp-es8336.c | 4 ++-- sound/soc/amd/acp/acp-mach-common.c | 34 ++++++++++++++-------------- sound/soc/amd/acp3x-rt5682-max9836.c | 8 +++---- sound/soc/amd/vangogh/acp5x-mach.c | 12 +++++----- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 77cf72082e73..b7ff9c12634d 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_da7219_init, - .dpcm_playback = 1, + .playback_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_play_ops, SND_SOC_DAILINK_REG(designware1, dlgs, platform), @@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_da7219_cap_ops, SND_SOC_DAILINK_REG(designware2, dlgs, platform), @@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), @@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = cz_rt5682_init, - .dpcm_playback = 1, + .playback_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_play_ops, SND_SOC_DAILINK_REG(designware1, rt5682, platform), @@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_cap_ops, SND_SOC_DAILINK_REG(designware2, rt5682, platform), @@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_playback = 1, + .playback_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_max_play_ops, SND_SOC_DAILINK_REG(designware3, mx, platform), @@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC0 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic0_cap_ops, SND_SOC_DAILINK_REG(designware3, adau, platform), @@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = { .stream_name = "DMIC1 Capture", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, - .dpcm_capture = 1, + .capture_assertion = 1, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, .ops = &cz_rt5682_dmic1_cap_ops, SND_SOC_DAILINK_REG(designware2, adau, platform), diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index e079b3218c6f..ccd355cf3703 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -150,8 +150,8 @@ static struct snd_soc_dai_link st_dai_es8336[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC, - .dpcm_capture = 1, - .dpcm_playback = 1, + .capture_assertion = 1, + .playback_assertion = 1, .init = st_es8336_init, .ops = &st_es8336_ops, SND_SOC_DAILINK_REG(designware1, codec, platform), diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index 665a6ea0a2a8..23172b84eb34 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -1407,8 +1407,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_sp); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1444,8 +1444,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->hs_codec_id) { @@ -1480,7 +1480,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) } links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1512,7 +1512,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_hs_virtual); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; + links[i].playback_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->amp_codec_id) { @@ -1527,7 +1527,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].init = acp_card_maxim_init; } if (drv_data->amp_codec_id == MAX98388) { - links[i].dpcm_capture = 1; + links[i].capture_assertion = 1; links[i].codecs = max98388; links[i].num_codecs = ARRAY_SIZE(max98388); links[i].ops = &acp_max98388_ops; @@ -1553,8 +1553,8 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_bt); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; if (!drv_data->bt_codec_id) { @@ -1574,7 +1574,7 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(sof_dmic); links[i].platforms = sof_component; links[i].num_platforms = ARRAY_SIZE(sof_component); - links[i].dpcm_capture = 1; + links[i].capture_assertion = 1; links[i].nonatomic = true; links[i].no_pcm = 1; } @@ -1613,8 +1613,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1657,8 +1657,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; - links[i].dpcm_capture = 1; + links[i].playback_assertion = 1; + links[i].capture_assertion = 1; if (!drv_data->hs_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1686,7 +1686,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_cpus = ARRAY_SIZE(i2s_sp); links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); - links[i].dpcm_playback = 1; + links[i].playback_assertion = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1724,7 +1724,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].platforms = platform_component; links[i].num_platforms = ARRAY_SIZE(platform_component); } - links[i].dpcm_playback = 1; + links[i].playback_assertion = 1; if (!drv_data->amp_codec_id) { /* Use dummy codec if codec id not specified */ links[i].codecs = &snd_soc_dummy_dlc; @@ -1774,7 +1774,7 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) links[i].num_platforms = ARRAY_SIZE(platform_component); } links[i].ops = &acp_card_dmic_ops; - links[i].dpcm_capture = 1; + links[i].capture_assertion = 1; } card->dai_link = links; diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c index d6cdb6d9fdd6..dc329f611f34 100644 --- a/sound/soc/amd/acp3x-rt5682-max9836.c +++ b/sound/soc/amd/acp3x-rt5682-max9836.c @@ -317,8 +317,8 @@ static struct snd_soc_dai_link acp3x_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP, .init = acp3x_5682_init, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp3x_5682_ops, SND_SOC_DAILINK_REG(acp3x_i2s, rt5682, platform), }, @@ -327,7 +327,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "HiFi Playback", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_assertion = 1, .ops = &acp3x_max_play_ops, .cpus = acp3x_bt, .num_cpus = ARRAY_SIZE(acp3x_bt), @@ -339,7 +339,7 @@ static struct snd_soc_dai_link acp3x_dai[] = { .stream_name = "Capture DMIC0", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_capture = 1, + .capture_assertion = 1, .ops = &acp3x_ec_cap0_ops, SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform), }, diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c index 7878e061ecb9..cd5b075d4b7e 100644 --- a/sound/soc/amd/vangogh/acp5x-mach.c +++ b/sound/soc/amd/vangogh/acp5x-mach.c @@ -276,8 +276,8 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -288,7 +288,7 @@ static struct snd_soc_dai_link acp5x_8821_35l41_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_assertion = 1, .playback_only = 1, .ops = &acp5x_cs35l41_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, cs35l41, platform), @@ -375,8 +375,8 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, - .dpcm_capture = 1, + .playback_assertion = 1, + .capture_assertion = 1, .ops = &acp5x_8821_ops, .init = acp5x_8821_init, SND_SOC_DAILINK_REG(acp5x_i2s, nau8821, platform), @@ -387,7 +387,7 @@ static struct snd_soc_dai_link acp5x_8821_98388_dai[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, - .dpcm_playback = 1, + .playback_assertion = 1, .playback_only = 1, .ops = &acp5x_max98388_play_ops, SND_SOC_DAILINK_REG(acp5x_bt, max98388, platform),