From patchwork Thu Aug 1 06:23:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijendar Mukunda X-Patchwork-Id: 13749850 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) (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 E223E1411E0; Thu, 1 Aug 2024 06:27:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722493650; cv=fail; b=PoFs/foE3bY9RLLehs3S6z7VPbiJloRf8TTBps2mASsD9l3m7TQv3/aWnGL4bqzJHjS5piJz4EkD8t0f8K4ksIuIUwOseWi5TB5zge4KhL9ww4K95hUEHjyM06qFJdtIK+R7BAcFuqGE69/waZxBwT8d6OweJk2wELiAy8v6kx0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722493650; c=relaxed/simple; bh=929Cw9r+c2BL0Vnc8cCXwQGvRi8hiyBrAUflFaXiA7Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FXOExJJfNtFS+B901KQJ6IaWOCD8l+OeCzz2fYtQMbue2FTSsXQ9gSRYLm/cX2TIzHOMwnPwkVTpHbdLvMnVS4y9xTIwZ4B5uIeH1pAmCVRTVhtdsUVtgewYTH5i0dCptYlaEdNu0bzp/MZ01q+ofhjRo2UWS43MVhlucSF6qfk= 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=pvKyBOJf; arc=fail smtp.client-ip=40.107.92.64 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="pvKyBOJf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iZKlPqAmr8Th14IyZNqKAPOa+sGNzygTG0M7dfQmu1Vodnv4KJqY4S7oqXRFBGsDO3ltotZx4h61Z6BS5gRivMha7QZYzQlT0BD8A3WFxsldEfhAzxx0zhiiDw005cHMaRTMmB2VVTc+oWqpTgJGjygaFGyYzsxN4qSrX2/ECDoU8vC/PVPW8Mgl6GWXkvGa6sJAkYhSSHYRvSXirV5sF4zNX4Hl9bBRlVnhSRorju7npzM+uvgQEZC06Ml6um9thV6Q7qceesjdN2CJo9hpVrpdxGj8Ks84NDmYBpgJ8ITmNPy4i3xsGVc/y5eaSNDN4xi9XbY47t65NNMOjO+Ouw== 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=yK1o1Etp0t7bWEkU6fy/tCaJaa0MJErtLXxSbINNnOsMK3m0qL+WJUPgTDWb7jXa3wpoNPwfYwcJDGWbXpPqZJ6GM18GnIEN8UoVdkgkJ3SNipVN10a5bLoYSsq2B5pG5EXMI5ZP1SMtltPZyR9cLWBlXbxAiHbduNV8vT4j67iaoDh7Zcvb41zWg9gxloBZEj7RvPy7RyUz/0a50ibEbMQ2jRzAoanaBOTK8+7SpeeAB2Aec52ogVsGSc9kK+27f0BbsFi87sr1wf+CQ4idHmhHtM/SHfwAYwRHT/xjHoeqTuTUcFHUDbQvSTyhlBmoCVJYmnaOFLkzsdqBXyyzjA== 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=pvKyBOJf2Igp3VoFo0JlMab6fhzq4Y1DdVnJWiiorPdZqYN2hJQLWRmZGVQVseo8czN2X543SJ4ZkRgP7kl6MrvFDP1zAV7SMtjGbIEDjRk8lLqfJ93toqNcmpRpG0eL5SfXA6htqZawyjLr9hxcVYYjnxM6a5UnNVeQSdQ2iMM= Received: from MN2PR19CA0071.namprd19.prod.outlook.com (2603:10b6:208:19b::48) by MN2PR12MB4237.namprd12.prod.outlook.com (2603:10b6:208:1d6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.22; Thu, 1 Aug 2024 06:27:24 +0000 Received: from MN1PEPF0000F0DF.namprd04.prod.outlook.com (2603:10b6:208:19b:cafe::10) by MN2PR19CA0071.outlook.office365.com (2603:10b6:208:19b::48) 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 06:27:24 +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 MN1PEPF0000F0DF.mail.protection.outlook.com (10.167.242.37) 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 06:27:24 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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 01:27:24 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) 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 01:27:23 -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 01:27:18 -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 06/31] ASoC: intel: rename ignore_pch_dmic variable name Date: Thu, 1 Aug 2024 11:53:51 +0530 Message-ID: <20240801062416.2203673-7-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240801062416.2203673-1-Vijendar.Mukunda@amd.com> References: <20240801062416.2203673-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000F0DF:EE_|MN2PR12MB4237:EE_ X-MS-Office365-Filtering-Correlation-Id: 09639fb3-4a14-4773-00ef-08dcb1f301f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: OPJy66VsGRpTdL3mZGAE5cuPpniUWr2ji2lAxbXl1YYBn//grTLLHdjqx8A7oUB07axv2YiNjRQjfpTw3TiZx9L35C4Ix/xnd8JOBnBNLBEt+zZcU4qv9ratDb/RwdXylCw+UxIU9TUn44HLrO9Und1/jyQUJHWXPwjhu7LFBF63pQrzI4Rn/vYcKcaUMe4KiFa6VGMVxfN4J1o/GWpUOgX37IrtCJ9wTXRYMCOMw17I9oyZsl/rVvaEOeE5vUZZ+bKpj/W/P0NezWR0sdXyRp/LaTpE/FeDu/K1sWE4kaegujQkp32ZmqwiFADYpCV1EhnBgmQ+Xij+tVDzDqBQ3ae9QoQd0pmNEF62khsNPnixLzKLJre7UEjVySEox2CmSVjyLjlQi4a960u6MC5SNCxE/60HgGNvr2eMULh5Z3OU1zkdmWx5BMwkbXpVTd8i2pQyq7mdoclMRGk44/hMrXcOa0nY1NtujrrgPtGUHpOKf1StWbwJDH/ioWhpbCm5K0PLR/a6ALI+7jiecEODo2UkKPRuoNY9IPEtGJu6jqoKCkONpHzm1AdpPYAaQhGdPJ47PGOH720XQFn01rvXa+wpDxc6eg6GqvCr1oBq802yP4/kvvendlb8f3ebDM1GFjwv1LYGhpDWc9x6TBKhjWOnM7ihhmfRpMRP4XEO5Ogxyiuhe7TYTg/kOubKA7nXJwQjKuPhKILFTN1KGhknukg8gJiFcTKNog4+IKLsMhFXMTdHjmKUBAVhL54sLxs06gqmzhJrY1tfmZFejvg+YXAQejLN2wafFu1iFgLsegRQ2LPVT698HkLc8lJ9oYUY+Pk4VEuaccUCnVPS+GO03cRwplK5aib+TXztTwdAWlR1FJhH7bGOo9IYBBDFSttVnqoPyC4wt7yQI1yjsXoYC4ZrfRlUb1TmLswRXAWwjRclw65myxJ3WB2zMIDeMK7U3MKK/IttOi/6QqmcKgxMRhhgvaXV3td5G3Yr9nTbT2bBXSfzK41ddgaGFbZlP0MQF8oZ460LGmJjjuTQ2VaZJeTJGAqSSYnm1LWlwwSOmP4ha92J4JcYP3fxm9b63whGeNcSoj32chx3TNrufLIzdgIcmNp7SBQeHWwLBdVk8bMcP0RgLz0kzyiCwM+BwfMvqwMpkJe5HOLGzJ73aVi4bzIoXNwlBcANd5QYcQ1PI8p9wf9Et5DNTO0KnHvRH0gxqgUrhy5BByPoQFbqNFshGCOpqyCYqLlJ0G8GzCPkD0HsOOexI3dHly4pEwjMrV7dl2XDFYytNkyUqh7tHyBxtctbdUhyFGlpk3bcirVQGbu4RIG+JO5SKVoyJJfm0M3D1KzdbChkxYfh0PAC6EujuQHnIyvx7ya5mF1MaaGzU+FfMlyB9IJ6VdVBT249fwQOEOwm8bDf8gMY9ORj+VWcqw== 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)(36860700013)(82310400026)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 06:27:24.7186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09639fb3-4a14-4773-00ef-08dcb1f301f8 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: MN1PEPF0000F0DF.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4237 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;