From patchwork Thu Aug 1 06:24:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijendar Mukunda X-Patchwork-Id: 13749865 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) (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 544EF15747D; Thu, 1 Aug 2024 06:34:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722494062; cv=fail; b=VnosCbxO64tbahcwVBodbqfunalD8jrvGU6EpwK8AuxmFF9zZfvYqK0W676m8YBb91BIm5HDyNHiHjRx4jYwHtzSBKaIGTdA7en45ZNt4dlrQocuYQIEAQ7OprwTwQYV/ZrKEOEJEV1RD1+q+bgRiVU+4QFfsKx4onTKH7YMOws= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722494062; c=relaxed/simple; bh=MPZvZJr2dKgEyoC5PT2bfOAWgLLDd/Ys8BCPH9ABZM8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GcTaB3ABhuRZVUZ2i4vYeEg0EzddhYeOji33/NvM9OLmvZAEf8jHS2DUKV2dd+p0ebz738B7bXl6GfR9fzR9rnUOvmhM7yZ9FYMfX2tXgbfHtTczMm40BsTNDv3TAFpij6TAeWhljqh3HeR725PpM+rcf2C7CSqUJG9S3eyogkg= 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=tp2CkYFN; arc=fail smtp.client-ip=40.107.92.65 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="tp2CkYFN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h2aB3Z48YtcnHCM2kGx0woEUw8ZE0hLZwSYpov/9FlXAxz/KQRiSkN1NJxV+5i9uRLC7en0tHZhb7y8p50nC+quM8cwNYlACOKvUBRYftXM7EJD94AMFErE43IOtqICgK2Fh7PHOWTXCPuhSKJDEHpgH+RbGLTZ7B6rNBN+LppklVsZMGsMtoZ463NFsXA1uRBgKZhbXJ6XR/2K/R3fmLp8b2gqRar2yPg+STGQjF8L1YJSisYxmAWZbSsRa0JAmBqQHI3mhTsXyO/KfkVVcFZ/IbcGt2Q8/N0W2NU7KrZCE6oqGOmgCaFZGx5ueh7g5OXGiB1QnDMFZ9Vopq9Bsyg== 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=CDKExy/DCIR6/246/oZSdxS0in9FcMvHavGaSS7dzj4=; b=UcqvTYHzocd4czqbpmLJrsST1c6blwFW0TmHbuqa6mq/idtdKIqmmdSraQ32KQjaI3XL8R6Ix1ot3WpWzrOXOdgtimjzFuO4qZ99Tvc7p9YibgRG6RR5R79x86KI43g00Knp/5gsor/Zd6smUpyWjMHzlfbwOzm2fTTJf6ZzKJKd93L1n1VebCTLlFYw8BSl1/zML98JjNEf+3KvIvgEcdGX7FsfA0GEKULMyuZ9TuPLn1YpTR5rfpn1ceAJeDOP9jxJ/EbX/eiZBvhyFD0aI38b/BCIC58JnzwQiFTLF+lw7lW05GXPWIFuAaiZ/ar67NbsRxqC61o2tjVH1SiX3A== 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=CDKExy/DCIR6/246/oZSdxS0in9FcMvHavGaSS7dzj4=; b=tp2CkYFNsk2/vrLSgirFrG3T1yes8mo+i96d0gS3aD5IwFC2fjlxM7DnbcwEBKKk9bofkPsWf2sJhPRNV4inAL8mp6kQHukmQEqUDtQ1llH5YPkXJYRmxkLWjuihnWJlcPTwztPt53tpUZNiEIQCeih6Talk5b0TwBExy0+3lZM= Received: from SJ0PR13CA0155.namprd13.prod.outlook.com (2603:10b6:a03:2c7::10) by DM4PR12MB5865.namprd12.prod.outlook.com (2603:10b6:8:64::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.20; Thu, 1 Aug 2024 06:34:18 +0000 Received: from CO1PEPF000075EE.namprd03.prod.outlook.com (2603:10b6:a03:2c7:cafe::22) by SJ0PR13CA0155.outlook.office365.com (2603:10b6:a03:2c7::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.6 via Frontend Transport; Thu, 1 Aug 2024 06:34:17 +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 CO1PEPF000075EE.mail.protection.outlook.com (10.167.249.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:34:17 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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; Thu, 1 Aug 2024 01:34:16 -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:34:16 -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:34:10 -0500 From: Vijendar Mukunda To: CC: , , , , , , "Vijendar Mukunda" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , "Cezary Rojewski" , Peter Ujfalusi , Ranjani Sridharan , Kai Vehmanen , Charles Keepax , Maciej Strozek , Chao Song , "open list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , open list Subject: [PATCH 21/31] ASoC: intel/sdw_utils: move dai id common macros Date: Thu, 1 Aug 2024 11:54:06 +0530 Message-ID: <20240801062416.2203673-22-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: CO1PEPF000075EE:EE_|DM4PR12MB5865:EE_ X-MS-Office365-Filtering-Correlation-Id: 750ed3e2-a415-4df2-e308-08dcb1f3f813 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: rEBfyxFJSxcoU54926BUpoJf8ndDryi0E5Ws/u6HcUqpsUwTYvAI3iV/wfmkD8A5HENUTmK9IQBOE3VDK/7F9k+0zinRL59Crpmn9l/+IWvY0oXNxt51luYgkE7c8xapkCIqKxYA6OyuUB+NNJqU8k3pFNt0RhzYLRo8hq0gS5Dd3jHn7o3i9PjEyvsCCjB/5TwPiiKaxgU6IU/8tWOauuNCB3Xub1Rh+4vUsFToo6QRq42yr841KKqS9c/8sdt9RPZaYGPysJF52tGQxyhLsUh2+ncXmNKaCzlfQQRri3/uYgja20ISwELoLgHpO1tImZJqfV2YTR9lxOnU6VYhTkiwilnukq7ha6wJGx7vGPfc/gzbSXd2DmE+z5Exs2GbY8rtIAok3vZfZBQyrH8tcGEMc7+x//J8zfvGnxa6tsKRuWtJjr0B/M7ZXDtvASY3w4bGj/OpKj6CKeFwHjhudSdPnFNSMKNcP/o/lcDtESDC4r8VohJc6Zpd1v0j2/jyg0ybJm8kYImNJ0GLLSDEgwWJXy2Bo8GernCmS10/Jyf693amBUa6i9ZlSLbAsSR0wbnaluemRR5fkkAofIeziBEwH7nvxTeB88nwExUKVEMziBrdfx/m7cmNVBizvDXs+j9oexMLPGT1rKVugKwK3I73kv+SCPlk7gr+Xt2QqhUv8c7fPvlsAooHSCELdfQzugqcuIKmm+LZlp0fHMhMmyF0aLGR3NWnX+JdeCuxFnvWeMlloTs1U1h5bmuPaJ5Hl0sEcGOB07i8t8UKMVWEvxtjxsN7cayP7obB+G/XdOyZG8pCcavqlC33etu4YAHo4fzy2pwYbq46dRDfdYT+1EGp3x//g50+YvkTpcN2fRwD78cDr77ujABhaLLfZz1gwwBF9hE28xeq8zxgyzP/OPMw/OqZJV06hlqOxvoN0sus+n+gh3IMCIuGCjckcvDwDKBkw8L6Ki/yw0LctBR+nF5LayF8vFrvCQqyjqb37NfGkm6iCcnnHEQyf1sgLqYYKLpEbeYHWXot+PmlpD6pncrcff8CJYj+gRblQzM/2vp0acCULpFqPU5E+Txf26h6PMylJdW3qNmZGI1nMAE0V0kB+9fHmeEzj7Hh7nLr0HkkZeCx3DkMj2hI2t91/v9maDWh/uHRHlwJAVaObLPkfc3AiVPJAy46kTL6n1AQkzk9A7hSSpKygYjEj9TvxGw8uoSOT50lQdu17VFeazGl0UOGsq7TOnLpfpf0xgqupInngoWziC8tLkosRg1RRh0LyEWn+D4OqViLwb1NCBRKM3DuiaoEio3pAA9NyJ7uu6aa3E0ig35Smnde8iu+nyOI/pyxztJ/t2TM1dyyDjY2lViGv2oBwUhRS1jcmv45VeDNuOod7MjYCfemRCLz9A2jJBIQZHxoJXCeOjw+yWNiHQ== 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)(36860700013)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2024 06:34:17.5427 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 750ed3e2-a415-4df2-e308-08dcb1f3f813 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: CO1PEPF000075EE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5865 Move dai id common macros from intel SoundWire generic driver to soc_sdw_utils.h file so that it can be used by other platform machine driver. 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 | 7 +++++++ sound/soc/intel/boards/sof_sdw_common.h | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h index 9e84d1ab6cd0..13941ddd24c8 100644 --- a/include/sound/soc_sdw_utils.h +++ b/include/sound/soc_sdw_utils.h @@ -29,6 +29,13 @@ */ #define SOC_SDW_SIDECAR_AMPS BIT(16) +#define SOC_SDW_UNUSED_DAI_ID -1 +#define SOC_SDW_JACK_OUT_DAI_ID 0 +#define SOC_SDW_JACK_IN_DAI_ID 1 +#define SOC_SDW_AMP_OUT_DAI_ID 2 +#define SOC_SDW_AMP_IN_DAI_ID 3 +#define SOC_SDW_DMIC_DAI_ID 4 + struct asoc_sdw_codec_info; struct asoc_sdw_dai_info { diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h index 664c3404eb81..8bfdffde16a3 100644 --- a/sound/soc/intel/boards/sof_sdw_common.h +++ b/sound/soc/intel/boards/sof_sdw_common.h @@ -16,12 +16,6 @@ #include "sof_hdmi_common.h" #define MAX_HDMI_NUM 4 -#define SOC_SDW_UNUSED_DAI_ID -1 -#define SOC_SDW_JACK_OUT_DAI_ID 0 -#define SOC_SDW_JACK_IN_DAI_ID 1 -#define SOC_SDW_AMP_OUT_DAI_ID 2 -#define SOC_SDW_AMP_IN_DAI_ID 3 -#define SOC_SDW_DMIC_DAI_ID 4 #define SOC_SDW_MAX_CPU_DAIS 16 #define SOC_SDW_INTEL_BIDIR_PDI_BASE 2