From patchwork Mon Mar 10 18:31:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkata Prasad Potturu X-Patchwork-Id: 14010495 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2041.outbound.protection.outlook.com [40.107.92.41]) (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 4916E23717F; Mon, 10 Mar 2025 18:33:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741631615; cv=fail; b=ZuwZwsLUSAk250bd7hkORosameKwxQk/mICt8gpKWdIZ0/EmS5woG6qKp01KIyksktfAO8iSPcgZullt+VGPjgIKf3Ef97m9gTGigGSb8So46O05tm4yr4wfLFAiUve3hnF8Pg1yOdDF6CPplTxi9FkpJNbaO2ieeVPLzfFExUo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741631615; c=relaxed/simple; bh=dwAiFiWv8cfQ41QcrHxh8mrfGj7bWxIwzPQjt0RyNrs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MbmeDkr8e8Xufbwh87CZ9ZD0o0DzHTWDjPHNJsI4C5bHjtKphf/fvoRA1oBnNKgAWwIETTdSloMlBSgG65weEHC/kbyJuobpWfa4nBUvAGJBkc5lFhvUO3kpXFQPL/WL6+dcArq7oIVMrINrQ8VoXDw+XlYgo4b+vR1Q5RHr9dU= 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=34IDZveo; arc=fail smtp.client-ip=40.107.92.41 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="34IDZveo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=laPUFyGITrxFpZJT2j3FRAZ4aSbkuOad1hNpi+q4FzFGXlNKAOlQkoGbUWA415g8nMvEAAfpydJITgG1+CTWsScseGOINeJtpFjh2izI873x8UYsxeTwJugxev+jhg7fkYMGPIHfvYD5gHNmrS93KkZ0oUeMMz4alNuccaw2C6CWxKou1yz0hyphz3rELuiEdPAco1usZek2C7GY9nlEfU1W9YSvAyvs+VtwGz0PdAJymiGh653hwsuYul/NfjjJ27kuQ0pUjzXPs27gC0mTd859KxDJ5jBbyiAEjkED9Ulec1PowDcf1BrPjyq9stDVyV5B9Kk3B518wVH3Hqs2Kw== 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=nR/K8dR6D3D/MbEO1pHo7C+hX/q2kbFX9W1xP5LlaRY=; b=Ce3KCo1ak2o9WFtR6xMKQuTDHRJSiYsdHX6NI7ZVH8gUWB78haD2rskGKPOkLZ2NudnndqSz397yFtJxkFNftCChHsWIKYAh/snFB7zxrbwpITdFazQd6WPy6x7bvWx0LaBciint025uNGEBwSAUGjcbV2TniTpIkwJdAH+ja2tsHupmc4EE9aZ7ULyp3UrHvNKToPWGsSOpLgyD8BJ7fy/A4B1+Wg2qxQT2P/b+nsu3pEzPyOL0M2UgwrFgizfqx6IDHH0FyTf8cnVG/OB0doF/8acqj1XJb8HmBVjRFN78GcRqE4JAvHWbm0dCkhzpcuRp13/IIMy+svwxdVUYoA== 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=nR/K8dR6D3D/MbEO1pHo7C+hX/q2kbFX9W1xP5LlaRY=; b=34IDZveoTHaQclfqccE8Lcq4UMVZ2x+Xrh+txL8tXT62lP34h74FC6h64UUUYenBan6oBWs3lOKvhYxqqgRa2USUZdQVEr2gI8NXSbyyzPcrKWodfcKuCp4Wgq68rNF+92G+Vn6ysIfTKNqoQN9reHaA2tp8wg6aCSNlJfML/mQ= Received: from BN9PR03CA0705.namprd03.prod.outlook.com (2603:10b6:408:ef::20) by DM6PR12MB4450.namprd12.prod.outlook.com (2603:10b6:5:28e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.26; Mon, 10 Mar 2025 18:33:30 +0000 Received: from BL02EPF00021F6A.namprd02.prod.outlook.com (2603:10b6:408:ef:cafe::d8) by BN9PR03CA0705.outlook.office365.com (2603:10b6:408:ef::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Mon, 10 Mar 2025 18:33:30 +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 BL02EPF00021F6A.mail.protection.outlook.com (10.167.249.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Mon, 10 Mar 2025 18:33:30 +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; Mon, 10 Mar 2025 13:33:29 -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; Mon, 10 Mar 2025 13:33:28 -0500 Received: from prasad-lnx-mach.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; Mon, 10 Mar 2025 13:33:25 -0500 From: Venkata Prasad Potturu To: , CC: , , , , , Venkata Prasad Potturu , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Greg KH , "Jeff Johnson" , Peter Zijlstra , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH v2 11/14] ASoC: amd: acp: Refactor acp63 platform resource structure Date: Tue, 11 Mar 2025 00:01:58 +0530 Message-ID: <20250310183201.11979-12-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250310183201.11979-1-venkataprasad.potturu@amd.com> References: <20250310183201.11979-1-venkataprasad.potturu@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: BL02EPF00021F6A:EE_|DM6PR12MB4450:EE_ X-MS-Office365-Filtering-Correlation-Id: 33731cf3-f87c-4f92-228f-08dd60020e36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: QW7997/7N+VAg+eGJcQpSXV+S03saTfgePdWjm+hOPmAwlGiUUx9aFZQIsrWS80LuMTzuuZkV6531fMvKiOnPTr87+qcd0IASIMSqStqINPosAXTCXNhu3m6EhNfMSUcEXFtuVb7ue7Ys35QuKd6fUr+a2dOSbzPQ6Uxq33ZXhOjVwDgDbdk1pGFQxKcEyESwEUVGa0fJbM8M/3C0kvWmab3JkEmY4eMT4oflDx4H+axFgakmx5LRc+4qHCs+ppasmdzhl8qW5FFQtIT4+goKz+o/MV0pLrbAa74yG54WI+VJ5Q8SdBAQDcyHKblcG7JKSTxlRxqrEJME1zG5tVLawm43uHyHKYPjtO8s0QpOWGu/obpS7XzqSGQ66uSBIJbXoAuT/hcFa9InKix1fpsYEnAk/7gr9OSVlEc7fybqHO/IWR4ts2ME1T2PUeOltToLDywJKp67AasxlJfxbPHyeIxvlTRMQ0ymI8Knhzfj0YrOp4S02bQdiSC3Au3l7eUrXrF4Rvb9Dp+ZLlDvvXt1RlaILUifL9qcw8Jff+McC0nCUtvSR5Rtk5XYxYJWZEv7SMpkL1uW5vgvo5QOYpkxPvAsl67PBRg0piLTf8GT+Vaf1nfkDHr6psBz8+dQp4snJV8cGYDUvfGckNg11vIkPFPc1cyggFsTR/aC3UYYKHMyET2C42aFVr97WYU31oJEEfcq86PwwRCav5sQe2OEzNcxw7MbGielUXkHdsbhf1xxgUWqNqJhaybzJAcSQOQev2LDINXRyhroLaOg2JeqoXoCMuB91ntmqNm38WBl55TJniq2cmFnO+QFCrEXJKbufedvZiafx96p4MRdSsZDEP+xucpIzWQwUMXuiVOVTGIWE8kuLEp5T3GaxzIs40IWbY2ZSe3fh1gBQ4woLvg8AJ9zWgArHcZYDfHlcE0+m2QYGMScJvCS0oQa9zBUv+pnLGiS2tjBC7z4THb6cvCRYl//79LncX6GlHyEmldVog0wUQYRwfuZldJlU34rUQ1vzImmhnOjR4efZRYp1NQq6hY2IYERpUBmGTwQbNmwR5DfBQn00Y3U8t467e7uV/RaLGGD8nmD4+hSozjP9c6CVgz6sc7ecKY7p0yiK1RfqWhi1c0tl/5q9Pg7kY3a7+BIshLWoxzXDGC1eP3XGw7h9MTPHck1r4q9u14+rT+UNvxcOnGtRNR2k1Sq00DPK7TiMsFV9hURPuZxc6iA4tW1B24GfUBqJgHb0tu9EiV9q/lJIusuoYBngmbjR4qBtv7afIep5I8kqNKuJ+FZWVN9FbYszEiD5aUpUXBNKQZLZLJRXw66cayig2GE+Vdfe+f5nQXG2FeOrc1e7f//IIJHxgJBfRyEYQeGNR00V9VxITy+2KuVR4unW616/cLEnmHrt6LsIxcg08LLJuN+2i+G6VC1OuI3wIHpx6UbNiAghbNjPIRGtyJqiJknG3iLk2jHY45FvGKD5B4JMoCPt1cQbjg5zDBHE8JkslBvdZxIpE= 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)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 18:33:30.0639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33731cf3-f87c-4f92-228f-08dd60020e36 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: BL02EPF00021F6A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4450 Refactor acp63 platform resource private structure to amd.h header file. Signed-off-by: Venkata Prasad Potturu --- sound/soc/amd/acp/acp-pci.c | 1 + sound/soc/amd/acp/acp63.c | 13 +------------ sound/soc/amd/acp/amd.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index 6728eee29993..3df665ca1b0b 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -145,6 +145,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id break; case 0x63: chip->name = "acp_asoc_acp63"; + chip->rsrc = &acp63_rsrc; chip->acp_hw_ops_init = acp63_hw_ops_init; chip->machines = snd_soc_acpi_amd_acp63_acp_machines; break; diff --git a/sound/soc/amd/acp/acp63.c b/sound/soc/amd/acp/acp63.c index 49786e1a214f..53c013a64854 100644 --- a/sound/soc/amd/acp/acp63.c +++ b/sound/soc/amd/acp/acp63.c @@ -52,16 +52,6 @@ union clk_pll_req_no { u32 clk_pll_req_no_reg; }; -static struct acp_resource rsrc = { - .offset = 0, - .no_of_ctrls = 2, - .irqp_used = 1, - .soc_mclk = true, - .irq_reg_offset = 0x1a00, - .scratch_reg_offset = 0x12800, - .sram_pte_offset = 0x03802800, -}; - static struct snd_soc_dai_driver acp63_dai[] = { { .name = "acp-i2s-sp", @@ -222,11 +212,10 @@ static int acp63_audio_probe(struct platform_device *pdev) } chip->dev = dev; - chip->rsrc = &rsrc; chip->dai_driver = acp63_dai; chip->num_dai = ARRAY_SIZE(acp63_dai); - if (chip->is_i2s_config && rsrc.soc_mclk) { + if (chip->is_i2s_config && chip->rsrc->soc_mclk) { ret = acp63_i2s_master_clock_generate(chip); if (ret) return ret; diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 979d8b8801a3..075659fb3314 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -238,6 +238,16 @@ enum acp_config { ACP_CONFIG_20, }; +struct acp_resource acp63_rsrc = { + .offset = 0, + .no_of_ctrls = 2, + .irqp_used = 1, + .soc_mclk = true, + .irq_reg_offset = 0x1a00, + .scratch_reg_offset = 0x12800, + .sram_pte_offset = 0x03802800, +}; + struct acp_resource acp70_rsrc = { .offset = 0, .no_of_ctrls = 2,