From patchwork Thu May 30 01:28:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13679615 Received: from OS0P286CU010.outbound.protection.outlook.com (mail-japanwestazon11010000.outbound.protection.outlook.com [52.101.228.0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0EF4134A9 for ; Thu, 30 May 2024 01:28:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717032541; cv=fail; b=rC3uP9P9vV3a0vkYcQ67t3/E22a0HEMKS6GZmHqVYKem/mJ1b9RYNjplmqI5+sM3EvF0bQPPPUxdYcD6fVi7A5Htgo0NvqNAIaPqs/lIb/CZXO0I41hjFIn3VTm2IUzFUtaceTUY6B84J2z10LNXmrix9ccgisX+WlUfJ4Q2jEk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717032541; c=relaxed/simple; bh=RXHw0bWwdazeYfIzE8TIzSEFQiFDvvPclo6OUZPs8CE=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=SmB9BeoTfY9zub7ufaxpSqeOoFM86gIwsQpGvFKp8J+7aXizFYGoQxGzxptui3dHyXd+WDe1EiE4sIAH7Dm7iRUIOk8g7/fgAxymOnN3qaMMuQKa+oaV5a2OSxS0tHCBUKMmWEyt7u9tW1IJ9ukHq7tx69TlwgDW+NF62s8g6/E= 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=Uybn2dP8; arc=fail smtp.client-ip=52.101.228.0 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Uybn2dP8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E1igNCf2gexkz5M5df6Wfc10LF+/qJOsNpm945fwpLBul1QIzul0ZrnH2dAMox6YD6JITBdVg7AJ4ehyDQ6Af4oxTJUhSgFGRSTS9Z5gocyTmyhHhI9DVvLeR5XK0E7BEJ8K7ycJSwIXhG3afAEwT5tu/qL+XWAlybK9QeTe3WUE2BkLxAy9LE5MiEK00G8+XZFdwVAYh4nrsRymZ3fQSeemb92CnoMmBeK7KrHXIjL0860/Ti3Iw2+tBitrkiI1M090duhJz4QOIr3rvJil8RB069HijyO1/+jCAhp9BJ5rgi0k1rHKLRJEsAFyAkmOPXJE8KMnEp98lZG04rlIRA== 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=8tLkaEgdWmAHv7t2EHwbzIhchQhVsXuUC5KxYya9Hdw=; b=QQNlBmS0/TqA+R05KQvhEDLa47q6qVEUrqQ20V6SjGn5J2ePm0HzTSp68Bg4XJuX+stzHrvDYL0kv8irUotYZCEciUuph0qH6Fi7ZScOZKh7g8Tde8v4mmo+gG0K1eBEbbjdAiy6CQQalwVau0Fja1nIVQSaU1A1OE7EedpgGP0U6mAoldscyC6/N9g4ltWe3VxBtaVR3MDqCiTovuxBUYVirkCCm6c5s0XH9afAKhJMN8209pZ/UfV9S/Abe4knc8UcuE3EbNkjzXYNLIL0voaTRc2ODpLIsbH8AavRLCilmHY208KR2DNqaPyqah5q23I6TqE7A9uiYEmot34rcw== 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=8tLkaEgdWmAHv7t2EHwbzIhchQhVsXuUC5KxYya9Hdw=; b=Uybn2dP812Y3RFRDDYb0yjRxhzmfrzhVjM/KdJbA5i4m+Z6uWp4YStMnvbVMb71Ot2yLLzgQFkl9pjbcz24AtkXT0hF0vt0tl8Rqt6CZ6M8zRm6oJyET0x7fexee5wgF4bGY2yuNuh0X7b+PVFmYQ6coyVh9zTYrOfU79osvtcg= 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 OS0PR01MB5524.jpnprd01.prod.outlook.com (2603:1096:604:a6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Thu, 30 May 2024 01:28:57 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%4]) with mapi id 15.20.7633.018; Thu, 30 May 2024 01:28:57 +0000 Message-ID: <871q5kqe94.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [RFC 02/12] ASoC: fsl: remove dpcm_xxx flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 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: <874jagqe9w.wl-kuninori.morimoto.gx@renesas.com> References: <874jagqe9w.wl-kuninori.morimoto.gx@renesas.com> Date: Thu, 30 May 2024 01:28:55 +0000 X-ClientProxiedBy: TY1PR01CA0187.jpnprd01.prod.outlook.com (2603:1096:403::17) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS0PR01MB5524:EE_ X-MS-Office365-Filtering-Correlation-Id: afdf9972-2311-4472-16f5-08dc8047e01c 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;ARA:13230031|376005|7416005|366007|1800799015|52116005|921011|38350700005; X-Microsoft-Antispam-Message-Info: zZugTvt/GhVq18LW4vQtijDRHN6CZTvPW95MNXjOyvjkW53NyxHaG6+M5qj/yY6M/5l7ERkPwUj6X2g+mO0zqTeQVaMSMKL3aVnOFhXBL3YjH2DJNde8ZjYJ77qyOpvAEg3XMXDoNxAzO4S3baRYfZKJ25pOVGI173JLJzKz4f336m0hne3K/IVTQ9NjmWeRHTcGTktUxoLcUQh8f3jeZ2e5k3y+ES93D1AAw6+QrhUhqk4Ei8AvJ7zSkqvFvEV/ZCTVFsm2oWsdMvCBCeJx9mOvzs3n/yGdORjSyIKSPFT2fUw9bMaXRZwTrm2/tYXkUbk+n8Gw0fRKyCZxAmardar23cjePIF3hhCe23XUZR1kdA/oHVfT2EpZRLwQAsLncEsvDEz2/mfD5qnqLlkO9dUCUAPMnvWJMiTpMxzJNNZTa63oUCjg8yu6dJXPHhWhmrwMxaMeWIgC2jyjbY6wlUtjPybXWlXhpzjvu+3c9SKHC/XYMznWZJqSPYjovfU2NSsxbajDiTMOYYPtSrRbiUAU1o7PRLSmeWAMG8Q56WtDCKkbPv5qFK/iFGSxnDVOOwufVNxpIXgoZzTtbRa5/sCGX1/gLtiOKYaNOx5GmiE1CN6hq+X6ErcCE4YdVfXiU5+OcR5mfgI44F0vhCxeQfLxskeV9RqdMWInGw7CAVDj0ZdIdditKYUPY+9pxetZk+xxzpjCggwWyjTlReqHzlhZQJkNlHqT5doq7MEZYVKG5kJISlcleIp+3fdkhayUL/0LHo5nY/7iBwdmANta4400ga5eghKjsZhnvIbiEsWCt5qcXBoK4nekRTRkghVE/G5Y2tOyU5PbA+L0ALl8cgDKXgOkcTpn+l+cQ+oz1xS33K7uNKjTwUTEALvtbJWhH0C+VpKXjvCvSGdWUcJbJXIg/twFSTb7mt+gXXOXAe+Xb021vjYf0i4F+2InpcRtBNLoz6BSzlswvW8f4UMh2kcTgOSJ6+/DYrFfbDE/m8uoPmTWzdhV3/zgeeZ6oNP/o25OuPDBhI94wEE+zfKgzOXDywrlv0q97Y63k9FiWKm9pzUbYQPZj139YmX8HBGtJnOfWzbQAm+YUJIOJogKXPyUjIjim4H/kJF1m+iNt4W9ECCuhINv+grxBH1IzDWQWQL6AorfyRMT3272vbUDDTp7eOYjgsWyVyC+zDgoM5keRa2+bHcCA+rWAxC7PEf/eBXDDmkE0aR11shoYreCSyHpDRUmcNtrV1RHzvlrCc07r10g+GbCCgEQFMNDvHSmYFkLNZvYPxGHNqQu8Xkl2xmwfFPBgRuMyh2SwG7pKmQrK/ahH4shW8I10F53WB8rRr+O+smELwWx5RvF/tg+lEQh6niASNCOIFlLqI56Q2Y= 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)(376005)(7416005)(366007)(1800799015)(52116005)(921011)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qrxJyYrBfTcpHG2aOl4xRmfizdU4TODCP2btQTocRHm0vsdl8GnZ3l1G+gSXUiFWzrCvBSgQobSLuxRQrxH1rb3dDEqO7SOb+Lvglb8itA5qOwCzXioPoqUC4GqtzhFFg9bVGJfd5Ed0tWLazXLcsGO9fuLuA7vfHK41mAqoFU6ZzxCPMaYuGnODRr6OnqNR7D+Mt7KpkIG4vcYysGo9QIJMTR7UjXf+DqKpXsjWk5pYsLcQVpf/BZiyD8Gb3NvJPQF2hkcmvRm4NKLvA9yG0u1qopMTTiHGt6nUQRRtv70xCoiygKceP1FgBNCXShX+VOnuMUdY8kb5PKu8u8u8zW1Kxl7CcOn9sIi7dNFv64K8RuGAlxJa5L6hug+/VIEW00upotdRbRgz0SfrDexd450AYTWids1TxqerNXuTgodKf6wd8uwBywwLJWPO0OgnBc2OoFTfLhHR2ZIZYG3xgjL9zpGQRDUtFuj/HntWyAvhtKZ+zQFqws8HnBZWwGdn90AIVrX3QR6m++Mx7C8H8Zdj+GuRcN4B+wGPd29+S5ebxlmx59YNsR/Z2IFSIbiPDL0rBbyKZlzkBLLLKB0zw5Va0P2ubkptfc1Ae6rMNAdsA2ffUTWNiDE2iT7u/Gk2qhbrVqd1CAduf0dp8Qu2bMZj+jWwrXv5XwpattuzUkxJb+kWumDczyhGYQKKkJfqQns1Sa8r2pthfaikF5qhWehDDk+XinlrnVdoBv3s3u3C/WJxz4ma94nA9onpH5+ypwRP4bmBNlukuMQwe0tzAEGA2oB+cTKnLVISzN//XKnB9eZg1Uz5OtUIwYcZ9l2pv/Rlz9SwW1B+EGgfvZi9vVY9kFZQ/2R1n3a0zax9Lc70X9lCUKuFnpKVTZ0Sc4JCLwtm5jcD7T0Prr14zYfIaPX+s21ZHdkiSbcgA5EWvzH2jrbPM58NeQ4InrZPquQWwoKMf5IIDKrfIZc7ggWEN2/xKhFaHLGDrLVkUHa9zj6Fv4Xho2rFM79dNJ65F1k0iUGY8wQw177eJbBG3h9vm0jNkQJcowBLm7dWHek4DrqxV0V43nKz5kywlHhyYSm97pcaP8fO6kDP+udqw99okvT/XG0fJjIZ5DfEoG40nwfPLsk3BP+9jaoq1VjGz/XHHWoHripMjAgcfnFJ8FOj/yggucpy5DwmvnH+H521x1IJPFaoDL7D34PNXxhbTxKtaYY8xMQR69h8O1ypPtmdAqqYWs4rHadKrDvc0K+huqo0vPBhztscevrH4NYusv6TJJHSEoGwsbQY6wY80T1qjdWWWUjK8x5+ubmZK/z4d3cZ3FHe8XzDXyPHKxz7HsvsuEDmFvCC0fgpe+RibicUdJ0peTfjxWs+1Z74j7ppz6sd8eScNaAoljjfFbcIlXDrMh6diBkOGRCXGe0CGPgl5HtCBXIU8KEyvGoR57QKyPAPU2HrqJfhz5Zyu6Pg5bXs4jj4s+ARXEvo5EDYPxXjyce+eAMDxMl2xecvtdVubePfcUAiZcT23SY7lP8fnnvLTexfj9BJwvxzQECJzy7Lkfdizi60YlP+N3I9Wjj6QkuUgR+vMjyo+qzPreR/kZc66zKyz1/gRB8xEx8D6PgqxCC+u4DiE6V/KXyNlhs8ls4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: afdf9972-2311-4472-16f5-08dc8047e01c X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 01:28:57.1903 (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: zcS7ar2uBINEWipbZFTrrgMzC+EelQrYkvWkYCf2gw80g3e5J9VJT2jNSjWv30v56tzquoTp1YabYWgAu/MlUFmiVD6Tiu1DmTWJJsjjg4FhH40o/ttyu7bj0GwndV73 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS0PR01MB5524 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 | 16 ++++++---------- sound/soc/fsl/imx-audmix.c | 6 ++---- sound/soc/fsl/imx-card.c | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 5ddc0c2fe53ff..0b15f89c7bb8a 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -320,8 +320,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, SND_SOC_DAILINK_REG(hifi_fe), }, @@ -330,8 +328,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, SND_SOC_DAILINK_REG(hifi_be), }, @@ -649,8 +645,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) } else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) { codec_dai_name = "tlv320dac31xx-hifi"; priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS; - priv->dai_link[1].dpcm_capture = 0; - priv->dai_link[2].dpcm_capture = 0; + priv->dai_link[1].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; @@ -676,15 +672,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 = "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 2aeb18397bcb2..8fbd6fc8af76c 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -258,10 +258,10 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[i].cpus->of_node = args.np; priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev); priv->dai[i].dynamic = 1; - priv->dai[i].dpcm_playback = 1; - priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0); priv->dai[i].ignore_pmdown_time = 1; priv->dai[i].ops = &imx_audmix_fe_ops; + if (i) + priv->dai[i].playback_only = 1; /* Add AUDMIX Backend */ be_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, @@ -283,8 +283,6 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dai[num_dai + i].cpus->of_node = audmix_np; priv->dai[num_dai + i].cpus->dai_name = be_name; priv->dai[num_dai + i].no_pcm = 1; - priv->dai[num_dai + i].dpcm_playback = 1; - priv->dai[num_dai + i].dpcm_capture = 1; priv->dai[num_dai + i].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 98b37dd2b9013..c4647ba912a63 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; } } }