From patchwork Wed Jun 19 00:19:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13703265 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2087.outbound.protection.outlook.com [40.107.113.87]) (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 9545D1C3E for ; Wed, 19 Jun 2024 00:19:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718756396; cv=fail; b=nS65nOkgVsGaqM2HPyZgWtr+K0yjriMiSws4bAPucuJfcsKsKAccMQp2PZd7vuNWAAEeqkiwus9HCC3IuJ2OMm6QaqGxjY/xoZLYMffXsGeK1NNSnUNuKoEhfxe+gg3y2xdM5hyqC+FVcfRdo4jMMSIZW2QTj0K9qpaIYYs+w1E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718756396; c=relaxed/simple; bh=R5m/4n1JoYnPi16p3LCIa2mEuJhAVRlRCjFtk+jPqoc=; h=Message-ID:From:Subject:To:Cc:In-Reply-To:References:Content-Type: Date:MIME-Version; b=jQsa05dBcrbdAYVEpoW/t8VsXgtgxgSMC5Ogo7GIWWEy8xcpgzOwTNAW3gWTnERcsH0pAdfYAekTOm9opGP12Xi1huKwmdvmJw1zt5YdbojgTfCctaZHHQFRyQ/mjJuP/PdobiSrBUMVVE81Qi92aArRwrX/A3SvMfYhrhQIT2Q= 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=dsbEq2fE; arc=fail smtp.client-ip=40.107.113.87 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="dsbEq2fE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7nHH3J0Yq7+nZfUxX7ur6cWOq7zvCtEPh13pjpiKEZdSXXbR95URxJgUigp+2AY6rD2V9FetjCenV7u6SZeI+GIU91CzYWLQakcCF6pdEpv2J44jfTjwcYdqGo7gQ2/0PgSv9RUx5RLhUy8xbjiT0JDY9p/nmFZDm21Nn10L7ysJ5HyhOwZ3aCwedEGpyQgkZbv5lXdx98PVnGKLFAfLXa5h0rXfFv/g6EwRX3K0ZLMl8h2Fa+URB3Zyu67p4VLxcETmyNWcIO9CMnUMOlN0DA+dbVeHpRb4U6h+C1mMMlkPagFMZ3bAg8xPCwkzCDZZq2D/hzpYamzFaw0NJSpCg== 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=w61PALYSiWkhH9o42uXVCAd/pnpT87hto831DJrTNiE=; b=QZLi0Iwl18HiOW1hyj9Kv2ZrNapY99cwE48kGX2kaAbltkz2XNtbsDusZulBio2ay/8eVBqaXKq/J6/F8POylV8ozWRD3V6SAiliThlAy5mKgsPgjHLvvdMcdcXtf+edWSSHPg8ssJkk0Bwh4X95pD1CVdHPI/EA2qe2hlbWlaQEWv1ojHTnGTGRl7tHUtOcZEct4NKLb20+cS9Us12SusmkACxs6JgJ7cRkOyLAPEOI30/CEZZaWuMFOaZ/4WTBltsMCFSC4yJmgnLYR31HqzQb17ZPtnPnoRM/wqm4k1jM03jI3mgkWJV/Tgi6SJnY8Qlk2MCUv2PrTwUbJc9nfA== 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=dsbEq2fE1sFonWqwVRe9wOYLx0wKBKCG7vel2lyprdrG++1Zb78NoR/t9+1HaaiouDDXnguiqWlZ34UcUikjcgq/u3I5h7hqsvmEfQcInpCFzHOWePcL3u5Fs8H1H79FghpNE964y4A5hkMOS7+99MldTX2qWTr+SKJYFKWWNc8= 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 TYCPR01MB11717.jpnprd01.prod.outlook.com (2603:1096:400:37d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.31; Wed, 19 Jun 2024 00:19:52 +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.7677.030; Wed, 19 Jun 2024 00:19:51 +0000 Message-ID: <87msnhwzq0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v6 3/4] ASoC: amlogic: do not use dpcm_playback/capture flags 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: <87r0ctwzr4.wl-kuninori.morimoto.gx@renesas.com> References: <87r0ctwzr4.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 19 Jun 2024 00:19:51 +0000 X-ClientProxiedBy: TYCPR01CA0123.jpnprd01.prod.outlook.com (2603:1096:400:26d::9) 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_|TYCPR01MB11717:EE_ X-MS-Office365-Filtering-Correlation-Id: e20b2dd8-9b46-4b10-51fe-08dc8ff58980 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:13230037|366013|52116011|7416011|376011|1800799021|38350700011|921017; X-Microsoft-Antispam-Message-Info: eDBJ3xTo1iPn47peB6QFpmdYmAjSWI3y3CE52+1JSO08a60wGe3N3tN8Pexn8tw8WpXT5AZceSPEGiwmxWj1xPcv2r1r3LgltaDeJveiz3jy8/+U26Fb0e1qwAYT9evSjbwtyCBa2Er/gWptTRQazZiVyRhrFu0OB7TjKrU3qpwc5ti3u6vBpq8j8khyhKKlojQEhyfS/T80xXiuvv1qeWbbTgQCU73+Mah+RN3tDyCvr2tNXWhJE2xYicnhdrtB2iXwL4nHDg+VlT67qU5nhAZxi2BA7MtMhqqJ3TIpktZs6ZD1ds7Ci7OvF199I0PsT4Sz+TOrc9d8hLwwTUrE2x1aENEt8rMBj2T1wTLifXeRom5AzCif1aUdCUELVZMNGihf2ZFpweFl6KxcyktQlxT2IvA1+3bu7pfV+K5gHxosMYOwcVGJ08A8XoQQ3AdUh8VsbegR1L8a8noU+qfI7avkYfPRI7QPJrKzAMiMdxZQEJJEjO6Anr9rirk9qgOHfX2bUYpB3CdBjmnVBQ7REKVE6Wcm3MY8zonQHd3hinA87+5tm8LdX3cgHafZguN7rmZkyLz9jMqEMKZo1xHimJZtxgHov3kSIe1PAeRH9j9xX6rc+D5y/RKHXDi3CIk0kAvgoFGrTylScyKMBqhv66prvjCerML/FUPdmY55owlPVoi1njuJhQlu6utEX86BF8ToYxUIrGiITbgTJ24VffKN6P/04amN8z5zC4dsekdTkSUYj3e1+g2v+gCssSOqQc/faOUxLo2T/n7tsdNb8zq6ViWfbLZSA7XSlWVlbFBtsxfyOp40qEY6n3g66weZ97mkedopF8f9OecKMW7HOprmZLM8l4eg8dmERO7/+ZKNURMdAApNVAHuwCcwD5+tCAJ1j+cdb+uzzdTNwYS6OvDheQwBQ6ZF8IRopEAwXDlDdVnfnr2YSJOGOon28m4iq9YhMnCrMPieBcVfpSEw3MQk3OWY6LsiaJaExc3+U5Hk/AdO+jmW0a11JdakHdB4X9mafKl86awoQeVNGMTM4vrLuW2FKG30wvuJ7+HUPQV6lylkfydv3Qus58M6ClSvfa8xuVaPvhKu78hPoJxZEl/6e+9bMcBJbC20pk4i+sis7JZsvT8RKOHOY01WdWGNPOSi/H86jbMt4QGJXtQEuQRjkwJernHyYFSHkG6wNEtZugAUqAvN/SMdHunoKMZ4xlsAm+z/aZVRh7jyygyhOlUZM09nhpgzyzTED3PiNkvaDWCWxrOV6rt2X6ayFz/JVrHPRGaZZsisTqhaQn3yan1GArpv7CNNtTsmtp8wIPTzwQJw+jPmC54Wj0O7m27YxX9BscqBh43P2YcrLWjLU9Ajpp2hXXVPyLoxpGm2Y6NJQUV2wkqWlv4+EStKw9Xh 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:(13230037)(366013)(52116011)(7416011)(376011)(1800799021)(38350700011)(921017);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mm/6/h40yfSPB4HMvqZDPZNnseVxTyFcKPnGJ76/p4fivfBBo1Sc2j5FhR7CtVkAKPqfpaiCUJ9K3Qty+gDGN0L2nO13BbeTEKA4VqLCzoBOELFW/SQgflxiyFhsMK1k9IiNYpKqZ0NfyscOv0yKZq/t05/DK0su1W77ZpzQsRnco9SVahzyZ3zVG7wq0vG/HU0IQWsKGzJDA2X0GNYPGAwUSickbe2prxjiTDPD9fJZGiUdKPp8yE0URc3Isl6K4pqaNt1gNZfRRQoyHJuwnLFAVE6fDUUJLlaMHNxpD/p3F46DL1Ku+LjG1zmC8G4rNlRVjdTtWoc8fSIXO6hJOeKC0l/gWx6+Qwd5enZHoQCLfxcof6zgvSIz89npCEWaDk35NDaxQiB+shcKt+VHYL/9Tlg+IG5PnoD+Jdo7aADJecEvr92yzQLuRUfvQB9mA5a++MM7O3vr6W+RkeqaQoiZnoBt5ysZbb8Sf0ryib00mIb8oI6yxyygFLI2f746vIxyQN6OPK378kCn//1W9+zWX6fUKzmNsCmzvlB7OwKKeC5OGoImaKhX69Azi3pPlYw5NKIKYpOeblhv4tRPdoiaYt+nmQnYEzNSSs7DcVGt9u/+gHjigO2c5YgnhZAJINkCr767RYGu7H1/NLrTP3amUFqRx0ZudMm+4BtN6EfTMtMXJdpotgWSGQvOnlAZlefKjVLtL+KA/6QHqe5mjoR247twSZVRRI9x7cJxS9OiGfBxZk34VKjoUEsde9ope2hUFvLpy1bDNUIOz0cQ6qFs3DtFID9xoKQPbodaCS7VmvexasKcKp7n2km7CTE72qmgMSlzaO4i+sgN3VF01RoaJ3QzsIX0iHoqmQXr+On25ZG3MAyu0lFWiv7gxRAXDQUrGVQyQsiKSaDNuEEOHdVXmSUmb3lL4owDVDw4Zt0wyQJZRwyiyxh6OSRB+sHmCVZynQje7ZWRR8tu3tGURhruMRdbtJTLudkKBikiP23BYQS3njJN0wEfWIF6BlQfud4Pnmxo2bcRTKEVazdQH6x0p7IkuZXlbyvCeJkPQMediZ+slNEZN8LIVMSb6TUQSZCq8RiczX81TvyJ0cUYq/HD4CYf0ezQaWbjhneaW8lnRopJu50WWwj2N0Bkbx8J0p2/O7YAnAoZ8mXDMLumeDkJbRRc09ugOmwYcF5fU+Cb7Qru2jZmGeuN8ZEEnU9HBMdAmEbt3CPk3MPUYSSlM1dJOyEGhg9FZrUT36HwSowJOtTes/JNDFnLLIOr25IIsOEleOKeyYTYp22sDcpAas3KB3gnU1kZF7cCm82OEb2OK8Uew7mgbldR07ZsHI7TUnqy7OsJHJjwJTVVeD/8XDcath644UtfumEutKBs2Qtv3LBwuyqCtMmK0+Fi3nOW+VcrTKmCPa+cScMN/1jF47isWzWysJ+DYojGCMmFLRlpMQXjZnQxnWe61Op3mDHRZp5C8f747cUQc4uxjwPwQptNf9gyKGSKuuGF6LQh3Xc3YhbGB3YI6iCXg5nqqp/OpnN+SS9zWoIb1nXl7y4bYvLJU9G8Afh3VNwPAqlbqToKzv+bnbiHGIlAiOv9iJRhgcoB3tRkiuk6F/1Fo4OZK21o64QWEMbjSJuIYvlBI7Q= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: e20b2dd8-9b46-4b10-51fe-08dc8ff58980 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2024 00:19:51.8568 (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: 2KZCY+wcMN0jWypjRHXaI4Ver4HoC20cMvFsos5hUuxcBgenj1zHTcOveJBWn2XqfLLLx4T6EWUARB/hln6uUZBcccsj8/9cRVTRkpSSzjx6dyTyGXvZnQC2RwU5hlCZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB11717 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"); }