From patchwork Wed Aug 21 02:14: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: 13770716 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011000.outbound.protection.outlook.com [52.101.125.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 3F9E46A357 for ; Wed, 21 Aug 2024 02:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724206454; cv=fail; b=oVfSjwpFW3uZvkGEcE8rfx6dcyd0nda5swRMBzB80NkVx8wwGQ/orU3UzL0C8oS6FpISnZVeMap/KmMZ/7I/g+4h5+fKf2adDGhhHob2E2yptXdUpQy3Nc6SIHakk9lvMoVsXL20jSAn0L+w1kahlwG3GgO5tppb8YqqpDpgcpc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724206454; c=relaxed/simple; bh=R5m/4n1JoYnPi16p3LCIa2mEuJhAVRlRCjFtk+jPqoc=; h=Message-ID:To:Cc:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=RLEVSILCmxo5sIEijmb8Q1RidPtzTpPmwZMirwC/aoWigDAjiktqb5R65KYYCwPFUJzeRI4/KbGgnZ8cqT4Cs2r8rhujYyuQ4FqLyX/IjDwuqY0qZH6AhVzOKfnZ3vyW4HAnuwKrDJjGMKbXJvUTFk0SbKa+hZMTvaH1+s6erBQ= 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=mhP97ZUb; arc=fail smtp.client-ip=52.101.125.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="mhP97ZUb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wb0UKTURAdHCMWBF7DjJ8bUsMWEGfeN/gY4WrQdWKb7XWPlftFHZmNZF6YegvHnKeQ5wHFPbcMBLEEr62V6G1RZ9vt9NW6iR8ZTFxQTAqAzKk9LbuGUYUm28fG9mL9XSzZpwXzbsL9V2zwf1zhXreh6t3OeXArNkNtmvfCFo0SY2TwIVkAFy/z8qu+OMX1rK9HRf/6ZpdD8UBXa/r9YMx2/PGQGCr8LMwYBdVQajdpKOD5/0TMQfOAeivpcGUrz4wCOoS5fvMEaePFIdFNd6gY24VaXi7FbhmnSnuOtXpxDqHJSkeFShHOzRBa758UQs3WmCYFFHYDI5ZSvH1VTqfA== 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=w61PALYSiWkhH9o42uXVCAd/pnpT87hto831DJrTNiE=; b=G1k/o0RM/thxOobB9upiWqQ814PoNp2bJaJZOzaUrcG4XkIZUApdqiNVH/TPvvNSirq41c22K1FYPvZNxe44nug4z0I3eUzcJn7uDKJDvDFhWcsAsTGsTztl+jZSciBA3zqHQlcKq7IvOfsbWTMoqyvqEInOJPtMIKy4ryKnjRyMgtzhKMC2+kei/2knoClg2dhJyUZ/rQqPfLi4/7fXMGZzFB3gXjhHOHTgzVLAloHe4/FRzdEcFgD5h2n6Ar8Zh7Cqqw9eOH6v4QdpmmYy3pHE52yZqgFQFHYN9EetqD0iEuyFyfFxBDQrJ46c+BQ6UPUx57O426byNlkPxMixxw== 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=w61PALYSiWkhH9o42uXVCAd/pnpT87hto831DJrTNiE=; b=mhP97ZUbDPKZDb9xvE5N+L6zvR8f/Jq5lk9UTYvZfnyPBdbSkCUBP6rOOhr6H+TZBdgKCHIDmvYAz4WTj8PJN9TTdrSugUpUz2dBi2dHDDc4crbZ2zLiL/IgRW2QGS0eOGg47RDfGEu/lT94u5im7hZhWCtFceodmERG8kGmXlk= 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 OS9PR01MB12133.jpnprd01.prod.outlook.com (2603:1096:604:2e7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.18; Wed, 21 Aug 2024 02:14:09 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.7875.016; Wed, 21 Aug 2024 02:14:09 +0000 Message-ID: <87plq2aahb.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 Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org In-Reply-To: <87ttfeaaif.wl-kuninori.morimoto.gx@renesas.com> References: <87ttfeaaif.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v8 3/4] ASoC: amlogic: do not use dpcm_playback/capture flags User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 Date: Wed, 21 Aug 2024 02:14:09 +0000 X-ClientProxiedBy: TYBP286CA0025.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::13) 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_|OS9PR01MB12133:EE_ X-MS-Office365-Filtering-Correlation-Id: 6013f656-dc19-46dd-16fe-08dcc186f124 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|1800799024|366016|52116014|7416014|376014|38350700014|921020; X-Microsoft-Antispam-Message-Info: c7fk3hVyqhq+MLRZGgdjKlEtHF49AXJpkCxLvCouzrj0H0fREj50tKlBFxh6D66oYv60WL9EZ3jBgQkRWWF61DoiPGFkmclf7Kuj/TKbwTt8Of2FtI+4j+s4WbBJpigm9pxZoSDgSvy7WBl5Hp1kz9nmrgM1Rik15OQbm8+ZnVzDshyOZtcSkNVvPpDhUzSMJHrTHAlj0hhg+O64ELXVq67CaHAGRKJNVua/cvPrq8Vjh124HIuhkQpaqwSk1mc2twIfr8litaZfasUIIDaTn0EyhU3ON0qr7V1EDjTYvf98yxn2BtGcpBQ2WvMiSwarlPyPRJpnXHCzu4drEiiDJGcYlSqObcHdYnTXIYsMFPwh9Qd2ETGrAfB6Aocozi5vQWUFrN5+y7yR2STDXCEk9ugGIaNhVQ0IL0fEZnbvPjeUZjO5cthyx5R3SalhX+kNp91A+uvVGmstIx1V7mLhXvccYRTN7KK63oXtZqnNkC1PJwZ/1iGuq9lE9iAUt+EZoto6LMGl2gO6FV7l1mPxnnWli4l+jbBLNdoehTVz5mhN9nLqSIADkHhbSd/j8fEdx41X4Mn+7epawR4+iKtW7+N/R7n5RJZWeeQySEXc6DQOmd1Pi3GD4ZrtAfbPAs5fkVTe0yQ8V5NJnpYV9Wj6cw7ZeXKS/hPq1qJchdBjUhXc5joBO/GloQDfIGvzdati9GmI2mHVEeftUMXc2oBoXDg3DSgLPLUpLuhvKLT4owPkkTtpUUL/pqa9OCmmqWZ1uH+QIFdmEcIQyMu34bHYU5sjegaPXJxZxbuUdum6aQqP9VfKSL54y2tB3jCuSYf59O8G0BNlzqXPxxax0pgiX+Mvj9CVc+tBQkTw7low/gcIV/jPMMnSyeKLLo3qaEW2EU7jZWVVvXUEk9IV0xcpFSOAhb/0VGT63WfIqLosEYewdPg3/GUqw713tEr6AJzPbFw1PU8YnDnQ4ULBxwYcGG92SKHmQ94oRDovtmDRa+KQWfk+zg5zFegp7nweLTGwEhmjXD0OQd1XzWaS9qj2ZCVLf+vzvPZ1USLCGB576P9mz+S4Fz6ecvqAsCYMfaMXb0CWN4ZWg3WQloXGivCrT6trFU+deNkvo4vuWvJHxi5nhGBxFfff8oYQf8LIh/tyjPT9+N3mtAKCl8oRrYgaZbmnCsgYiP4G7mWooKWaHqyuIyr7EfbVudyXV2XgcH/eRfx9EHluBeGHRAd/NRcMxF6yMktyO51QdAQBgDzPArxz0/mlQqnZARkf6Ub5gJ/oSP5CagALRwQs2TWz8i+y8HSfO30xNjwTSBVVlW2V8bCWiUaw+c4iniBh3bfpQZqXGHqi0juMVf4LT/IZldrd2gBMvm4mGMV/pmZBc05Xvlg45aULbm9vcsuqUb7HGh1jVul5RKRfIgzecFyEutUgx/ixRctE+KhmPuOjWnWVse0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TYCPR01MB10914.jpnprd01.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(7416014)(376014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qm3WfzReRAYBOZvUCQw7WKaTagvhF9sI8xUe9R3cswbnFMN+IZi6UqkAiG71zEomUFJpv2fbqRyOtN0nh+yzbJe2bVW8336cDDzW3lCptGl+XFGG5t8iLA7svRA9GJmXr+jEVo8qR+Qs3nxVopp4CHt6kvxT6s+s5/R6e1fM58jL/lT1zMG/3OpNiU/rNPM7lHbiPenNkMFe6YoyTSgYHaMvlutgSoUa15pig4Gh4HPFOnK8fnqXJzX4hbw2pSdLKtDgbzGsY+MHoKGA6GVFjUHXWzYW3oqOO/5HFO3/WHxFJTDUtyNt5M/Z60upxCiuT+LAPztO/rsoigoZ1PdRwgdRR/DGg/bQ8xiCkJX21ZXtuidhX3R2T/qJxuEJ7kJCNxCh+pmWl7xPK46cRSM9AWYy+jH37qL9ed3ASk9FQkHoFpWK/Jj5Z/Vgy08L8Cd+mRANUs8SKZPUdiRD9d3SR9Hz6je9HuY2jcAfSbWcx4fJLjPmZk7djpLyVmC9vY/B9UIsH18Zv4DrcNiZmn71/pj/YCiRS7jP/SU6zBWuZ0qI/5iVGLEsm2MxguSp5IvS88mh33DuGSAc7T7yM7AEC7UK5k7zY9mBCkkkh/3W0rH+QwCQ9kR389e7guBC2jxns81fVSiMRtbwhZrpTWmAT0vV8kU6HPX8AQPZLbICP49s7cwwN5YTLYfkVhrzjGb9Ue8A9NRXppHhtsAsXGdV9O1RAa7TvYaawBeVFX3JL3vtnOkuKSnF1HwWrJjnVKAkxAZ7ZWU29Mql1hWz2LeFazDKaAOhNynlwXhuaBmuTebN0hk0y0tCTjPAQ3UAvlsJMEQYjeM1d/Foq3SLXqLTDTzLg+Ilfr0StfLDizm2Ldn5V4F9iR9x8pEK3DhyWwzZm0eR9NwEiw7GLm8GUbI33x+NK24yUFNDxFZxWM1pGWHvStY20PI7bmNdsw0pMOl4QZo10PuNez8xjn2vD7JVrnBSHFo+o6CpQunEDYR/e8YhJfvQGbb64sC0s64lHZGJVT6KacngUp6paJftJewjcAkdUtJzb4oWU9GWMzGSOYleJpBtDdG/hYfUZ8stI+7+Emn/StMH2shIOB7qoxu6yD4aMekUgH6VmkdN58VDToJmh7JZjquXfnoTbUaBP/GVtz3c89ZukXRX0ILqiGSDiBIOy9V0DN/rRRLaT1HpQ9p0xEXTnWQ2vxUlW/pyIt7p8e1DBaWX62/4TpozEs042vNf5dSnQKVSR06LoTcCizIyZJN+wN1dpLHbdLTRMd/YUmfsmsxvA7AM2JKAvd2hweNJXniJq3Ur+G+jRtSljBNVUk3z2Wr7eWqih0O31zuHWzWhI+GfKt9z2ntMiJaK87R/kW8hmp4GlUri++H375AymvAm1RNH/frcExBYXHVP0puYopN0eDP3tkvhcY6kMpMVjzyCANmGmUX/XMyzz+n8fO/ODiVaCuBueHuD50z+FGF+iJ2iA1fazREE+oi4oVig3djFsYvU5sZiCZUqbDbS/QMkxtZ6LsvrCwE9nwsfnDHB+72M77MLSMoOKKU+ninKPOYfTTIEsyo62FBSmF2GAyx6O/vk5wvlq6EIxbcXQMz9gywWWhKXQqG6jXAoPfd+zANST5W/x6er2+vQHFE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6013f656-dc19-46dd-16fe-08dcc186f124 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 02:14:09.6269 (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: 8CHEvACK72LtMkZeziK0rNN53FCZEiXLfvcyILAMgW0ofE8XEFyzXL0dI0U1K52YkEx/YamOf9VodlvPMOu7pZpbOtCoYUHPSLInbxviGUU846vKrKfOMLihh9hYHaUx X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS9PR01MB12133 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 09aa36e94c85..646ab87afac2 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 ed6c7e2f609c..1a4ef124e4e2 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"); }