From patchwork Thu Aug 1 09:14:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijendar Mukunda X-Patchwork-Id: 13750041 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2049.outbound.protection.outlook.com [40.107.236.49]) (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 A482A176AA4; Thu, 1 Aug 2024 09:18:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722503889; cv=fail; b=NcQHntyN1vojolb2SI3UT17mXZBBwPZ80+IXPBPUgnALboteyj9eM3jYfWOohjGSPrfGZm8oDGgJsEl0FD6GfDz1qyqmS/hcpYWn0YrySS0w6xGeYZludajdlX+ThTkFEgRwH0hdzaiU0u+lX+FIzVL0yj42x3+Ag/oMdyS9+6E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722503889; c=relaxed/simple; bh=929Cw9r+c2BL0Vnc8cCXwQGvRi8hiyBrAUflFaXiA7Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hz/St1HQtm+6mLp6mKREKdd6CoIKd3yo7rrF4faAjQQE4OWHCgCSQxq9YjlRCXri4lKqbg+ZVn3O801LP6tEt+TgCGWFh/8/1GtDY05PluDeQbUA9EPw3MW2OzoquvMZd7ZKK/WDOOMh4ZAoiM/l+ipJ/FLPWzNQlek8xHtsrLs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=5CKx8qgl; arc=fail smtp.client-ip=40.107.236.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="5CKx8qgl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TyLxjc/3/HByzR9FMw5BNIBvyX9stJ4Jsk4UJeiMrnPO9Jz+JpB3Y61B92yyw0SSuxapLPUVEbIEHGvs2qNMKy9TbfAdoziMcF9/gnDbJplYBEUJcfnIFosinTzviWg8VLR8hmon77V9G/7K18hIXdz7gD2Zc3Bl4Cfnm5x8LaR7xKkI12anMKtyJfO7XJmOeIhNWEdqvJsGTeXa0JXKINHWzJ7W6SRzxxeD+2WPtwue/UH7buhlJVCSpGoUQ7q7W0AUuIaj4KBEFaTRaPOm1FN0Rs2frKV9neZZSl069B2UawUBT8m76CUdjVTALiTtJa9dskWpzqaU2GYudoGebA== 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=eNOtexsJH/a9wEuZJl1vRdbZkCUD0L0ijL6tYqKYwS4=; b=wjYFz2rnpl7YBo9BW6aiqsoXyyAVYW2cSA1hjdgZ6y97rYvxqWuZ0n69aRlv4npn8FV518AkFpzzBVaqt5q0Jyiy4sXgU39fZHKjtQjkGPTf8zv70NGNIe3KhOuzMoX/i5PICaKyx1114oP9WpOoCT8Y1fq7rOoEQFbfZdXpc9REdrzR3f4LSTIRXa2IeUYDESysvL44AIsxPjmh5vKd5JohVBcnUbEAKRwvbF+M8KLTLB3Jc0hK1CE3k/dRM5x9EauG8xmLeqg+vkIISpQ0miiBJP0QE4zqLXAevHLrZ9BH0xVaJExgR6gMHRPkHwy+5kDnqsXi2djfpeoY2da3kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eNOtexsJH/a9wEuZJl1vRdbZkCUD0L0ijL6tYqKYwS4=; b=5CKx8qglGsKLxB7M9SB0IJO/nkyCRgliQrJWqDjeVgjzhBLI7yTAYvXl4eAY3IvbuNFiVPYy9BOaw098clPrdEdSnMzjFalMsEddg4r9Y5fJkhGQf6wlFXVVN/cxCSZj8MBhosvwwGbiHo8DGOjrUqcaWUg434Oif2FOOP9sdrA= Received: from CH2PR08CA0030.namprd08.prod.outlook.com (2603:10b6:610:5a::40) by SA3PR12MB7805.namprd12.prod.outlook.com (2603:10b6:806:319::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.21; Thu, 1 Aug 2024 09:18:04 +0000 Received: from CH2PEPF0000013F.namprd02.prod.outlook.com (2603:10b6:610:5a:cafe::5e) by CH2PR08CA0030.outlook.office365.com (2603:10b6:610:5a::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.22 via Frontend Transport; Thu, 1 Aug 2024 09:18:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CH2PEPF0000013F.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7828.19 via Frontend Transport; Thu, 1 Aug 2024 09:18:04 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 1 Aug 2024 04:18:03 -0500 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 1 Aug 2024 04:17:57 -0500 From: Vijendar Mukunda To: CC: , , , , , , "Vijendar Mukunda" , Cezary Rojewski , Liam Girdwood , Peter Ujfalusi , Ranjani Sridharan , Kai Vehmanen , Jaroslav Kysela , "Takashi Iwai" , Charles Keepax , "Maciej Strozek" , Chao Song , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH RESEND 06/31] ASoC: intel: rename ignore_pch_dmic variable name Date: Thu, 1 Aug 2024 14:44:21 +0530 Message-ID: <20240801091446.10457-7-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240801091446.10457-1-Vijendar.Mukunda@amd.com> References: <20240801091446.10457-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: Vijendar.Mukunda@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013F:EE_|SA3PR12MB7805:EE_ X-MS-Office365-Filtering-Correlation-Id: 468de2f9-6946-4ea6-f3e6-08dcb20ad969 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: H5OXihLx+1tcUNfibgHxzJJxx1xW9HsBAwXRWzBlzpgF/rUUgkIj7mlMfJ1YMGUqmnl/YIKn1BGXMqMZn+sY061+0iNj/6fEKXhvWUL5ZHw+e5SjXtxnw5ZSsH5MB7YVtvciZwF5sE3s9j9YJ4iV7Kd3YEbgC8knjM97+STJRimrouVS3yCL2EE40DPhAtZLdmL9MlgBC+N5IOJoax442f21OiA2Q5bmlgh/mSHWib/JyoYzNrE41z5c/wZHTSvUPXPF0ZBtan7HNpGv3Y8iUTN+XI5kpbq6yuRitKryyF9CJLSaWMZuyDYTf0UrxHJByo+Am2snvmh5ZAdcWsSa9lPq1LmtaqRL40y6WUCYCgBI1NizaWPUMrtD5Jw7knoIGhy/3vh8yJcDpfruCuqZtaAlC3jqQc0rGmeTD+ujXnYWS8x7/ye4HtNvHAeK0KCc0RlcaOg/nMfgHsMxksohsUtEDB4iCnbjrShwEp4g+7cAmKmfCH5WlMF266ni0ZFEPp/qE53n76U4o2l64kw63JJ4NHbv6Fl813Jye6NO1NwzcJQxf9NgFkWKucVLZ6T+S1iM9nIncVxaXeQ6Kbkn9PynM2Lc0R6yX7Y6OLe/nK01NmX3bcjSaGn8PlginfY8JWeVBo0srroB1SGiBQNb4zHRxVpYhpDf4y8UVNuKlo/m5+ZrErSrSiWQ6fFtQcrwUjsI/sh/PT49t9yShIMTzgaTHCcQGl/0HTGp734Gst3A8ZO1Dl5MgJe/cBSJQb1iPyLpkzqTmsP7jS1LjPcuZMoCQg8UsixxMmEwss1IsrU8ooD2cWgbBQFaXI4XlJMUAorbNbSAgc9L5WDhFi8zp7RhwkAoqoxkzCR5hvqA6v+dCFR+28i+G37r+2rQxvOqjGGc37443mUmjiMeN6sX18gu5xY/dQcFXt8r9bJBBr2nLMo0qZdzx6IyxrJO/WAAPrwQfNp5ipmt8dfzGBCgSzGX2WTnmzye6YXZOsudLtkcBm3vo44uxS5sf00HVrPb2HpSHtbE4+N01PtSvIv4EaljrZ7mPA+UOSSkplhXb5s0uKoJXNFPIXf/4xl7NEAwXtEYde1+5fdQTLFaJ+1/FHOfJ08fhHmbSf4J2AwEad3HKagWfG0+gvJ52lrqh4mNB30b/bxMAd5nxyPmEdjj5ZuL218uE5TTGwFvu58y/62/iWHXQhXkxGNuuVPVOwof8F1QQ9omFKO/0cpB+YaRi8+4R0IvUuxlqAEmqbQrGiEvPt6z0Mx/erkvKHIPSaAUuoIiSrMKAecR/l4QuPXTanWTnIpsPc+ybdxiKMtVTCVIfvB9Z+224Zw2xilWanBMpZWTZ8nfiKQScX5hfZ9Q57a0J8m16Xz07s2vdAZZq1wN1cB4oj48y+bRfmtC/VDZ5DnUwulQXCS+u4T0QlRXTw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 09:18:04.5378 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 468de2f9-6946-4ea6-f3e6-08dcb20ad969 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000013F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7805 Rename 'ignore_pch_dmic' variable name as 'ignore_internal_dmic'. This variable will be moved to common header file and will be used by other platform machine driver code. Link: https://github.com/thesofproject/linux/pull/5068 Signed-off-by: Vijendar Mukunda Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart --- sound/soc/intel/boards/sof_sdw.c | 12 ++++++------ sound/soc/intel/boards/sof_sdw_common.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 64418976aba4..28021d33fd2d 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -932,7 +932,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { { .part_id = 0x714, .version_id = 3, - .ignore_pch_dmic = true, + .ignore_internal_dmic = true, .dais = { { .direction = {false, true}, @@ -947,7 +947,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { { .part_id = 0x715, .version_id = 3, - .ignore_pch_dmic = true, + .ignore_internal_dmic = true, .dais = { { .direction = {false, true}, @@ -962,7 +962,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { { .part_id = 0x714, .version_id = 2, - .ignore_pch_dmic = true, + .ignore_internal_dmic = true, .dais = { { .direction = {false, true}, @@ -977,7 +977,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { { .part_id = 0x715, .version_id = 2, - .ignore_pch_dmic = true, + .ignore_internal_dmic = true, .dais = { { .direction = {false, true}, @@ -1542,7 +1542,7 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, if (!codec_info) return -EINVAL; - ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic; + ctx->ignore_internal_dmic |= codec_info->ignore_internal_dmic; codec_name = asoc_sdw_get_codec_name(dev, codec_info, adr_link, i); if (!codec_name) @@ -2018,7 +2018,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) /* dmic */ if (dmic_num > 0) { - if (ctx->ignore_pch_dmic) { + if (ctx->ignore_internal_dmic) { dev_warn(dev, "Ignoring PCH DMIC\n"); } else { ret = create_dmic_dailinks(card, &dai_links, &be_id); diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h index 28db2f1c6dae..c1b58180efe5 100644 --- a/sound/soc/intel/boards/sof_sdw_common.h +++ b/sound/soc/intel/boards/sof_sdw_common.h @@ -106,7 +106,7 @@ struct asoc_sdw_codec_info { const char *codec_name; int amp_num; const u8 acpi_id[ACPI_ID_LEN]; - const bool ignore_pch_dmic; + const bool ignore_internal_dmic; const struct snd_soc_ops *ops; struct asoc_sdw_dai_info dais[SOC_SDW_MAX_DAI_NUM]; const int dai_num; @@ -129,7 +129,7 @@ struct mc_private { /* To store SDW Pin index for each SoundWire link */ unsigned int sdw_pin_index[SDW_MAX_LINKS]; bool append_dai_type; - bool ignore_pch_dmic; + bool ignore_internal_dmic; }; extern unsigned long sof_sdw_quirk;