From patchwork Tue Jul 30 01:02:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13746099 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010012.outbound.protection.outlook.com [52.101.229.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75D8D39B for ; Tue, 30 Jul 2024 01:03:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722301387; cv=fail; b=D63O6Ar6akNJiQ5nFHOHi+NDSmRnrI11QX+EIsLxOjH8Nzj6nGNivn3E/x5DpPGLl9I8Xatuk0frCNPd41i2CzEEn9QMorcTYdn+WdoTcxaGQN8SKRwhp0SKZTe6Ovt8rLeFqkAnfeukNvBP05V6rsbAbd/KhueIehKetsFOEXM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722301387; c=relaxed/simple; bh=iSU3JJsNU5z33Am48uwyctCzLsp+FdUOPoHqbrUbFKY=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=U/IY3PW8qiSu/OcPFq3p3D2vCWnsrkf7qwqShTf3CelqcwAE1T0uLtMV7b5h0B0ZyOolION9gaxayiOuIABTrxDQx1llKCF+XsGLV26ccxV1OdL/a8zdcHlYydBui8s3oIfDkxKca1U0cxxgARC/fGXi6fh4c5fvL++4tLmViPA= 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=n6NfTsmU; arc=fail smtp.client-ip=52.101.229.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="n6NfTsmU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yAObGC0lyyp99tskYkm7wjXBqpKAm1E2ct/cgKFbEIs6de5mFq4p5+cxN8BFkO7mUhvgGqZDQNEq68iv2ldbTYdGLEVUjDp5g2li0o+aC//k20c0r3C/wYxeHbUg+TkorKj8IM5jcdpu+3O9rkqSOrYdpmUTS9Imurqf+sHJgXYEq6Pr+1UgChXoF0jO3YYa/bbD+ELsYJYexdYGBGIfBk4EogMPNG1vU6b/XKmadjOhEFm/kW4lxRg1FVMDmH5g3MjMVg5FCez2UV07ajhB8GD4mmZRAqeD34g/fSQIowyy2IwA3HpLJL84/Zn7Avg/tNMd+4bgK07dM2DnODeERA== 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=W38nidIvKGQqFNX3kjmn0/hAzSh3plyKNuEVs3DX0iE=; b=T00rdNGN7aHwxo6wONhZB3tPCp1nRitE2lFt7abgOoe261ZlDN3wYf0l9OvjN6ZMwQmam2JWE4ZlyegB4cl3vmpyDX7N08BoHH+Fvyvo8rNaLmVWAZPh4ZWjwVPzYHuk3BI0h9ysGudhsOfhQXBmGYGcPp1veLEpQKBJ+skdZMaX6wSWeToDcKhQiihb5MaOjo5rB/7te0CyUm0okjy3WVAXTy3bFUfpV/8D/J0nnVvwQCY6Sh9PCk8a881ziM7+F5T6wq0urW5SFW/3Bjs5CBFCow+e6HEP3dmnBNukLJGhjfGACemo2DLLFz8hD02VoVPYHxZg1GElf1OHaKsA1Q== 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=W38nidIvKGQqFNX3kjmn0/hAzSh3plyKNuEVs3DX0iE=; b=n6NfTsmUPMkdCoYyhxmBnZrMFZ/swJhQtiSnre0hbyiNFJgwzT4mhVjuEfVOAXHZhX6rR4jN+aFIZ8ir2o1WLAGAgqetinv3boDkiNOfIAXX6U17j3W8azMxuh1CThhfFKczNWVOhnULqbV8EPabdFZFfbmd+r1PSdFSuDUc/t8= 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 OS9PR01MB12484.jpnprd01.prod.outlook.com (2603:1096:604:2f6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.27; Tue, 30 Jul 2024 01:03:03 +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.7807.026; Tue, 30 Jul 2024 01:03:03 +0000 Message-ID: <878qxjlmit.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v7 3/4] ASoC: amlogic: do not use dpcm_playback/capture 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 Cc: alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-doc@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87cymvlmki.wl-kuninori.morimoto.gx@renesas.com> References: <87cymvlmki.wl-kuninori.morimoto.gx@renesas.com> Date: Tue, 30 Jul 2024 01:02:52 +0000 X-ClientProxiedBy: TYCP286CA0269.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::20) 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_|OS9PR01MB12484:EE_ X-MS-Office365-Filtering-Correlation-Id: 54a84d65-e606-4c51-22db-08dcb0335779 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:13230040|376014|52116014|7416014|1800799024|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: 5Lj1kPR3aEwTBWJOmaS5i+yFlrNCU6FBuQSJRPTp5J7NprFAxTIr5k/vDY2gCkgfWBkjBnc3UytqYY+YPzHVUNUD0lcFmnW11M83KHQvxpUlm7PfGZD5MD9aa+C/Wvv4u4KtWiBMJwNTFmVv2RHyhpse7iXxMdzBBckh/Lu4yxzRwd/U8GtW2aagI9H55Os8XNxA1pF0mFh0FYoLSb+1kik/VNvz9YCIXVJDpFfM2iOua0sDrGXYS4awLhIjZnmG9Q6Rv+5NVLVl2uAT6vCERzjWvnQsUEEGzlvH3XnVafNLFN52NB8PQgqKB3NNDzTX2iKUj28DpGKuu1rG1oE661SSrFcZRIAfs1euOXv6anGPpcTcihvjRGQgWbVmbPpzboDtp44ODRKlnygmMCHRggwHCsTQZy0d+4+Dqo0lS2N4jrCR5ElwnPYsp1+Xr2k7sA7b6C0s4S5t+vsp2R/oGzURgXYILDa7rCnc2KN4G3XMoWCU4M8TcEhGLJkijB6RAiVXDHMuuJG6/yaSSLmGumBbCMgEyklc0NG8biOl/nCnDuXVp4ZA1sZmLIokdvbAS9fLJovUXJlIOb20mFCo547c06Q6ubY9MmOZnR7pCSHALl2X/kLKN98SSYNfS1C/nFkfMc/0D1JWbkUEg5KZ4oHNY1BSqtaRFw/IEajI9Hf6PhEe9MAzzcKDk+sARQxIY2R+EoHShWtwaL4Vpb2Kh3sDWDs6fyjVvO2a/dzg5CjaVv7lKwaib7dQHy7actRG6KfcrM618KX8pJt4C7h1mux+C+H67fAW29/OqrMEu2BzbsXhfCnXcTDUu2RaPeUJr0m7BBnnwoiELRUvVciBbLL9xBFmznRPQcPINaSlB1kWT+gkWkV34oQ10CAkueJScvN4UXwaBIhmG7Nx6geIiozeLe2WBZzW7sYoDTbfT+oGlHqSnNxnOFm4xZHXNdJ/puB9pRtg9O3B8OkZicGByYYXQXd8yrJu81txIqk8Y2ssHDlWaPSd/M5+pOfAOc8AABPCj3RM7xNzKui6B4hRZhC5yuW91IfWGkiQG0bsXUUxi9ww5ZLNul1iFDHaa3roENiigkgXt8vnxgrC4JZt+B45TaTvd6+XO/JN7ACwdk7YL2MTSEQAtb2QBfrSMb4P1WvmWhNSH3oqT0N2jCYHu+1oh4GuX5md8f2bTmAiGXx1/vMIOd1nR5wZrhL9QnKllHYvmOqKnCqUfnJVifm69MBAMgsXxPCrtVdLL0RCopLnjro9QQq9olGt8Ui/evnDqO+OPcnomraA9OJizngftzqmQ9+PPZtrikXQzx9mLM6IXq5jNatnDK4BYZ5rqjdyYrTFMwQE0emtHJiGQlNOn/FHj0lhlORRkQiATyvQww7S8esJEEa1qnCv7T0peB50rG05UVztHb/sYWomD85GQydiYIJdJDHwY9Lg0+RRs6Y= 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)(376014)(52116014)(7416014)(1800799024)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fh3rKw6Km02keMW10nCWISL+i/Dth7u21YrD0Zo4opyPBIGzrQN18jknGi0CEcTOOcuW2MmAU2TfqjPPwMpIYshyonvzaNhWNXZQMAZUKAclGsSDXO1B14EmbKHPFsM5CRa2aeaTFv7wY2KcyK45R98K7v8Ey3EPwAoPr8lljfLrKrq2RHK7tyJC6dIpa/FxXXRePl2D31ikABGNEfKhZFo9LAOC2xybkeAnJnYppkH2Z2v8WSQyFPW+s8K9vVHjGfFq2uJv4TzueMWxaVqyM/vOV3/Tk4n/FkSxotyoEkcojmAoqlWwq+Wphs0pcQUt7Sm8ix5UF2WRYphh0s2gGfxly2Ewu5FWWxLsilRFSTI0TOssMNLhpA4KHYphHoBt6h4gMg8IS/5hy1G6BQJisRwlZntM/sTDRBOBvklXh78fnNPiw0SMDNnhgk7R0W/9zuF09KbAIz69Sw++dceWP2C/L0SJWitrJeWN9t9Tsz9TGKnNbDBIA9EgHKnZ8flpcg47J74zrzMWtbI10oLtI9X3OqTGdudNgcBaXXK0ZwlEn1Kwv4eh1HwlcqKv6S0KWJfuaPmjF9Fnp75Ylnaw5KDKqxqvBO98VV5RCCllB+SZxPcuQMFkkQoMSd1RnA4xLcgpy/dY8/3lwf9kynotnJvKRVLIJVpOAMEn97D85tVy9kqoVQ7brjZL/tDDpVInTV2dzuQh5YZ5NbugTTfhCljNY054NptiFnCTHScv9tQ2NI3sHJmIOzbQA3Iw/Lt5vXQl2a1yPzYvcuC4XSmFAguVTTBfILWhZ/jysZxtzF6uj1zUvdubLLtbWQLTVVCGpMrrrh/kk+9VUnl8Xnhx/Fxbm2kH1xSXRh5uMUQeAwchHGJlxI1k1aqi8lm/ZTiR2KjsSGzInyEHB9M4LgNK6r4azXz4zHuD5snN458rpqnoXPnAeY8ulwJKFpZap6ZT65v9xdNA8IW2q+E71ZVBOv+qzBNOaWz70H0rD+QrgVYVhj+ACWEczvJ2j2QQYaulmx75NG1s6DzeRnxR9BQFZdKjOANzjepDPx24TPmQBoJdK2MuMtu3EQXw7yamGa7/Voi+j4YHTdNyGm7KHFTgc4MTvOrzFFFnOe3zGEdqKFX+WTgT+C7ks2FHuXUlixOYicqPLuBrYb6uAOhhNh9mTiTtYMnyNvtIdqOoMGZpuZHC+fW1+QH7ikbic0eaXivAWpoVcYTrbpWo56LUQipY+AXdPmQD6XCF4BeIl7Ca6t/VPNqZBL0T43h2JeUNpbnyRGiaookjXm+71QVvaLrmeMUl5iGvhDxBJ8rgHPCjyC0ZvViPujg/jL0ZOxOVTwgyeWtlJd36mBxWnjEcHSIhybBTbJgurE5DR+gQY4s6y0cYWfQTsLxtqB9yan8RKt8xiasPhxpGm8di0qGI5jObbNzVoCY3alaZ9+2amgi0eT4843PIJsE8GOaWecjB83kFldvD5Bu0CqsDlt45fhsFeXAGRaY3hTvjce30zxwCKLLJ9UazK2T/oMG/jOeC2wOENsXyn+UvjYHf77E8V9qmQ7sreUy3HR/1fKEcQ50XzwI+6FIPGA+rOmqIqLRhFXrS32LjTqjcsBvbdrGtoUSsSxZoKRYr/MpPE2d5S3nlzlw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54a84d65-e606-4c51-22db-08dcb0335779 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2024 01:02:58.9206 (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: c9r3clq2gE+KqJKzUI68iA2MEq7eUFu79HOYeIe7xDrIKHsf0/qsdjcjT2n+wLaKNJsMRPqOsgjW8OoRPS32L1AdM/CQg5pACKEyQGcGmHWXFyLOmuFU5vKLPrawF7EY X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS9PR01MB12484 From: Jerome Brunet dpcm_playback/capture flags are being deprecated in ASoC. Use playback/capture_only flags instead Suggested-by: Kuninori Morimoto Signed-off-by: Jerome Brunet Signed-off-by: Kuninori Morimoto --- sound/soc/meson/axg-card.c | 10 +++++----- sound/soc/meson/meson-card-utils.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 09aa36e94c85b..646ab87afac24 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card, lb->stream_name = lb->name; lb->cpus->of_node = pad->cpus->of_node; lb->cpus->dai_name = "TDM Loopback"; - lb->dpcm_capture = 1; + lb->capture_only = 1; lb->no_pcm = 1; lb->ops = &axg_card_tdm_be_ops; lb->init = axg_card_tdm_dai_lb_init; @@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable playback is the interface has no tx slots */ if (!tx) - link->dpcm_playback = 0; + link->capture_only = 1; for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) { snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i); @@ -186,9 +186,9 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card, /* Disable capture is the interface has no rx slots */ if (!rx) - link->dpcm_capture = 0; + link->playback_only = 1; - /* ... but the interface should at least have one of them */ + /* ... but the interface should at least have one direction */ if (!tx && !rx) { dev_err(card->dev, "tdm link has no cpu slots\n"); return -EINVAL; @@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card, return ret; /* Add loopback if the pad dai has playback */ - if (link->dpcm_playback) { + if (!link->capture_only) { ret = axg_card_add_tdm_loopback(card, index); if (ret) return ret; diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index ed6c7e2f609c9..1a4ef124e4e25 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card, link->dpcm_merged_rate = 1; if (is_playback) - link->dpcm_playback = 1; + link->playback_only = 1; else - link->dpcm_capture = 1; + link->capture_only = 1; return meson_card_set_link_name(card, link, node, "fe"); }