From patchwork Mon Mar 25 04:36:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13601451 Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01on2075.outbound.protection.outlook.com [40.107.113.75]) (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 E69661C137D for ; Mon, 25 Mar 2024 04:36:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.113.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711341403; cv=fail; b=DFYpGWJOI8PY1Pzs6aF4TgH6oZ+9Z8GDJGxuxCXr3+H8YYZnuJSUXkdsuzUeE5Ckj/jmdBR4zSwHLWUY//82U8U2X47AO6KGcAELUuRAWyyqPBwPTomQNzEy1wNHRfBr/P37W8vBAJT7WHeHAwoNbtEhc8miNIoro3PxnRuEzaU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711341403; c=relaxed/simple; bh=DRJo5Zh7uoUsqlhBa9LN8X9mkwIp5Hf2eepH8DBYf3s=; h=Message-ID:To:In-Reply-To:References:From:Subject:Content-Type: Date:MIME-Version; b=VgZ3+UceCMtv/lj+5UEFHLsT8BoZBO8v8Kg/l8AI394wdy0OkF+Ps2qH65ornIZbrdgqGJpsLmBOIJDUKDSYFBrNmJVq9AjrcKNnp/dYoNTjhBMCoqiiKq/KOfv+Qz3gy9E7tda4IfxNlHb2+O7SbQ1L7T5yeQlsBjmgvUghKzM= 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=WVXW0bsB; arc=fail smtp.client-ip=40.107.113.75 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="WVXW0bsB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R2Lu8+JdwfUFleyOunvuMt9vdzH4Qq7R3yqLU4Z4iKameUN+VMOLNxyoBYdNXP7nLCUgLs6P/Z2Ebwccvt0Xrv2Qk6hxA29GE+1l1x5Llz8DLrRL+FRmg/SW30TsP1pHJCcwMz0rYz6X1l1PntgO4hePzvvHi5G/mfHr+myaOZneRXQGjW+khgNgylZkpqlfeBkX7qgpboRvjat3hjNnXcTiHMwtXRu7g3prWn59JSAdy3cuXsXZ3C7Gg8wTBmXR5qs2mp1nPJ3rgyQZfEEsrt/ivu6NeDxHvi6s7wIt0bEGp2VLP4zyqpa1QvofptpXTcZVyz2dnYUDE5KXnv7jAw== 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=Uz6U1imtp4A5ePlvKD0/SLhzN1hah03F7tGbrV3yCBI=; b=CJKSHKSQ8wV4jUyvYrEG9KoLqZe/LUtCUa79gnF3lviVKEVMWX3RvlkuyPzDvLa3SrJ4z1m4ZGModsO+gCO723T74C2T4pUTVK2C3Qeoukq50yzqaDSf9L8f/2xJep9uyZmTljGNNLo8rYgEJjs59VazLQ2Dz8FV+bmevvlU5L1+MeNrzL18ivtYSRVOMSzfAGiMtqW+0VfNeySZVJ9ubo4iH0Qpw0GfPQbrZ5N7LRwOKfkf2WLHPY0c/Tpck1Mwl1LyA8E5mD/cdfIu3DWnG/UegVSfgM+tqRMofnZrdOBNEjrKqJ/kDMj0b4HbhELDOyq02jjwygeorZRiRVod9w== 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=Uz6U1imtp4A5ePlvKD0/SLhzN1hah03F7tGbrV3yCBI=; b=WVXW0bsBu9ZtY+/LB81djuMIhLgyGAF3JUzXDKAdParqlN7GzECfLbndb0D+0nAaZsDhXQHkiuTAJfYL8wiE8st7S31iWpzmami72zxD0z50jrDGgA/+DW7wF5fPG4DEbQ8/Pljk9NpTO8/wO1Z2uJo2l5L0CJktmgiTfGkTWA4= 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 TYCPR01MB10698.jpnprd01.prod.outlook.com (2603:1096:400:296::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.31; Mon, 25 Mar 2024 04:36:39 +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.7386.025; Mon, 25 Mar 2024 04:36:39 +0000 Message-ID: <87h6gv53mx.wl-kuninori.morimoto.gx@renesas.com> To: =?iso-8859-2?q?=22Amadeusz_S=B3awi=F1ski=22?= , Alper Nebi Yasak , AngeloGioacchino Del Regno , Banajit Goswami , Bard Liao , Brent Lu , Cezary Rojewski , Cristian Ciocaltea , Daniel Baluta , Hans de Goede , Jaroslav Kysela , Jerome Brunet , Kai Vehmanen , Kevin Hilman , Liam Girdwood , Linus Walleij , Mark Brown , Maso Huang , Matthias Brugger , Neil Armstrong , Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Sascha Hauer , Shawn Guo , Shengjiu Wang , Srinivas Kandagatla , Sylwester Nawrocki , Takashi Iwai , Trevor Wu , Vinod Koul , Xiubo Li , alsa-devel@alsa-project.org, imx@lists.linux.dev, linux-sound@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com In-Reply-To: <87o7b353of.wl-kuninori.morimoto.gx@renesas.com> References: <87o7b353of.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 05/15] ASoC: meson: replace dpcm_playback/capture to playback/capture_only Date: Mon, 25 Mar 2024 04:36:39 +0000 X-ClientProxiedBy: TYCPR01CA0105.jpnprd01.prod.outlook.com (2603:1096:405:4::21) 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_|TYCPR01MB10698:EE_ X-MS-Office365-Filtering-Correlation-Id: bfdd4d5e-149e-4095-61ba-08dc4c8529ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NiJdGQTpvTILSieWHtHsZh7MZgtvUDB61xDdDdCmBFaWbgRnQnHztDUHBWUgxvrKrrquxl3Vi3dQ8eFYGOI83QIoRGrS3gVyfXj/sI+iFxT0NUkgye6XbQ74e2M5/edWOJjdh83t/sD2sgY+SUO3Rh6W41H55jVLqMIqcLLYGt/dIxESX1C1BqlORNPSDqDa3ro3ktYxQKJ6ld63Ckb7FNXVSza5yQ3YR3f/gPU9g47vP/ZtiCmKK/TeylfBODUhZ5YOYeq9+yJSAnPZcG5ku3uScDecv0c9p6kS85nA3BiIU/zz3chqxBc0PdX6Qnse16IXP54Jr9wZ20yN3Y8puAZeajx6H4M3OA4u/Wt/TJyPin0cTQUduIkZp0U5GFHW94ajFb8iUGK+vM36PLQBNSlKvOu6jjL4VHtybT5Wfjf/BxoJKGyxAM7fF8eScuccesjxHqO3PAoyvfaD/cEP9pZ+tmISrqGF18jtEGLH0inofZjAL8by2Bsvi6+RCy33/Z2O8kCahOC3vMwO+uGbUBg7hGdUBnITQE1rRYnF9+vgp3H7fN0o5y8JxzTbRZagUhWjZSwaHClgGauLVWdtmxVTv+mnmXsrCIBW9UZSaOJNS4FYHnw043MIeKwd6sboZXlVrtpYcA4ibFcVguDCKudthmbvu6TDyZT3EDgrLoaBK0S8nEgU/sUdToHiWhbo8XWCz1GNFHMHP/HVxydGxyf3r8TpeNT5CWyGnGHOaec= 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)(366007)(376005)(7416005)(52116005)(1800799015)(38350700005)(921011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Kya4C9wViqwMeaKSW/VpGq2Dh5knCuOpc78+E5tpRiYZWipjPgdZJNcZ4ZQV5SypNCSUkRJzk/YJm1I7amIyOHNK0NgQzk4rTUsRLzEmW88YgvgW4rBrKPnH/fN0TtQBz772DJQCiobaBqwM6GdilWH8r2tVxitQsH3v5IQkny72JLoMm8USY3PF2xbzP5BqZs1TM9e3aM+02loeAcaFHJJKG/emmTDF4UkFtJ/KKBL7q5gpaYbVaMm378uZ/pD9fU/D7CYy/w1Qmh2eXIM4pIQCS++H29FO2/8cjH3K4HlwroikpEeTmpeGXrWW9LFq1CbOUS0ZvW5FLDQTPkXwUWGonM6bFheu3NiDN/9B02ILrPrj32HFFMbVfqanFJh6Mzs0Xvmt+QB4nUzSz6Afsg/gw75fkbRhv9btViPNIaObZuCnGDeztPhaLjf4W08+H1oYbidZcQOY4U5B040lVxACIy014dii19T3+Mvl0uxAKLfQzjGIQxIrJvbu+2eao2MfmbyyF6dVowTzftnWUPNbBKmrs9dNPW58fnOenKY8iSsXvGRGM/oByEq14FRwITsCeu4XszhOsb1AQtq+TDNX+Ap3StXMYJP7DgzF3z+KJHYcAy8kuFCucRo4iyTKGS7vJpypZpBXyi4sPmP8clFLsMI0rCKsylVJ1w/9YFbrW4C5hPOGZtbHfkpZEIeO/BFK2oUH9hkAFhFLmDOwQ6qKSOWh8YWxW4xkLV7n59kthHQVf7QgjDL2G0pmQmwQLyfbbDuSyMlLy0aghFka6/W1F2b6v3K83VFKMo4pXTATeJhbTz5DbpRQ2j4FM2Si6aVdZeerBehNeXk0w2gFCugXjYfBtOp0DMMf23oBA+E2HEA1hHKAeRc4rft0yQ6JgzrEmxtxD3xWyuz5CSTx/ykDV0v7cC8fxUp7LcSzJUhHay2aSvzMQDvVdLY1IyjzvG1NjurIQERU/LBn79AXnUEGQ45uIhtlePl6fYIj80RHjQ2LdOXtwpHcfPmUHgU87HXjs4z0xyf67qGifseVqkLxEGUuTLYdlwIEZVOqLl1jtgVXB4yTufyBbiJ4ec7BU0Cw7L4K9/T47ao/LhdQdcvYL50ueBk7m6hSnf1eFBVPHpbzDYehGdtG3QBfnubzhbd+khJW/pUPlWeUnK1PbwnpHSgWvupfyyzh7HaMO0SzIZY9v9u3R8Dhw76TFT4nIApzcEtWFfTnO3hJh25torJxXxKbNXtIJurlANN+IL4RVnStdSBXje0Y0dgoo838WR5MPsDadCOzw04u89C0w7GGXyCpdl+nsWzcTi3M/BMM+soCOJA9zmZI5i4phT7Gfd4N0XXRbrcLvMc8AFcVc1qHh4ewyulwyzhFLMyFREs0jlsSsSSxa+dpiQisbW2yoijqT9cJhuM666/ONvteLhAC2HRxLYUVDl1j1QTXNx35IqPdyAqiKXoB9vFD6mugn0jcVoQ76YzqGjX96kv67pHViB9VhOZKDMw4RlVsa62M/hp6QyA6yYOyC2OzuYFwvQb/qlQ00RFsrTg1g2n9+u964YwcTYEP2fiPVR0RopjfjW1nrhZ5licILM/U/Ult6IiOe4Ewp9wOUglrL5I3LjURvoAJJjQuqFG90eXZkIo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfdd4d5e-149e-4095-61ba-08dc4c8529ac X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2024 04:36:39.4099 (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: 2nuGccxAcHPtz1mRxW/XF4ZURwv0pUTtXvdhaCmIzRtp5cXZWCcF+mpC++X75jnr/dRaHqf4yIDYYwF8zqafHpkidSjwd3rNybvKSFy/PygX7VST0lJGPxfkOLgsjNK9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB10698 soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto --- sound/soc/meson/axg-card.c | 8 ++++---- sound/soc/meson/meson-card-utils.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 3180aa4d3a15..21bf1453af43 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,7 +186,7 @@ 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 */ if (!tx && !rx) { @@ -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"); }