From patchwork Mon Mar 10 10:45:57 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: 14009577 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2074.outbound.protection.outlook.com [40.107.102.74]) (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 90F25227594; Mon, 10 Mar 2025 10:47:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741603654; cv=fail; b=fRXktulVhQKZRahutwJ9oIJyFWWlhOAV7+jxzHcnfwUnmzm5TrfbcMRQV94rF2+Y/EzT/7UQNydMjH0+5wwNAfJE2XEkTbaYYXhzssf9tNbPy2NYrwJnpo0Dki90rZ6r2SBgcSQiEetbtQ8XV4wigMxQpxaQ+9F7fh3NdA7tR0k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741603654; c=relaxed/simple; bh=Sz0b9ovFA0w0pSiimwC1zqNQgWZOHuSBlcViEiTNvpA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YOlST+xsaU8vb87iQNw2NVNiaaZxm39rikq/MWYy/SwB9URbN3acj417u6YbmqcLkqzz2WHpqSHzrb4S8nVFKWVDP/+kTlB09gJr507vuPZ8uWglC4s541OaSfrcFBNxO8phyG9g0Rk/QjjfLRA4PLY0tbHdRrdzoHNQMMPhYAs= 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=abz8PKta; arc=fail smtp.client-ip=40.107.102.74 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="abz8PKta" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x9shCBPuA1fjpDG7effph1UIcDf0dl3rGWrOzi7uaWSwTi8Fk8x5t72RDRg76oO6QcCbTLyMh33b4b+y+l3XiNhDf35HBxOM5NnU5SrbPm1hzWuAMzyd1r/FwripMj21dmduVViNH6/pbvDn/6J3q44EpP8xnE5jfBjCsfKEEDNpdGBJJjUoI+ZTm2+3YFWK3JEVpTPaDrVLHziZqlX8yX6vF64gVsAF15WedM4+tQjN8BGogDLtW7yTnVpukBXiC+58Fwio6rjhQ+xwEdP8d7X1UuAPfqprjCTvL4qKM88q/CeE0KrCwZrjeBsDNbZox0YL2R30OUCgCPIX9qyzpw== 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=U3Pru57q8S4o+CH08VjwxyoDBdY569biy1Fm5tdsXgQ=; b=nw8wcQT9V7xino+q9SAiPkj/QhttrXRxtvwiRlkC44vQa6JjrRlAzNZDQxC9GAo9UoM7lV4tU+D3FGlE6ySOt48Wv8iPFpNhUaaWqk6to6+qTz6zeOBQKTRRvrZ2kSwK7nuiO01K1RFFDLU8ydPKzv5+T1R5jXNErex4TWNKHQcTZ9UxMT2Yf2bqXH3+smItqv5V0Dn+8BIoa5zbObYRunJ6AqILYXXl6YnMiDdROorpe89Gcc38/OXBUwGWYcJKoz0YcTkFE2QQlLao1sHdoC4z8Ma1OlK/fti7h8zxS3Lui08/uhMqKJEOMxQGfym9Wok5TpZYjb44ImS6hx583w== 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=U3Pru57q8S4o+CH08VjwxyoDBdY569biy1Fm5tdsXgQ=; b=abz8PKtafO4pWLCP3BSsnylC/yFRuwBLQA5x9d+WeNZYYwN4dvoRRIbL7o4gxkI9EDz7DP6UKJLJiEp3DdFEevcIeNvyAc5g/k2CRq9HZAPvszpfTQGfaYq7vgsYNFc6356l1WN4RvIJ4yEwHOtnMdPS4qIjpfLmZL9UfQLJxIg= Received: from PH7P223CA0012.NAMP223.PROD.OUTLOOK.COM (2603:10b6:510:338::9) by PH7PR12MB6811.namprd12.prod.outlook.com (2603:10b6:510:1b5::9) 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:27 +0000 Received: from SJ1PEPF000026C3.namprd04.prod.outlook.com (2603:10b6:510:338:cafe::54) by PH7P223CA0012.outlook.office365.com (2603:10b6:510:338::9) 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 10:47:27 +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 SJ1PEPF000026C3.mail.protection.outlook.com (10.167.244.100) 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:27 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) 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:24 -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:20 -0500 From: Venkata Prasad Potturu To: , CC: , , , , , Venkata Prasad Potturu , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Peter Zijlstra" , Greg KH , "Jeff Johnson" , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 10/14] ASoC: amd: acp: Refactor acp70 platform resource structure Date: Mon, 10 Mar 2025 16:15:57 +0530 Message-ID: <20250310104601.7325-11-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 (SATLEXMB04.amd.com: venkataprasad.potturu@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF000026C3:EE_|PH7PR12MB6811:EE_ X-MS-Office365-Filtering-Correlation-Id: a35b5c3f-e59f-4363-fccb-08dd5fc0f30c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: 3ZLuWfc+rQY+8vcNqFUVZ3V/03Cc9fFz1ES1xbJvz+rtONcJZHLdbPjRGDk67z5GRb0OrvOuRCOFJ8mDOMeTfi1iEuLv1VoHvUbOjHiTT4+p81Po75tnCvCb/hXL33B1o7ah3EU+sfEDDukMbt3cMBeL8FyXfYUSNZKX4iosC7oPgzLMAhhnoGjQmGNiqp7gP4iVAUnPc1Kv10z0Fa3cwcOqKiORKa+UDiCUagVMIwGqu0njH6nmDaCi1G1IwJDg8+iM8/hG3qMboOwIqD0zK1/9cDN2x5P3/vQlvUZTWkZnYwvnLMQaY7ucCkRVFMLiJoXSbUjA2Tmy5iRy2TX7o3rZ4L35Kv16c8WiVQNS5muOH2BNvDPCqF9t+sjEe0fTNnEJJtyWpQW8+8V69m9Gzpqxu9nVi969WshGHUnxFdxyMu9I/MxNHrUYXjCk2OgNtExIAxJw9NBTJeMwdq9S8rtYaKyvzdQbKpqGYf9ktUOq1bhtevxpayZgxYMXPvKX/7hh3IvLrWN8qAPWFk1qbrbOgUKSskuJ/fTTGUtqLLmZ2MaIdXS+cZo0v5Sh8eGIcBzhYaE4HQbVqvCsKA4oJfy0KhwWrZephm31LIPv/2dxE8/hcFWm0Ycbp3l+j9qJdd5SYIkT2FMwoPe2uXj2crDNdySOLCYQYQpES9JVrejS92t4de5ot6Ry6ipevlTYl/Snh6YNrbz+5NQE2/f9mNmFV95jSv1oDdKa8UBlGTiSzXcMIahD/pfCHgeNgLzKhpXaUnCv7ds9anxwj9umMiw9DdnZCLzVhLPiv1hXmwbyA6T+2BnR2LFamK0u+hLjpFGkqPKHYntSW/cMmFaUDpDZb82x6RtClU0bz10e3Cz8SlGQOf+8YtfMp5oCiR3DHaK+gFZBRI3wa13/JLlcDMPLUxuDkDW+CJHbks3w6iSmaauUsqg7jcs5ufEs7wPZs4yK281v1UuDKEcwZiTG/yR1wEswOC2x3tcShbG2dJbCv99jEE3geoHMJJ01dz9+a5oIp5iK9i1qksJ3AuVqYqEOrXxoi9fmv2BxclemuabaMDR4kR313AXkfwvU4JNUBCIvRoAO68cyASHlEkoK/nLeWki20XtNQ0QUuke1CypP/E26A6xMPg+AqPAazm/DbU0cpyhRAP5B3dg/CU7j06YeISwvQb5Yyl6t/XV2caMHgl0hb4lgI6HaA1X/w9qKPWfDpxWd9prb2hgOEhd8SSFylAX+/6goAofYpRHd4ossCrWYJnLV7Wqth1+d2mfW90mCcNcGIC3JLZS67mZT8f569cHaa4yZsq2cREeTBMLIGLvzTiPhWqHCWDm3jUTVO4hVnhFsW6pARH/IbhA3xmec6X+FJ6U9tsDbtZzDSC0aSf1U13J0UFAk8ydFq3hXsY/gNZ97d7hp4/F2N9Oc4kYjZmVKQgtwA2gkt27iTdDVvRhUA08W+nAm+o3gagLtNOtj4Jq1TIDlFRDkZIRS5zzXoI9FUVFO1POyhO6aiTE= 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)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2025 10:47:27.0989 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a35b5c3f-e59f-4363-fccb-08dd5fc0f30c 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: SJ1PEPF000026C3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6811 Refactor acp70 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/acp70.c | 11 ----------- sound/soc/amd/acp/amd.h | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index e89b39190200..2ced982e320c 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -151,6 +151,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id case 0x70: case 0x71: chip->name = "acp_asoc_acp70"; + chip->rsrc = &acp70_rsrc; chip->acp_hw_ops_init = acp70_hw_ops_init; chip->machines = snd_soc_acpi_amd_acp70_acp_machines; break; diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c index adc29b9131ad..9d066aadf1b6 100644 --- a/sound/soc/amd/acp/acp70.c +++ b/sound/soc/amd/acp/acp70.c @@ -30,16 +30,6 @@ #define CLK7_CLK0_DFS_CNTL_N1 0X0006C1A4 #define CLK0_DIVIDER 0X19 -static struct acp_resource rsrc = { - .offset = 0, - .no_of_ctrls = 2, - .irqp_used = 1, - .soc_mclk = true, - .irq_reg_offset = 0x1a00, - .scratch_reg_offset = 0x10000, - .sram_pte_offset = 0x03800000, -}; - static struct snd_soc_dai_driver acp70_dai[] = { { .name = "acp-i2s-sp", @@ -153,7 +143,6 @@ static int acp_acp70_audio_probe(struct platform_device *pdev) } chip->dev = dev; - chip->rsrc = &rsrc; chip->dai_driver = acp70_dai; chip->num_dai = ARRAY_SIZE(acp70_dai); diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 570aa20f02a9..de1e05fcf164 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 acp70_rsrc = { + .offset = 0, + .no_of_ctrls = 2, + .irqp_used = 1, + .soc_mclk = true, + .irq_reg_offset = 0x1a00, + .scratch_reg_offset = 0x10000, + .sram_pte_offset = 0x03800000, +}; + struct snd_soc_acpi_codecs amp_rt1019 = { .num_codecs = 1, .codecs = {"10EC1019"}