From patchwork Thu Aug 1 09:14:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijendar Mukunda X-Patchwork-Id: 13750047 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2054.outbound.protection.outlook.com [40.107.95.54]) (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 EB8F516F29A; Thu, 1 Aug 2024 09:20:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722504022; cv=fail; b=qjRFC5DFnix7LPhgwyO9Z+VJy3mgJpN8i51PiRS4nDzSQCgRXgDBpB+OznS0jtMioXcpLkF18BmJ0PWMDQaJVshj+2p9ETi/qgT9zCjLl5m9OpVr/0BBFkVOZVy5r/omc4t2RNsQY1Gnj551QEjxuFd6QOuIjAvCWo/W0tCqNJY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722504022; c=relaxed/simple; bh=S2ST/oiY44ugBEXzrBU0fyAlgGAV1t9LSEzykBOMz4c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rcPIIZ1FbQenU6e7ptS6+aqweixtmkyrJIZ6AHhm/4K+VKGXCGhifFTJbY7YaBsn/IDRYwCRLpk0Z3+fJrIuTm8iC/MNDkYNYSpXHbMpThGwHQG4dyX7081QPasmo1QCINEmuA9RcLz6GWvXW/d+pL2oCHOwcU4vYte8pks1/OQ= 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=B99rXr9l; arc=fail smtp.client-ip=40.107.95.54 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="B99rXr9l" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ED6rtxiAlySqvIvY8BZxl1+NPCHZ9YscRqj2RPhLsufFz2A0eNMMJrtWnh8siQeKLePk2bfjf2X7agjs0F18/35BK+NcHXYEGg9AiFeOeF+jBBm+uC+Wme8OO4UUSr6rKEpNE3kQ2LTsbrcQY+UbDoKrF4onws8LgpqgM34ArwCpSkIeY6MAd3clFJ99uUdRcdM52XsUow6zFXQyyDC3J3gMFInibkg8RQovi2MFqQkWplICaZlHmkyPCmwZ5Mi0fvalMGb9XiJ+wDPESV9hjRYv29EueKtK876oa+O0lo568nzbrbHaelzSno7Ejac9dCD/zv8r5WRXM7LUmv2B3Q== 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=J1hnEfkIC+ghzF+oVLNepXM9R2KLwrnFBZkn4np8uO0=; b=aBdiZBB6icBZkiP/7dy59xc9n5zJrz2P1S9Ij8qbc/xLxnKejgnQRpHj1cGcu9s6hADGy2avN4VkZdJ6Njb6rEVZrruOBz0YGd4DAQ892fmNGqtsp23uT8RjdtrKm7j16CUiN16ab8UoJ0jJEZXRaJ1Eve7QLAOpVJtHRtfnnzOVct4KMzXaL/Qud6GakSUDYyml0M9TTPbcfE9kw8OH5NTn22cfC9HFAgC86o3uo84jIkp2jBZafNJ6aiB2/82/6KBYVBbRpv/X2AYkLbQ5JyKJVikGWqYHdX5sCGcfNvARvLzkDTS9HMs5h9j81Umqh506+izyTenAQCE13KiDfQ== 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=J1hnEfkIC+ghzF+oVLNepXM9R2KLwrnFBZkn4np8uO0=; b=B99rXr9lROcfaHS0Xf43dkoDuyFc5xnIX8rksnjzgWzKO6Ru1plO1ex14MoK2FHH4/UsB0Klofh/DxL4/iyuwpB6PmUcXV/qWJeCDtf2oKIT5CG/1DgiwXkrsfd60qKZFSoT1gSeE/TfFQtdqNjHkPDjomPJejzblia6H9FZnuI= Received: from BL1P222CA0006.NAMP222.PROD.OUTLOOK.COM (2603:10b6:208:2c7::11) by LV8PR12MB9205.namprd12.prod.outlook.com (2603:10b6:408:191::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.28; Thu, 1 Aug 2024 09:20:18 +0000 Received: from BL02EPF0001A0FA.namprd03.prod.outlook.com (2603:10b6:208:2c7:cafe::36) by BL1P222CA0006.outlook.office365.com (2603:10b6:208:2c7::11) 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:20:18 +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 BL02EPF0001A0FA.mail.protection.outlook.com (10.167.242.101) 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:20:18 +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 04:20:17 -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 04:20:17 -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:20:08 -0500 From: Vijendar Mukunda To: CC: , , , , , , "Vijendar Mukunda" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Cezary Rojewski" , Peter Ujfalusi , Ranjani Sridharan , Kai Vehmanen , Brent Lu , Charles Keepax , Maciej Strozek , Chao Song , Rander Wang , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH RESEND 12/31] ASoC: intel/sdw_utils: move rt712 sdca helper functions Date: Thu, 1 Aug 2024 14:44:27 +0530 Message-ID: <20240801091446.10457-13-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 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FA:EE_|LV8PR12MB9205:EE_ X-MS-Office365-Filtering-Correlation-Id: c954f652-6237-42d8-a314-08dcb20b28f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|7416014|1800799024|376014; X-Microsoft-Antispam-Message-Info: BchwCXWxpFc4hPW/Kd6gP3kH2hYvPAwoH/jizPxv7LCl3pT9AE0ruyGDUME5TUp+sFBMu3t3ykDnCo92PLV1mDtmf3VUkmJyWJmnGI84IXLSjm4evdluK0m1dFI6sTaOAkcDjhslFOXAe4BCwYmMtPDsrq9KhdrJI8itChHQZNGcserWBoW79lBXqM+6eD1ry59lGTXJy6iMRMi1nuZFBcO8G63uaQpqWGuWCeMMIxgcRW4eILgN70Bq5M9NJKILyRw4cL/HxBuG/XJqjOm7wl7GxNKode/2GfYbnuqKadFW6nX4ZCjbGmPWtn2050wJguGF2x4vuxrXaRNuBX2IZ+klPehfkVtEQZY1KYD86f4Zcx8o0mh2RpheH1t+MoCOj2q7pOlfURkYzoNKeBm+Sd7iumI2jMW/p5QwRLkxRXz/WHAVpexL0QAHYi1a7Tq3PSLVJGYmczz4xhnjdbNHB7w+ACSQXnfp4oZe08ikp3JIxO6DawFAOx+7h3E4BEfxePrOSDSPa5uOCH9oXbTBbCd3J9D3kWq8hjaVhurUX3n6PxclQGHG/OPJfGf8NzCByTd1jS2VqxtH7RoghMl0XqZe5E+XcOVVJMkpGd/nKuXF49FOsADmI+lfYkvIYXTev/E8k4vbaEyHe3jT0uaANhJjLIo6mOllu07JRicCLhWnLnPPntBL8HqBlB/yUYzc7raLHDNXitIBvZrInmflhtsMBTGHVL0j7sFKG82rqIEPoKVFdGVOiQjbMzA1Qyi13iQhQVCZMqYqiBqAkcd11NNNh/9NdIAgx2rRV4vXTbCezo/Ul3qL92opZjlj6NIGVxeAq0vzUuAgKgoD1D0gPhHhdS073iyg8UEYCJ0UfSBJel9jONeJoxz2fxSs1kvy1ioh+LLLY1yLAzgDadMEmPWaghVQ5JqDV35IiAnZOx5aPRpxJk6xTDB/XarOhra/4vjM93qTOMCLRt+jLit7Ty7kRRYmgYDXwAaRrUBlO4HKuFNURZMEo2rK9ML1i++VZO+ZBdx+iPAxy5v5telu11gsohPi7Y2ZDtAhOsptfDaZxyPybTHSXKgvdaR1UXWrsvwgiyjbdZpVoinJqFmYQPvHSIpdqpdZ3iCfiQ+5njrNc1VmGba6klsNEeiwnN0vhL2eK95cb1/WZVqnaBLHpGjWi96CLBkMRp7R4mDDCmqzNkH2x808jJduZKSr8MTTLrsq0Rq6n9vY+n8j+Vf5anmoHryYOZHER+V2BmSqrqrXKrzRzcEySMZ6CA4lZX47V2e7OSu4vx619cNc7mGvTER5u1//+4iEJ2f5V258ZlOfTkGbi1U3ii0onJLRJNTeNhRuKo1+vX6c4YX6sBp5SfjfD321qvp0qwmAUsW3mmEB124pUw7/xnOnmalYBwwWK+suVoq82ffCBRORhUoCSw== 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)(7416014)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 09:20:18.0451 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c954f652-6237-42d8-a314-08dcb20b28f1 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: BL02EPF0001A0FA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9205 Move RT712 SDCA codec helper file to sdw_utils folder so that these helper functions can be used by other platform machine drivers. Link: https://github.com/thesofproject/linux/pull/5068 Signed-off-by: Vijendar Mukunda Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart --- include/sound/soc_sdw_utils.h | 1 + sound/soc/intel/boards/Makefile | 2 +- sound/soc/intel/boards/sof_sdw_common.h | 1 - sound/soc/sdw_utils/Makefile | 3 ++- .../soc_sdw_rt712_sdca.c} | 8 +++++--- 5 files changed, 9 insertions(+), 6 deletions(-) rename sound/soc/{intel/boards/sof_sdw_rt712_sdca.c => sdw_utils/soc_sdw_rt712_sdca.c} (80%) diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h index 9fa102fc03c3..6fd305253e2a 100644 --- a/include/sound/soc_sdw_utils.h +++ b/include/sound/soc_sdw_utils.h @@ -74,5 +74,6 @@ int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd); /* dai_link init callbacks */ int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); #endif diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index dca8eecfa820..3bc9d25fc9bb 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -39,7 +39,7 @@ snd-soc-sof-sdw-y += sof_sdw.o \ bridge_cs35l56.o \ sof_sdw_rt5682.o sof_sdw_rt700.o \ sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o \ - sof_sdw_rt712_sdca.o sof_sdw_rt722_sdca.o \ + sof_sdw_rt722_sdca.o \ sof_sdw_cs42l42.o sof_sdw_cs42l43.o \ sof_sdw_cs_amp.o \ sof_sdw_hdmi.o diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h index 73227ebf8e7b..b190aae1e093 100644 --- a/sound/soc/intel/boards/sof_sdw_common.h +++ b/sound/soc/intel/boards/sof_sdw_common.h @@ -160,7 +160,6 @@ int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_ int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); -int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); diff --git a/sound/soc/sdw_utils/Makefile b/sound/soc/sdw_utils/Makefile index 2c8f70465a12..f9a2baa49617 100644 --- a/sound/soc/sdw_utils/Makefile +++ b/sound/soc/sdw_utils/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o +snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \ + soc_sdw_rt712_sdca.o obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/sdw_utils/soc_sdw_rt712_sdca.c similarity index 80% rename from sound/soc/intel/boards/sof_sdw_rt712_sdca.c rename to sound/soc/sdw_utils/soc_sdw_rt712_sdca.c index bb09d1ddafd2..5127210b9a03 100644 --- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c +++ b/sound/soc/sdw_utils/soc_sdw_rt712_sdca.c @@ -1,8 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only +// This file incorporates work covered by the following copyright notice: // Copyright (c) 2023 Intel Corporation +// Copyright (c) 2024 Advanced Micro Devices, Inc. /* - * sof_sdw_rt712_sdca - Helpers to handle RT712-SDCA from generic machine driver + * soc_sdw_rt712_sdca - Helpers to handle RT712-SDCA from generic machine driver */ #include @@ -13,7 +15,7 @@ #include #include #include -#include "sof_sdw_common.h" +#include /* * dapm routes for rt712 spk will be registered dynamically according @@ -43,4 +45,4 @@ int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_ return ret; } - +EXPORT_SYMBOL_NS(asoc_sdw_rt712_spk_rtd_init, SND_SOC_SDW_UTILS);