From patchwork Mon Mar 10 10:46:00 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: 14009580 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2064.outbound.protection.outlook.com [40.107.237.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 C3227228386; Mon, 10 Mar 2025 10:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741603672; cv=fail; b=DlyZnKFVZ71LEFnctR5G6vnkUM6U36K9F7k8HyttpjfDT9bx+iCh5eRFnaLUZG7YXLLRjrr8g+cbQPqrb2x+BguZ2BfguSlMLIhjfujoaEed45fXmAr50M354ij3Wpk6JpDSeL2nuqOVZ+XHqUZYN61ZMjzfRo/+rOY2pjnhyMI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741603672; c=relaxed/simple; bh=fisrs6cePNNxgir5qlUPGXJsd/i/g/8L3UVPQneKqjQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BiOtaDaH/U6rzHrXU8d6stF5J1jJuddeoVJTqshmPNyyX/wkn4pc92UhsQ8o8eB8nFNxUG3BBLRgGd3/lEScdmqUSPdFti/9B/lag2IPa2e8V8VBlgJfcOKKm1MRLyCpSPOvO1zcPLo0DiT+Ras881CGMi+hnUng2uW3LciMU1E= 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=F5I+HkvX; arc=fail smtp.client-ip=40.107.237.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="F5I+HkvX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dsrviGKur2NGfzndZan6/mkgVGuabgR4DcY+zKOZ+iTkHpCn7vD9TmECVSRpoq45tsEGaE/KT2oOISAKlwgDWT3+eA30B2GQAqgx8OFze7F+jn7ic4LeZvszUGZ0aQUod87ydKlhnfYTakGi+UIMsjAgZqlZVmZR4zLiTKrqqpyl+igxegJdalgizbfA8QKDbEHEZ+7otKL+ugdIiNekJRNf1UpoWigO0r0Zp0id4yfkZYY485KKlPNrpk+x78tedYfYb0xS0xYA4Q4kIcc97iW+vyK8uzKQuo04HBFrIJixSHgQWM00B/H6b2T6lpTLNxhRuaJYww5+hd+UvP4p3Q== 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=r9GyQ7Bm32NGHjk0Pn1Y6Cb8liWmV6wrFFvW+ruM+Ho=; b=WLtFcS/ImBBCE/yk7lek/EA27IZ5NZO7gxrRSNUEHtSLUe20EsLarN/kB17PEnQi3BvoiG47jg6X3zLGD/JuSGUXyGdBMPXCrTcPDsK/ylFFWvIUt1oQZY6g2gaJyQ9bGPCIgBd5lLuMQC71id2NvZLb4yFMsInU80dVBmIPso9AfNGH3K7QsM7CqYZZyciDquwSndwr2klI5vxPv//6xLF7PUakSEY9FsF0eamDrQCdlA+yO7SlXB7xO2GVEpwZitAbx0GmVHMP+i7+mr1uozwYvqANluxCmjqBcweru1A7SWEWuJq7iS1DFIwMzNUvYhf9biwOKUSDE1i170vHsQ== 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=r9GyQ7Bm32NGHjk0Pn1Y6Cb8liWmV6wrFFvW+ruM+Ho=; b=F5I+HkvX91+UhFqtgsqgFtIl9BDSQzmSmO6bhVXcZfqgHJX//7TDvVnZUB58sbh8tmA5p7mim5w+VKprnDU2iwQAUSX/+Tw2zkh8ftbqQr9n9mYDshKVvE+IARWj+pLKYcQMUa0TiepcNiCS7FOsHHTQ0RjQ5XfPkhV/xdQYswk= Received: from BYAPR01CA0052.prod.exchangelabs.com (2603:10b6:a03:94::29) by PH7PR12MB6417.namprd12.prod.outlook.com (2603:10b6:510:1ff::14) 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 10:47:46 +0000 Received: from SJ1PEPF000026C4.namprd04.prod.outlook.com (2603:10b6:a03:94:cafe::41) by BYAPR01CA0052.outlook.office365.com (2603:10b6:a03:94::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.24 via Frontend Transport; Mon, 10 Mar 2025 10:47:46 +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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ1PEPF000026C4.mail.protection.outlook.com (10.167.244.101) 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 10:47:45 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) 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 05:47:45 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) 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 05:47:44 -0500 Received: from prasad-lnx-mach.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Mon, 10 Mar 2025 05:47:40 -0500 From: Venkata Prasad Potturu To: , CC: , , , , , Venkata Prasad Potturu , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Greg KH , Peter Zijlstra , "Jeff Johnson" , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 13/14] ASoC: amd: acp: Refactor renoir platform resource structure Date: Mon, 10 Mar 2025 16:16:00 +0530 Message-ID: <20250310104601.7325-14-venkataprasad.potturu@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250310104601.7325-1-venkataprasad.potturu@amd.com> References: <20250310104601.7325-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 Received-SPF: None (SATLEXMB05.amd.com: venkataprasad.potturu@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026C4:EE_|PH7PR12MB6417:EE_ X-MS-Office365-Filtering-Correlation-Id: 4856f936-c265-4017-9ea1-08dd5fc0fe47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: fdsvVBjSeQkFCX/BQnVp9x2J2zVsjGuPUPC64bF4tAID5zBckY9olxS1BystO0Pv+5Ww7wTv8RjVuLRrwQXMdPCWoJ6cZGU+o7+69Bdy7UrqKjiagZa/+BYFiqQGuHTRnBcDkk19Mb6XAcjFJhu9Ci2zBZ7NdM9wgffOm/EanFPFu3f0uhQmR+YuJmYmP0joJeuRr/sL9Ej5U5Vgghoia5idZTrErdqG6fA8r9mRB5pxyKu13hvhE3x2prFZvsRtJSuUQpXC1qIvvrGw8edLpx77HBwi1w99xYuVfZFLtZWF/APoXKW+DmyKZqKtDHrAeGEZlRBkzTWOiMokWCzzluVJu2IXnCiQBCOcG2Y2XqSLEKXWeBU3rQQHm8B8rnEbW+SzkqXzMlTGgoFkvOwZNN+Sozg2yMV5YgvqajW+uyLr9v9Kh4JlLiMMf2AxfrCV+9Gu/p9rqYPcFeD+EK3dGVblo6vLzZU7AYS29sleu4GdTCYOdFPdnqLlq+WAgbWAl6LvBigYZjo8bMhRuEv1nTt9lWY/k/8fWfWq9ijTeZp8k2asFLwpISLu3wGvPn+N8TkUPzhSaH1ifNMgLAdpam+p3Lu9n2M368i+ePUgewNl9v7nLl0teO46FpN5/wRB5Ep9Xq77fpL6LYmrqDUATPIEkOTHTGZBIgCVYSf5wyW6PdblNfKtfE+rXWmpWQj8VVWGMX2bZCgLT9cqNvyPyBTPspI8sIgtkJPQHYS7SLSiThxaQrMB60lxGtteX+JMgQGrgrogN6aYEt05RBiaPv7iXhm/s7XiQQNgcYnGpZE5GLnMrU9Fkruje3VhrXTpcEItmOqwVsWjLMWuKrihdHeveolMc3nsGd8mZ3kR49UmXSQMNnGNEf18VsdQccK01iySR+h6PeguezDQLb8LlF+SYHlRycUXg3KJ4QUwauI0EX0+ZgBohj09MYLtVIJUhFOjmLoFi7r/n61li4MyDHVi+3MBuze2WI0818gplPKTedRI+roYMQdB11aV+eDE9BaDrJRxfwwu5Dov8I+PopoesscUEnRaTgjYZUy1FPw7UuSJl4c0W3bEoZoDSoLRZuJPjhD4BooBWCoZG1F05mmG4vFuWJNmIWLRSP3y5iNWqDOx2bwPVSeZO7SXwi5xvixb99rvLFCy7zNzo+mKyZUVF1sIB7bfhds9+aBLhnJFnjidm3dPvnBv17Ul++ynAsopQZTGpIg0ElYtxJXFSQHbH/I2WrsBE+kpa0EY2VSGGBW6a2pKygMdaUB3x0iU2dBrFfIF4pgpNDyaDI8utRruIL+nwhfgZDzXm8fhMfr+5BUe2hbrcciZzaiPZCR9HSus3R/5qygxVZoWiag35+JMu6M2eyOORx94GwKhK72s6d1ZM/9gg+BALOzJ6V/Vj/qm8hb7EAS1hw+5E6dlad9gDt3JyaOItJQoPOl9g3B6mTPZ45RTpxk9n6w2RpzgNAXwGPCRqXBNrtp7hJ+hS01JZ+WKsRxnB0HMjgBYmWo= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 10:47:45.9225 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4856f936-c265-4017-9ea1-08dd5fc0fe47 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF000026C4.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6417 Refactor renoir 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/acp-renoir.c | 10 ---------- sound/soc/amd/acp/amd.h | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index cf4794cc2f54..c6ae6e947338 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -135,6 +135,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id switch (pci->revision) { case 0x01: chip->name = "acp_asoc_renoir"; + chip->rsrc = &rn_rsrc; chip->acp_hw_ops_init = acp31_hw_ops_init; chip->machines = snd_soc_acpi_amd_acp_machines; break; diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index 970ca613a439..b8ded929d52e 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -27,15 +27,6 @@ #define DRV_NAME "acp_asoc_renoir" -static struct acp_resource rsrc = { - .offset = 20, - .no_of_ctrls = 1, - .irqp_used = 0, - .irq_reg_offset = 0x1800, - .scratch_reg_offset = 0x12800, - .sram_pte_offset = 0x02052800, -}; - static struct snd_soc_dai_driver acp_renoir_dai[] = { { .name = "acp-i2s-sp", @@ -121,7 +112,6 @@ static int renoir_audio_probe(struct platform_device *pdev) } chip->dev = dev; - chip->rsrc = &rsrc; chip->dai_driver = acp_renoir_dai; chip->num_dai = ARRAY_SIZE(acp_renoir_dai); diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 67bc6b84564e..4015facac7b7 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -238,6 +238,15 @@ enum acp_config { ACP_CONFIG_20, }; +struct acp_resource rn_rsrc = { + .offset = 20, + .no_of_ctrls = 1, + .irqp_used = 0, + .irq_reg_offset = 0x1800, + .scratch_reg_offset = 0x12800, + .sram_pte_offset = 0x02052800, +}; + struct acp_resource rmb_rsrc = { .offset = 0, .no_of_ctrls = 2,