From nobody Sat Feb 7 14:51:55 2026 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) (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 D3CCB30BB95; Tue, 27 Jan 2026 17:35:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=67.231.152.168 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535322; cv=fail; b=BGzbHM/7S1jNEz8bP1q3+V2KN+vFvTkliWANLV5lluBjsXfOmgahJjFdRVI+Z3XditM/PeTTjAwhvpL2LN9RGbL+bFA2fR/MkUWxQccJae/ydcPyn0mSGoBUGp7f2Ub2ycOg37QPEREtb914cA2/8FsPyeFWHZz5p06IbE5XQv0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535322; c=relaxed/simple; bh=qEGatSqASYw8ucKMtB3yH3NcRn0NjiYseOBFrI1hXyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L02rf40Yz8G5wh9s7QMdXIuOyN9AqxfNrNeN7vq04hpGDU/vrROFX8uvoK/xBsWceQ8soe1rbiw0ammh/yf8HElLCg7Uo4r1giWAJtMMTzkAom/Nz0oHnvXNWuY69DRiMiumpGToJ8IA0ps4IiynPADEqUsoIEeJRWaZQkkQG2U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=OJzNG7us; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=vLsoyAV/; arc=fail smtp.client-ip=67.231.152.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="OJzNG7us"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="vLsoyAV/" Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60R5mEts1615650; Tue, 27 Jan 2026 11:35:12 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= PODMain02222019; bh=FmI3rVxvOdTgbfWoCO+Zv2ZP+x9hd+NL5fX+FzFsjgo=; b= OJzNG7usxD64NCjn/XV83eZLJd514xmSAHc3Le1usg0cvdY1czyKoF5N27j30oj3 1/w6+ZUxUFrJQsCx8KTq9f/+uqVvlU2qFhNwRElcpgMW/k4gdbYcXVgGlkGWPdPf Jcff7ks1eDhNWeZ3jBGKQUA6735CJAjyoZ3gkN0GkhnDLjZntcP4JL66weViP2p2 M7q68wANnDntsMhSWKMEfeQ9KWZ4aE1OPC/36SyMKWld9rLHxSGMn9kzSaiAw3c6 YlCOcypAQxheMOYVlyFaIylaHQFkpfqp5xDJwrz2GG4/89FPsB0EbQAXi+bb7+Vj gfLuvAO2/dInNL/B9UbFGg== Received: from ch4pr04cu002.outbound.protection.outlook.com (mail-northcentralusazon11023093.outbound.protection.outlook.com [40.107.201.93]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4bvuckb8pd-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Jan 2026 11:35:12 -0600 (CST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gTtXC/8KSBCWcnLOPpQ5yHF7LxgtzaIIKLywwhBh6LpndpspAX/AWq6eBA0hdRdqs8EF/3H7z6GXCQe/akBcx9AKoLPpQUYyjOXLEaDu0rM3o5e/3ztsW2YTWhVrxS+v0czHIyzmVzUeZ/Ld/1/ww6vqeW2LerO7CQM8Ca/CKPERLBc8fdyceIwjIe8X6I2fH7Z9ZSRHjXxIn836mQSkkM08yeGjgB0LtHT2pfa7BchkZ68ny6q8IQR3rCJKxpZVGgaK0y2mCM5qJd2pBcL4avF8BEPt4Q9HW3MY4tGebWdmJlJGt1F+dtioSgjttgS6TgMOHNm5MZCbQwr4SQsj4Q== 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=FmI3rVxvOdTgbfWoCO+Zv2ZP+x9hd+NL5fX+FzFsjgo=; b=T0r9A0bkYZNj5e3eX9Ak1IWwZQH4BQyDIkgEIQmMKCImM2RBNWCoXKsnlCuR61U28I4C2JA77JdeK32XGBzi5YkI5HqLu6MSd3PV751BD8qCnVohgJ2Czo2S8rIf8bywe+YZrwjG+T69AT6OMI3r24oEtn3uTolguPZV1BhiZNAVET38cECIFvZ7EIhNB6Xd7jwvZ9Tz0v82Dk3CZzK+bsA95x8d0CUqmx0y7dBvAQxaZ5K2dNAHAZCfMziX++amkbqflPaA4XkN0hQmtUcPxC4RJhpxIS0pOtR2UCylXJbdpoD5X2cXh3XrHYgq9QD1kYPYkhQ0BsW7Am2odyKcmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 84.19.233.75) smtp.rcpttodomain=amd.com smtp.mailfrom=opensource.cirrus.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=opensource.cirrus.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus4.onmicrosoft.com; s=selector2-cirrus4-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FmI3rVxvOdTgbfWoCO+Zv2ZP+x9hd+NL5fX+FzFsjgo=; b=vLsoyAV/sbn7Dk61rS4lr2CPsL3/wlsOb5C6PU96kJDzGu9xwsP86WqyTeQVIutsUdsn3aHEgnwTbDK9UvU64ueJwJ0jDHtzFXpB2x/pZZHbC0SysWKG9u3tDsE2HeWK4iPMlUKeqDJnckThZ+TSDAzhIFf2fNVqdEnHWtqbX0c= Received: from DSZP220CA0007.NAMP220.PROD.OUTLOOK.COM (2603:10b6:5:280::8) by DM6PR19MB4091.namprd19.prod.outlook.com (2603:10b6:5:229::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.15; Tue, 27 Jan 2026 17:35:09 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:280:cafe::15) by DSZP220CA0007.outlook.office365.com (2603:10b6:5:280::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.7 via Frontend Transport; Tue, 27 Jan 2026 17:35:11 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 84.19.233.75) smtp.mailfrom=opensource.cirrus.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=opensource.cirrus.com; Received-SPF: Fail (protection.outlook.com: domain of opensource.cirrus.com does not designate 84.19.233.75 as permitted sender) receiver=protection.outlook.com; client-ip=84.19.233.75; helo=edirelay1.ad.cirrus.com; Received: from edirelay1.ad.cirrus.com (84.19.233.75) by DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Tue, 27 Jan 2026 17:35:08 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 2E47F406541; Tue, 27 Jan 2026 17:35:07 +0000 (UTC) Received: from lonswws01.ad.cirrus.com (lonswws01.ad.cirrus.com [198.90.188.26]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id F2433820249; Tue, 27 Jan 2026 17:35:06 +0000 (UTC) From: Simon Trimmer To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, Vijendar.Mukunda@amd.com, syed.sabakareem@amd.com, Simon Trimmer Subject: [PATCH 1/4] ASoC: amd: acp: Sort match table into most specific first Date: Tue, 27 Jan 2026 17:34:46 +0000 Message-ID: <50c385a7f64ccd75cabf49eddbc0ec6fe13f3252.1769534442.git.simont@opensource.cirrus.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|DM6PR19MB4091:EE_ X-MS-Office365-Filtering-Correlation-Id: 6abf2ab7-0730-4132-18d8-08de5dca6abd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|61400799027|36860700013|54012099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jQRLzvTV3xNwIIzkfRe1l2WDeQhsbYBskgmSIJqzUGpXXbzOMF2VQ3WwYung?= =?us-ascii?Q?qvunBDIMrgTmjZEGKLY8eZXcMhF7XiJvUnnPgnWcnzM9b5mq8JK+JUMebqKs?= =?us-ascii?Q?PH9mIAAPsuDuvmFrRHw0HRim9uphM9/5I9YhBGEfVE8mvEFWYZ/jAHE7n5dd?= =?us-ascii?Q?2cTMJzcEgU3qGB0WfhwPeFElntCSOWxkk2stgeDxSkti01nigmkWs1AId81d?= =?us-ascii?Q?y/t72JQ5NB+fG2YhGk03JplsFaCSMJuYzjJBDVJ5RmVFqeFv+l4T8OyY2U/O?= =?us-ascii?Q?NmceBiUKTBzG1222uVGqqlCHCa/7UluZahfzf6DLAAVca1zWnjjOBJLDDVfO?= =?us-ascii?Q?AUOExatv/wFhL6EoM4iPrwP8u70LVY7kIJe2rDjFGfO4XSTCbWFoHY6O74tD?= =?us-ascii?Q?EL7rsRIouhvtx1xC/h7377/bkwTS8jGJXzH7ePp+FyLWa/Rh+hD6bb00qT8r?= =?us-ascii?Q?M6K5iqrB9GdWtLEzDkrCtvlGDlZAyR/Z6biiQN1qhKTBRbnFfvpBM20m0+5X?= =?us-ascii?Q?/2Q2veglnjwCyVhzK9HNAyfjSQagISXMCl9FgPkMUpDMkhueAqcL7vwxUfxw?= =?us-ascii?Q?kMoYXyKhad1Z+4aRLyOOlAjTQzIw7OIsvsNEdcfGrEvCVv1Vudn2/49Elzt5?= =?us-ascii?Q?INWgrc+1NNYzSI9IQX5LnCLgBOGJJu8t3xYYxsEBB1nwPD9En84fdtWArcZM?= =?us-ascii?Q?rroAiglkEHVEXOLs1wbzmnskGc7CtAgi179+7yCnrEe8enp8fiMuBfkzdlvW?= =?us-ascii?Q?l3HAEp2zQDIs7lhVfwEGNeu+9J/VK9fllLK+MKNwLMN24z3FOwVa/tcijdAm?= =?us-ascii?Q?xus2ZoSAxJ41trSckV5t1zKsm555Ny0lJOTUHfE3YCx9Asq9EgHNJLDIgSOW?= =?us-ascii?Q?Y2zoQez2Vcxk9ILYC38nvxTF6H9/fCpFB7PTV5YHnNBlauYzAdlpKhUJdEqZ?= =?us-ascii?Q?7ZeGNUUhqzogYXxgwxn1avNWMNatrZstwhd3Xci+O758xhszSeuMl2OW4Q3A?= =?us-ascii?Q?QtkkqCoMvPT8AZnC5a1MWd8RCD07XIWvvf5eePqkpT9VdQ4Nhq2f/tb0UKqA?= =?us-ascii?Q?J6bOJcLR2U+4FLLMHLzWGtOG3Z7u9WvLAJ9/AT1VVxjTCaKGpbD9oLrwKbji?= =?us-ascii?Q?MVJv/Tp8a8wqynTeXy9eY2I5Vt3chapgdNXr00uHx2gl8gaM8ZBPMhFw374h?= =?us-ascii?Q?Wcggxr8DAVYSRgZqhKaERNeXJctLqKzhKRGeoWCjph3Y3/gnzH/4Tnl9u2h2?= =?us-ascii?Q?6n+fyVajYnws66a3emVDtHXPfD9KXBaIzFVww8/HOgEDng+6Ke8DxRzH5dbI?= =?us-ascii?Q?2GOuw/ZkPX7YHuzFLyC5aHfqaOjUymsPYX6hWu4Wi/vcQJO3m40OpmbppIlq?= =?us-ascii?Q?sKhzMihb2dnGCMNZcM5I4HqkqDsa4fd5MJW0Cp7NRGyOcHtaOhJ5Hd+2KFF+?= =?us-ascii?Q?OXcTBfXpM8RaMvwqrQ4ldHWjWyJ1AQuGdYdo3lmnx3ztVtpDIDeEFTaxiu1e?= =?us-ascii?Q?YhGIjxar890uT8Q3PD5M1TFeL/UFpjFO6DZoHMItLvQpRym6u7Agy4UvCZLm?= =?us-ascii?Q?T6ceOeOEqTLkzeKr5x8SQ/eB8gFTDRWYqiuPsdyVKhFZgxmwyVOYPVK4KZGE?= =?us-ascii?Q?QMb+Evqn9SG//RZmEHHv2nWmSVQWLBUpwve9wXengo/7JeDphVNIXmAbGFe4?= =?us-ascii?Q?bGjHmA=3D=3D?= X-Forefront-Antispam-Report: CIP:84.19.233.75;CTRY:GB;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edirelay1.ad.cirrus.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(61400799027)(36860700013)(54012099003);DIR:OUT;SFP:1102; X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2026 17:35:08.6173 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6abf2ab7-0730-4132-18d8-08de5dca6abd X-MS-Exchange-CrossTenant-Id: bec09025-e5bc-40d1-a355-8e955c307de8 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bec09025-e5bc-40d1-a355-8e955c307de8;Ip=[84.19.233.75];Helo=[edirelay1.ad.cirrus.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR19MB4091 X-Proofpoint-ORIG-GUID: KaY7mACVmlIeLhS4ljXajUhkud6ax5HJ X-Proofpoint-GUID: KaY7mACVmlIeLhS4ljXajUhkud6ax5HJ X-Authority-Analysis: v=2.4 cv=Vb/6/Vp9 c=1 sm=1 tr=0 ts=6978f750 cx=c_pps a=oX9DDLBFzmmLrgrYpmrGcg==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=vUbySO9Y5rIA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=w1d2syhTAAAA:8 a=jgX93pD1Kwg-rslIDxAA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDE0MyBTYWx0ZWRfX1sNxP+LoxFZE 72jrinC43jw4k3JOMCqWCS8HN4TLgTxx/DienBmE8E0EeNrQHwgViH5EThNukXGBqdP3w6/sSy3 Az2wCyvrv/AVpukDNpIH9FPUfASx8xaQcOFAT8Ka/wg1LupmPusyxlF+dH/Px/h4E950SMfuQkM 6hGu6KJy9PkeLgESdr9DjaJZ+5Ls36nRxdKL5WQD6ovOgHb4OIaTezkI7JfCCHfVo/hn138V3G8 Qhf7wrcyJcfX83DPpX0yDdXk8xFbmAGBGnI2HmwlP8VGt+jwJ+B5YJOOHoQcxTxYLxVM4WD0s5r SY3dF/7sVUFd1YwfhmC8of1+I4GdqjaxUSh6c50LBBxGXA9N0g/vDbm3RfJbw4l4omGp3STMmoL +qvFJt4e5drNn8Aj9FpgdQdXpb2Fy+FhjkjHaizXmLFGM6z+ulW4eTUuU8b4yNQ4/aGSyy89LvE wMt1dZ7SlMMjsO1pBxQ== X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" Match tables should be sorted so that more complex combinations of device matches are before simpler combinations, with the single device matches at the end. Signed-off-by: Simon Trimmer --- sound/soc/amd/acp/amd-acp70-acpi-match.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/a= md-acp70-acpi-match.c index c5f42bd79548..93eb01a00a0c 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -326,11 +326,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_ma= chines[] =3D { .links =3D acp70_rt722_l0_rt1320_l1, .drv_name =3D "amd_sdw", }, - { - .link_mask =3D BIT(0), - .links =3D acp70_rt722_only, - .drv_name =3D "amd_sdw", - }, { .link_mask =3D BIT(0) | BIT(1), .links =3D acp70_4_in_1_sdca, @@ -351,6 +346,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_ma= chines[] =3D { .links =3D acp70_cs35l56x4_l1, .drv_name =3D "amd_sdw", }, + { + .link_mask =3D BIT(0), + .links =3D acp70_rt722_only, + .drv_name =3D "amd_sdw", + }, { .link_mask =3D BIT(1), .links =3D acp70_alc712_vb_l1, --=20 2.43.0 From nobody Sat Feb 7 14:51:55 2026 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) (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 4C4BD3161B4; Tue, 27 Jan 2026 17:35:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=67.231.152.168 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535331; cv=fail; b=HgXWZDal5WvrSPfNaielFdXhdxnjiv/pZrCRxBNZ/d5u2ENxMy1Tvx0tMIvVqk6pGr4NtHLPp4ODTZT+J5owm7hPr+W/Gg3CChqTbhp2Vemm0GHKKhB+UKst8JboCwY+NypiUROkBnuET5jMVOPex8lmrsVyCRrq8dPhVw6OvLg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535331; c=relaxed/simple; bh=U8bTdLAIDjCYZEDwIL/rQG2OMlBd2/FRVuT49YgEoP8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hzxquZIJze5OlgZ+yzBxZJ0XKZC7XkU6PHm/n8nTBEiVFQ2C5KRaSuX8RVy7gz8F3+3BJb2DP0ev0wkTBklHaGutRQ+bEWaa7Ocu3Ma4mWvAV3w2UK3b/5nl8gLbDolj9hewCqyedcb8jp8x+3bwHXxwDEiGXpqEcbFanqPIPKg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=TNsyakot; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=zhVzacds; arc=fail smtp.client-ip=67.231.152.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="TNsyakot"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="zhVzacds" Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60R5mEtt1615650; Tue, 27 Jan 2026 11:35:16 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= PODMain02222019; bh=sU7Lh/oJq/pWdjVbeDSCGCzJ/UhqwV3xE7wAZHsYyyY=; b= TNsyakotQmnJG3pia8zt5FIFZYtPXJ+yvyrS0lJgyNRM0xJBKq90mgbiZaMoUIcr eaH0nTXz09ac/jzCy66bUdAUb5/tQDXow41+/C65wkJYzhnwfhzFpimY878jJFJu LF2ghU3Y4ZkKOMx9qPbydoY/0VIllsk9hIS8QWyF94oCbOn7k1ynR45FvT0lqF8g naGZjgKJ+U0QSqRaAtUhoGgSNMJhXGIcmjMdTZtZL4DnKAiaSyLJ7QfBuTD74Kcq vQQCCHXrK9NBSdfb9XPCeds9txDrFRh0qbEkTivKQW55DtBzokXTN+ohVegYEDsh uGv0NceIWCpcsc2PQpSdmA== Received: from ph7pr06cu001.outbound.protection.outlook.com (mail-westus3azon11020119.outbound.protection.outlook.com [52.101.201.119]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4bvuckb8ph-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Jan 2026 11:35:15 -0600 (CST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HjXclgwx4v1USqjE/wd5O2klO1++dQFjF5zgPXzvDHuLv5P7x0Xjp4EfmGoRR38/4uDkfb35Voj0XDSBWU5OjGhm19m3DvWDVeDRqJlg6p2YG79tR8m6XAIup9ELuL2F65h+jXLPCa8npTC04iC5vt8DUHSgLukY5Ww3J6V5qzO3uXxsLgWA3kY/syf7d5BjvFbIMP6Vb7HQZavY/OZWWv3rInmopikrURQSYftypTjZihL0RvADwq4JEPduE0jBmDGydGujWIrEvpUX6qjntFJejFWN9i8QZXksRSyyL0R4q5IWnOz6LCi5/TLQtDgZIEvW31/FAA4mmNy6mz36bg== 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=sU7Lh/oJq/pWdjVbeDSCGCzJ/UhqwV3xE7wAZHsYyyY=; b=AkMtVY4VOhEZWRWyuwEk2D2DIh9Ftc7/QkaEZaohyYR1HjnGnB6VV5allhhvevxq13+aIVunrmh1JX560nFM04Cmg/9cSWo6uwn25ijKHP2cqAsu2RMlqKv2BY9Ze4xeczd7ATQ1ERnruMzeo/4fm4uvE6KDdCBVaNLI/pEx0FvUYbJIz4RGbclOr6FDwurWOJcuYUMYE14rwJthqwdw5t3bwm3OQMsv6Dw8rCdw1E7utUvkf1QfMqXtzlw78/HH6eHOSo9fDC8KujKFW1rApUPMjo4viL9Au9PO8530cT4l7Ej3aojYVpunKhGS/IMYVwzxirKHe34qTabyrpkjaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 84.19.233.75) smtp.rcpttodomain=amd.com smtp.mailfrom=opensource.cirrus.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=opensource.cirrus.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus4.onmicrosoft.com; s=selector2-cirrus4-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sU7Lh/oJq/pWdjVbeDSCGCzJ/UhqwV3xE7wAZHsYyyY=; b=zhVzacdsWpDsuHWazyqvcZQRT8PSr6U37FNe96XMnW5UpBwx3V4CdX2THmQi/l2yR34y7RHCROODU8fjnSRmpCkF9yiqDeEMERuyLk805agMwYtfZGl1j3g9NoUzsZSTqpnsdevn0r0FxoBdJlu3PIXpDTK3M6VyT6DST9Et+vQ= Received: from BLAPR03CA0050.namprd03.prod.outlook.com (2603:10b6:208:32d::25) by SA1PR19MB5499.namprd19.prod.outlook.com (2603:10b6:806:233::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9542.16; Tue, 27 Jan 2026 17:35:12 +0000 Received: from BL02EPF0001A101.namprd05.prod.outlook.com (2603:10b6:208:32d:cafe::2f) by BLAPR03CA0050.outlook.office365.com (2603:10b6:208:32d::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.7 via Frontend Transport; Tue, 27 Jan 2026 17:35:11 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 84.19.233.75) smtp.mailfrom=opensource.cirrus.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=opensource.cirrus.com; Received-SPF: Fail (protection.outlook.com: domain of opensource.cirrus.com does not designate 84.19.233.75 as permitted sender) receiver=protection.outlook.com; client-ip=84.19.233.75; helo=edirelay1.ad.cirrus.com; Received: from edirelay1.ad.cirrus.com (84.19.233.75) by BL02EPF0001A101.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Tue, 27 Jan 2026 17:35:11 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 4DD35406541; Tue, 27 Jan 2026 17:35:10 +0000 (UTC) Received: from lonswws01.ad.cirrus.com (lonswws01.ad.cirrus.com [198.90.188.26]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 1E131820249; Tue, 27 Jan 2026 17:35:10 +0000 (UTC) From: Simon Trimmer To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, Vijendar.Mukunda@amd.com, syed.sabakareem@amd.com, Simon Trimmer Subject: [PATCH 2/4] ASoC: amd: acp: Rename Cirrus Logic component match entries to include link and uid Date: Tue, 27 Jan 2026 17:34:47 +0000 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A101:EE_|SA1PR19MB5499:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d590e3f-4a59-4cf9-45e8-08de5dca6c2f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|61400799027|36860700013|82310400026|54012099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uzie0N4rIw+UQRYCsvQ8evYjqOYUjbdUb4dBneky5uGjJJlCglRm+VkY3Ssu?= =?us-ascii?Q?Zfpx5OvFDT+2MS1Sjh4ZA13BKQ6Pfkcm4Ch3U6KodNhEGtlld8i+LzAUHZJE?= =?us-ascii?Q?DtMX/60Uhi1EZHrMc51+2orAIxkKFKCdJwlYRXSvyJBAokRO1Ou++dSYFAT8?= =?us-ascii?Q?TyQMhsEXJFB4ZTGroRux++bgKYbW11fvpR+dG+RAel8vzQzN+Zn0LXoDbPQs?= =?us-ascii?Q?pcfKCBt2NzuqFHsy9AMzyQrM6/XNOnREI27scnH8YSR8FhgarGdalwKvAlbt?= =?us-ascii?Q?6W5im3YvxTGhHfku5LSoECoFRmkqNmHr+JHQOBLQG3i1OpRY+K1p2VYSa2Yb?= =?us-ascii?Q?9+lokdeCH11t911QH7b3u/rG4sQGBHcxPa21K5Zup/n9ewcsXu6n1W4p3xwh?= =?us-ascii?Q?3IaB6rigmaJdG06qgzO0OCn55kkswQaVEwAi7WBJvnW4IGIWcjMOYH8RtvCr?= =?us-ascii?Q?aApOuo7MYfNRsPhfboXafYmo6fTeDGH7p/o7MX4qBwEUc5beFPxFQibuTjvw?= =?us-ascii?Q?K15RiudvKJswI001oFgjGpLlttOnCe7hd44ZNYG0BSMGOfhgZtBPIXTNgSb3?= =?us-ascii?Q?3DK4VKm2/zF2aBNShgzFGn6+marmwvGX24xb6J+fmgH/rjOJUzXy1pGZKuR0?= =?us-ascii?Q?ySGe+lsqVT/USHgjFUhPZbq6pUgktLr3AACWinYIpIuCM+QcuWiLVCG8GtH1?= =?us-ascii?Q?zXH5iypflV+nLtDKa9HF8Sw/X5RbEB/JJPn32EJ24K2Pi9lThr32ZVoQa/ky?= =?us-ascii?Q?CEpTe7iXOcUlV7VtuqPdFGPNEJUSoKtAIWEYSgZJNJZ5VvrtPO7rQJxE/Itc?= =?us-ascii?Q?EE15aht/Gx4N5DdZ6vbssgLoCoBHr5YIIfPvFvcTX6TVuNSF504vaYvFXhpX?= =?us-ascii?Q?Webaqf6hHiVdpQhzL50ajMQeszqyxmmLEnUUzLlpU9vSHQuol4Z+txUAU0UA?= =?us-ascii?Q?6QvCsSbFQvL04g/ZliBfpxw44bXFZrOOTK+TArktDGXqpyVr2aDKU0nbiaYa?= =?us-ascii?Q?+zQBdfZij4HQ8iS/vijLp17xfcIR/GYLUpkBOf6JRJaQCFe46IaLxxWkn11j?= =?us-ascii?Q?h8L1nRSf4zIlO8itNWc+va3q6DzuSLvYdIljU/+dErFlgGXirXEDC4nsLzj3?= =?us-ascii?Q?LwUZ2Htuz2WTTL+DJ7+GcOIqOV8KA+y/o2oGAzvCOY9JNQOqOzCwLWVZM5dz?= =?us-ascii?Q?71DsCOLVTuWs5V7cKPC5IvZJx1RzMyiP+pRAAbc1rOorbjKXTW9yNB/AzoFJ?= =?us-ascii?Q?DknV/FNBG0InvMNDOFdVjpz3hX5vXgwisnu84NcLpvKKxyywFhwPqPuQRfSy?= =?us-ascii?Q?i7rU3Y/Ftd7ZG6NY5ufRd0TedkD/H4VSPX1w7FTDFsS6Ac+JgYhhhKWiu0sr?= =?us-ascii?Q?LNYAM24JesG7ErtFTyzad7bM3MTyWoFwzA8HoPZvu5eBE+uLBNPXnklm1VkK?= =?us-ascii?Q?4byge6/+Jchrl9k1RcBZDpQd+shAN8kW/Pyx4SUx5euk+LGR0zoB5Ww6il0X?= =?us-ascii?Q?/gb2FvzZ6qEjy/V71Em+8OD77EbKeU7R2+L83ma3k7WPNuAtFhKfb7OSJRX0?= =?us-ascii?Q?WrrsoQyObgygdWKGRr15XL/Hh/JUKIk5+2qTvRazp79i0Eqg6A5O7nNFiutd?= =?us-ascii?Q?eCCn9rJd6Ez93rlKMNmlkahR7zMHgjgRQHCnCiUf+zKC2ZVSJ3SDJctAnnRe?= =?us-ascii?Q?bMJtsg=3D=3D?= X-Forefront-Antispam-Report: CIP:84.19.233.75;CTRY:GB;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edirelay1.ad.cirrus.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(61400799027)(36860700013)(82310400026)(54012099003);DIR:OUT;SFP:1102; X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2026 17:35:11.0953 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d590e3f-4a59-4cf9-45e8-08de5dca6c2f X-MS-Exchange-CrossTenant-Id: bec09025-e5bc-40d1-a355-8e955c307de8 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bec09025-e5bc-40d1-a355-8e955c307de8;Ip=[84.19.233.75];Helo=[edirelay1.ad.cirrus.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-BL02EPF0001A101.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR19MB5499 X-Proofpoint-ORIG-GUID: u9jagwzD1WYUJaSfYAsErq6dH6HQOC1F X-Proofpoint-GUID: u9jagwzD1WYUJaSfYAsErq6dH6HQOC1F X-Authority-Analysis: v=2.4 cv=Vb/6/Vp9 c=1 sm=1 tr=0 ts=6978f753 cx=c_pps a=j7k210cWVAfXhyiYu0S74w==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=vUbySO9Y5rIA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=w1d2syhTAAAA:8 a=5kxn1ZMerDWvsB6lJLkA:9 a=+jEqtf1s3R9VXZ0wqowq2kgwd+I=:19 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDE0MyBTYWx0ZWRfX/buDYNxzMV7+ TLTqUEvXeSd4IfEdDkzW/ebe7+3THQyzhLGab0yisRksOnbPycCWIyarUJdUP8aU38dJUo+k1xB TyiKBd57bO+0JVveZyJ3+nNwDq0bgTZ/NL39+j8JRh2duYQ/pPrIf1Ft18nmx7ziWMtUZGLxz1T 2ju0oGilmiw5P+wzfwcB2VsreM+qOmoE0+s9ZF1yh/2XDA/VcrTsWtGk/BBo7Rn76gVUQ0LEpLP 9h51x1jX+GmH+45Jt0y07FvVY02LNFBy9tE+yF6izeOeSjOmDvYISNoZdi4O2sqkwJeU/gnAqjh RuMHicRkOfIGEYk38Uv3ZW7qqD1cwo6+RlqyoavoXmgMh9RRYB5NcjkNJi+meT7hOnBosUSCJVT 6S3dDadyk8vYn9vRNaRdLFvD6xb3e9OdheTL8UEgyxEKnU8rSFx5+Cnp6Buul4Az8dIsQzF6G1S sFVu3T3mMxHVreLQ6pQ== X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" In preparation for having similar matches with multiple UIDs on the same bus rename the match entries to include the bus link and device uid numbers in their name using the lNuN convention. Signed-off-by: Simon Trimmer --- sound/soc/amd/acp/amd-acp70-acpi-match.c | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/a= md-acp70-acpi-match.c index 93eb01a00a0c..44fab145aa59 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -187,7 +187,7 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpo= ints[] =3D { }, }; =20 -static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] =3D { +static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] =3D { { .adr =3D 0x00003001FA424301ull, .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), @@ -196,7 +196,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_0_a= dr[] =3D { } }; =20 -static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = =3D { +static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123= _adr[] =3D { { .adr =3D 0x00013001FA424301ull, .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), @@ -229,7 +229,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_1_c= s35l56x4_1_adr[] =3D { }, }; =20 -static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] =3D { +static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] =3D { { .adr =3D 0x00013301FA355601ull, .num_endpoints =3D 1, @@ -256,34 +256,34 @@ static const struct snd_soc_acpi_adr_device cs35l56x4= _1_adr[] =3D { }, }; =20 -static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = =3D { +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u= 0123[] =3D { { .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr), - .adr_d =3D cs42l43_1_cs35l56x4_1_adr, + .num_adr =3D ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr), + .adr_d =3D cs42l43_l1u0_cs35l56x4_l1u0123_adr, }, {} }; =20 -static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = =3D { +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u= 3210[] =3D { { .mask =3D BIT(0), - .num_adr =3D ARRAY_SIZE(cs42l43_0_adr), - .adr_d =3D cs42l43_0_adr, + .num_adr =3D ARRAY_SIZE(cs42l43_l0u0_adr), + .adr_d =3D cs42l43_l0u0_adr, }, { .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs35l56x4_1_adr), - .adr_d =3D cs35l56x4_1_adr, + .num_adr =3D ARRAY_SIZE(cs35l56x4_l1u3210_adr), + .adr_d =3D cs35l56x4_l1u3210_adr, }, {} }; =20 -static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] =3D { +static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] =3D { { .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs35l56x4_1_adr), - .adr_d =3D cs35l56x4_1_adr, + .num_adr =3D ARRAY_SIZE(cs35l56x4_l1u3210_adr), + .adr_d =3D cs35l56x4_l1u3210_adr, }, {} }; @@ -333,17 +333,17 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_m= achines[] =3D { }, { .link_mask =3D BIT(0) | BIT(1), - .links =3D acp70_cs42l43_l0_cs35l56x4_l1, + .links =3D acp70_cs42l43_l0u0_cs35l56x4_l1u3210, .drv_name =3D "amd_sdw", }, { .link_mask =3D BIT(1), - .links =3D acp70_cs42l43_l1_cs35l56x4_l1, + .links =3D acp70_cs42l43_l1u0_cs35l56x4_l1u0123, .drv_name =3D "amd_sdw", }, { .link_mask =3D BIT(1), - .links =3D acp70_cs35l56x4_l1, + .links =3D acp70_cs35l56x4_l1u3210, .drv_name =3D "amd_sdw", }, { --=20 2.43.0 From nobody Sat Feb 7 14:51:55 2026 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 D2A4D298CB7; Tue, 27 Jan 2026 17:35:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=67.231.149.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535324; cv=fail; b=M2OBwHSCGtrCT4+Zg5+YAztnGwBRyM9RCDLnneghdVtJjSsh6/dRG2D6DFLsexbi8+Gr/oqpEIVG5Kn0XIXoPiX1uq/EKfvYJE7F3k7d0924oLU8ecdVZXjlMhKTMbwm+JFx0FCBGMFLEyMVgH7BNXHpDxGeZCdRv1Su6Ex/8Xk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535324; c=relaxed/simple; bh=CNXWogO3lCEj65fF3oxNpmP+2igCtuE89jK6D3UaZbE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZbZijE47G8Ku0EA296SMvlkDiFDhnHMZakQfloQFet1/EyhXwTDW+t8ec3iN0C/eo53bSlWuP1S4ZCryDiMceBzl7DGQhYoK/FVoJj9ai+3A31jZ9Xd+Uzk43Aw4C/fZHHWCdZ26jEe/eXSKS/qAaUkkbNdJNChT/fpMxl9g2Ck= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=ZdtfaM8S; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=mdJRbXl7; arc=fail smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="ZdtfaM8S"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="mdJRbXl7" Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60R5wLqd002930; Tue, 27 Jan 2026 11:35:17 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= PODMain02222019; bh=3fvAPJJODqA0kTDQrLEXFuwsEIzWoyzsb9+eolu5doc=; b= ZdtfaM8SqQKQbQfqSrevPYeUbDwm1F6B8ke1FnxhLxTZEeHJpFqMOPjSl8RHVFkb FvyyrQ8GE3AWPHqa32RGLaLT+8WERP32UCoWW4GZHqtuuHg8sXbCyiH/bBSiPoja 6X75H6fAqNzkVgsqWR/356TsJjdhdopTv+KBqmGXgDFexXTr4Vw4mxbdymoD/wYi ejbtXbN2WA6V3z1A8MKWQeM0bAPuiaWCn1nuX6AI3XtWJnNMLcJ1Bhhtzk8LWbiZ ddTe0aci9SkhAtvOT5ZymfsytJe3Tnmto7UDyLRU1MjZ4KhD0xGjweEGsk85nJbZ dVL32UVAKCvZMzNPkif/Qg== Received: from bl2pr02cu003.outbound.protection.outlook.com (mail-eastusazon11021110.outbound.protection.outlook.com [52.101.52.110]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4bvvc037cr-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Jan 2026 11:35:17 -0600 (CST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BC1y8pJPGbjJBK9+EdmCKgNswPMLGzvWNB9U0sgPt1JX3MPeLXF1qKHUOtl2zI27YIkWGq9KhgYsKeNqD0CYn5+L4UUBReGX7wmeZTrjKfIVMHNN7k/PQ8efyiA/UNFC0DS/TDKcMPXls9Hqv7WVYo8oMkHDeZ5y8KHWZ5laBBPSwIL5RB9J3S/llNuNkJDd1vkNRdjhBrs09FLDLu5r7DAgJegYhPrqY0us2LN7PU34Z9+3+46Kv2kgFqxBUgGyxqcerfwFsKoVXWRCMSawVM+HILy6kwqcZybKMo9W83HzgGp3xBKnJpnqLSyxFeHgyTz9h8jOaOvw7ZiU7sT0MA== 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=3fvAPJJODqA0kTDQrLEXFuwsEIzWoyzsb9+eolu5doc=; b=KSHbIDP5CZ1JrFcg6fBK45Gdz4Jr2NmmNJyKCmCBSmLxe3074zIUvXUFrcF3M+3FzFWUSwuslgIdp4mNFgdYVGBbmVAytZu8HZApzjXcrzqf7NSMnB789CZdcizMT+Luhl/bhSo2BBQZe/sp+PGgE6kvasaWGlBzcyk48nc+CyBLR6fP7vn2dBMB8vrpan64DNbIZnvQo+VHAHaXg47T3Ow8zAY+K+TdJd4WLbHPty3Tg7/oOuLId185HJBm73g2zrQRoNl00LVZKvA6UpGAWp1iRJFNq+bxlSERNcCrJh5UysngHlaiibru+r4i/v21Be4mopp7R4wGrUXLtkpZOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 84.19.233.75) smtp.rcpttodomain=amd.com smtp.mailfrom=opensource.cirrus.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=opensource.cirrus.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus4.onmicrosoft.com; s=selector2-cirrus4-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3fvAPJJODqA0kTDQrLEXFuwsEIzWoyzsb9+eolu5doc=; b=mdJRbXl74cqsG6fvRe9hOT0d2f4OZooYo0vwpZwVQMqJGP4FKmCMD4Xp0PSujlXf3lDwDEHKPDUnn1W1ql1UOr+0zxtSFFGt2X4OHOxAvIBNNA/T9O0y2iAQ3wfQoynnaApa04ku0rY9VvvIA9qduSCnJc3CDApFEBcaaimoEeA= Received: from BYAPR05CA0027.namprd05.prod.outlook.com (2603:10b6:a03:c0::40) by LV2PR19MB6008.namprd19.prod.outlook.com (2603:10b6:408:14e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.7; Tue, 27 Jan 2026 17:35:14 +0000 Received: from SJ1PEPF00002322.namprd03.prod.outlook.com (2603:10b6:a03:c0:cafe::96) by BYAPR05CA0027.outlook.office365.com (2603:10b6:a03:c0::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.7 via Frontend Transport; Tue, 27 Jan 2026 17:35:12 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 84.19.233.75) smtp.mailfrom=opensource.cirrus.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=opensource.cirrus.com; Received-SPF: Fail (protection.outlook.com: domain of opensource.cirrus.com does not designate 84.19.233.75 as permitted sender) receiver=protection.outlook.com; client-ip=84.19.233.75; helo=edirelay1.ad.cirrus.com; Received: from edirelay1.ad.cirrus.com (84.19.233.75) by SJ1PEPF00002322.mail.protection.outlook.com (10.167.242.84) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Tue, 27 Jan 2026 17:35:12 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 7C4DC406542; Tue, 27 Jan 2026 17:35:11 +0000 (UTC) Received: from lonswws01.ad.cirrus.com (lonswws01.ad.cirrus.com [198.90.188.26]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 4C741820249; Tue, 27 Jan 2026 17:35:11 +0000 (UTC) From: Simon Trimmer To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, Vijendar.Mukunda@amd.com, syed.sabakareem@amd.com, Simon Trimmer Subject: [PATCH 3/4] ASoC: amd: acp: Sort Cirrus Logic match entries Date: Tue, 27 Jan 2026 17:34:48 +0000 Message-ID: <0a756390dfb7e928246d0f35c611f175e1311e55.1769534442.git.simont@opensource.cirrus.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002322:EE_|LV2PR19MB6008:EE_ X-MS-Office365-Filtering-Correlation-Id: 232166a9-f12f-4da9-cd39-08de5dca6d4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|61400799027|54012099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JGb5+fjNiJRKbSHRe+aQDaUZC+5u0oSawP2DxePvU9qqDFPZQjfZUgqECH+A?= =?us-ascii?Q?j51U+3J9pa2Kh9AGR1JdPS1jSSvO86IP+Fzr1T9bRXSopkGa+calrEX/LOou?= =?us-ascii?Q?y/FVUq5uPYK9/R5WcFoP1nZIvQGqz6He/Q+5FQdYemE9ybl0PCLd2/DR3P/5?= =?us-ascii?Q?myt+7HH1lf3MEBXFl6s36LSZmhW3+mJRGFGNUXWQkrW+GbDBm/QQOs/eFvvn?= =?us-ascii?Q?3DcT17+tobUtExaluz68d9X2IcU4t98eQoLjcTw9UWvESfi7+uzl9Zifsx9r?= =?us-ascii?Q?4LgAEACdePrbCl7x4JQLiBQsv0x0EKwLmqkdk1+sqeiw44SLSNyXcTPmIPc6?= =?us-ascii?Q?ZdbA7QyI0Emt8eB2j07rzgo2rBDy7T0se1NEmcN9zfpbY3hWo/smgQr1IvM4?= =?us-ascii?Q?laemRYqB+VFpKQn9s1ReuComztP5EEmb3CpNR5S5n2dEmexnccHrXdzK5OEf?= =?us-ascii?Q?g+FHzUTb//vIfOcnlQuKhWwPddJRqa/ZeTJY17HBpLwMVB2KDYuuOdBLD7FQ?= =?us-ascii?Q?blMjfKJ6HPi64uKEazFrAK883SC2kiKJNz6fUKysjg0CNg6+eLCEu1dUkZsn?= =?us-ascii?Q?/w521tvITP7v9lscGKvje9KXqsKWoKsVoFY/yPuV5tja3cSpX9fWoejh05bT?= =?us-ascii?Q?qISBAt90U/zQ8REsLv+sQibNqx7juZZFOG4k52zFZnWsCNDJF1SuJuw6eKvT?= =?us-ascii?Q?KInSlWRedTudFc9ngTaMvjhokLX6TlpY2WmSbfCJeMfQDmj5W6KEctrwu65w?= =?us-ascii?Q?4Q615hLlwVodHH2XZxj4RMcQt1qgScbzkRnjsvgVpNc2Ft+v08YR1n/SuEyP?= =?us-ascii?Q?rvBgcF7YPMbLdHUBaYnwtRWS1HNOTBaAxKcELGtwwmWkmhAI4qPALmLfwwR1?= =?us-ascii?Q?JlgLWoNKlZGIk2/okYdnkPIBDYJQ4IdhqoPFalf+Fk4F20AoppDZpglpA7xv?= =?us-ascii?Q?dmCQ3HoEeHVAMTnurTUqGlw+bpibqR9dvLyEX54kTxlofwDKEGBvtrl54NEi?= =?us-ascii?Q?tOoYbXnddm4p2Lk/E7GgnzJdMca5Y+tVH8vNb1y6hN6qePKCfkyXpJ6NXVtO?= =?us-ascii?Q?6T2Xa/TzvvMsrySTbuvNsRTJCSrES42zsaaSncmqO35tJZFejk9YCEhZQK7U?= =?us-ascii?Q?qDIAQniHxJ6CBMFO5ILwtPHHNYCvRL8EQTvWfLnr4VD+6+lkM7gxGpXJtcEw?= =?us-ascii?Q?3wz9kIuW6MDDYdHd44PAfP/8ZepqvkuIhyhOYm+G6DgZOjqCrbiFNZvW9NoJ?= =?us-ascii?Q?tABTnFwAmiOJyoctNe4T+sPsupFFkbIDuYmndKHgH/LU6epwZLpfdBAdUZe5?= =?us-ascii?Q?qlXVgATtKY7ThPiE3VIbJlapeQvWCW1qa/WpL/1cqR33VO0TvKlzGnG2cc9x?= =?us-ascii?Q?XrD0HsEcHITJXsTra/97adLtjQ1zb8XD3PEbqNtvKQH6f/nBK8FwvVFO8lkZ?= =?us-ascii?Q?86z/x5NKt4Q/d4sViP2EPcvTDEYDDH1qSNH9kH1RlU4USIjJ5cZXNYn9Do3H?= =?us-ascii?Q?DEctRTVhecn8ARFTGWH2ZlafbmL4/TyMkfhex7a7CRCwWPfnTb4wbB6J/K/S?= =?us-ascii?Q?aTqGpFVojrkQGpMke5mVA/lSUBn7AU+Adom+P8kEv7UwqDPuLnSVxFdo7T2m?= =?us-ascii?Q?NR+WWjJGcj87u8GqoZ0I/i0PO7NnOPuNoObMUGcFcaqg7mY8Nn2pwvszwDa3?= =?us-ascii?Q?zWXD/A=3D=3D?= X-Forefront-Antispam-Report: CIP:84.19.233.75;CTRY:GB;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edirelay1.ad.cirrus.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(376014)(61400799027)(54012099003);DIR:OUT;SFP:1102; X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2026 17:35:12.8365 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 232166a9-f12f-4da9-cd39-08de5dca6d4c X-MS-Exchange-CrossTenant-Id: bec09025-e5bc-40d1-a355-8e955c307de8 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bec09025-e5bc-40d1-a355-8e955c307de8;Ip=[84.19.233.75];Helo=[edirelay1.ad.cirrus.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-SJ1PEPF00002322.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR19MB6008 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDE0MyBTYWx0ZWRfX6BHZ0ARUtEYB Wy56sOytcFJ3riMUb8RNQ4On0sP0Xml9nmMlUahCMfn79giuFBTgsEzsRODTrHlc+bKAbqwzqeU OTeZmhEsHAW/N/20CagD0EfML9yNT+45/mU0p7ttTtTXI1zTffXI7Ln32bAZ79YY7SBsnC+sPoN Fil5mojUSQpkaX+Go9phONVqeNGrS34629wuYM+3846CyEtSWI9lgpZpR7/hgGxus3NPnHBphbt JS26V3EjJCcBoOBaIOWibzmeK1chx6+blD/xKiNhDj75qPVWi0hojw19057clcAs/aeMnamfpBL WeO74nkwfnfU9/QdiB0usFoj1Va9Goxbb7B0RVg4ON5oxxqvTGuQobzFN4VB7Yh4TlIbxk1YvNF bROOIqSQqNg+sH/8VRqpWXGEWJmZuE0hpja7Zhh+sg8z6Vn+gh53qZzUylXH/M1Y3u3an40W9/k jkcxhE07igDiSSvRZXA== X-Proofpoint-GUID: uHZbkTLzZR1ZRJtTBIQ8ehi6sppI0LCQ X-Authority-Analysis: v=2.4 cv=KvBAGGWN c=1 sm=1 tr=0 ts=6978f755 cx=c_pps a=Fop6EJdm3JO4gNsOK7pFUA==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=vUbySO9Y5rIA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=w1d2syhTAAAA:8 a=EAmnLV0rfriLcecEFJcA:9 X-Proofpoint-ORIG-GUID: uHZbkTLzZR1ZRJtTBIQ8ehi6sppI0LCQ X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" In preparation for adding more match entries sort the ones that are present. Signed-off-by: Simon Trimmer --- sound/soc/amd/acp/amd-acp70-acpi-match.c | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/a= md-acp70-acpi-match.c index 44fab145aa59..de8f5a2a8e9d 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -187,80 +187,80 @@ static const struct snd_soc_acpi_endpoint cs42l43_end= points[] =3D { }, }; =20 -static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] =3D { - { - .adr =3D 0x00003001FA424301ull, - .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), - .endpoints =3D cs42l43_endpoints, - .name_prefix =3D "cs42l43" - } -}; - -static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123= _adr[] =3D { - { - .adr =3D 0x00013001FA424301ull, - .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), - .endpoints =3D cs42l43_endpoints, - .name_prefix =3D "cs42l43" - }, +static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] =3D { { - .adr =3D 0x00013001FA355601ull, + .adr =3D 0x00013301FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_l_endpoint, .name_prefix =3D "AMP1" }, { - .adr =3D 0x00013101FA355601ull, + .adr =3D 0x00013201FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_r_endpoint, .name_prefix =3D "AMP2" }, { - .adr =3D 0x00013201FA355601ull, + .adr =3D 0x00013101FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_2_endpoint, .name_prefix =3D "AMP3" }, { - .adr =3D 0x00013301FA355601ull, + .adr =3D 0x00013001FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_3_endpoint, .name_prefix =3D "AMP4" }, }; =20 -static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] =3D { +static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] =3D { { - .adr =3D 0x00013301FA355601ull, + .adr =3D 0x00003001FA424301ull, + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l43" + } +}; + +static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123= _adr[] =3D { + { + .adr =3D 0x00013001FA424301ull, + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l43" + }, + { + .adr =3D 0x00013001FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_l_endpoint, .name_prefix =3D "AMP1" }, { - .adr =3D 0x00013201FA355601ull, + .adr =3D 0x00013101FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_r_endpoint, .name_prefix =3D "AMP2" }, { - .adr =3D 0x00013101FA355601ull, + .adr =3D 0x00013201FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_2_endpoint, .name_prefix =3D "AMP3" }, { - .adr =3D 0x00013001FA355601ull, + .adr =3D 0x00013301FA355601ull, .num_endpoints =3D 1, .endpoints =3D &spk_3_endpoint, .name_prefix =3D "AMP4" }, }; =20 -static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u= 0123[] =3D { +static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] =3D { { .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr), - .adr_d =3D cs42l43_l1u0_cs35l56x4_l1u0123_adr, + .num_adr =3D ARRAY_SIZE(cs35l56x4_l1u3210_adr), + .adr_d =3D cs35l56x4_l1u3210_adr, }, {} }; @@ -279,11 +279,11 @@ static const struct snd_soc_acpi_link_adr acp70_cs42l= 43_l0u0_cs35l56x4_l1u3210[] {} }; =20 -static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] =3D { +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u= 0123[] =3D { { .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs35l56x4_l1u3210_adr), - .adr_d =3D cs35l56x4_l1u3210_adr, + .num_adr =3D ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr), + .adr_d =3D cs42l43_l1u0_cs35l56x4_l1u0123_adr, }, {} }; --=20 2.43.0 From nobody Sat Feb 7 14:51:55 2026 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 E64D13115B1; Tue, 27 Jan 2026 17:35:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=67.231.149.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535331; cv=fail; b=A2o8aShj0HJofWlqnsh/YphSr+j7ZWXVopyLr8c2Z+VWDEV3CrdVxft8KSfZrArLfgT5j5YJ3xzeqO5cv31xjWAZU5/YmM3z86GDY1fdC8cszB0ZJFHEFOag9QAjmXGinXuDL8b6QUsvOXrxt4Y1i7MKGPvHq0fGHWR0vH1QQHc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769535331; c=relaxed/simple; bh=TLIS5M0PrF4M0mZRQO27Cxw2TR3LikmiGBIyLrpU+tk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HQfCYC869fG7AWL06HAidgdcjLEYfAiA3CCAH/hqYrngSvs7IfEKVtA+LPpjx1V6dLe/Tl0i+vmKU375QjkoPAxYEqu8XlauPhthTHM3I2qIRAtosdnJkuUq2nDac+j5DGbgZd0vNYE2B6+Cj5kwwQrH9Ocs7LwkAjuFcrjN8v0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=q8QbWnlY; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=SxrUeQV7; arc=fail smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="q8QbWnlY"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="SxrUeQV7" Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60R76d9s112464; Tue, 27 Jan 2026 11:35:20 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= PODMain02222019; bh=7yRcI0aIWYxt1AKxTAA9r4DRnyuryJWpmKCVNT81VQM=; b= q8QbWnlYNJxnPfrUsj3YJtM1NN3mGhN38hnRNwQ3pXRtWqG1X536M4Zaa3QInTTb pqNt99/fmkKV81Yk59pgMUAFyzk9u1OqXboyrbtksVqSInM8r+LrVtfo51TJMXTK 8z2W7nuq/zeikwHr3ulm0ryS2BxgmETUFQssczsy0Kw9N/eVWizV1vS7fbMGzlaU zf9oGcnQD8FcmhVHcphA6fVk/1NhFvt1gdSg/rYxKNunjCr2PV0g7osRpONRRl9T zm5zywyEypB12kl1Avp8OqdEzHwV2NPRLbMYaX+eOVUlPIpIdiskUtKWZCpha1on +pxmFqqzDIIi7n+N0XKKNQ== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022127.outbound.protection.outlook.com [52.101.48.127]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4bvvc037cs-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 27 Jan 2026 11:35:20 -0600 (CST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZETll1MGiRYn/tT7bfm88fp4p4fPiOyuGwVwONwYOPnl7aSJyENorpMo9imubMjI5VZR1z4OZw8yAeLwFpoWSoJCIGeEEiNEH/9alE4hbA0jrpjstEkZTg1NFh+d0Clzo8z/Kce4W8z23NGJbiDta3K0eAwIXtkz18MdMsuvJZJm+GSaXoeaGB9oIGPJbqVG/IehH9ExDU2sgG7fPqkLd364ZRveAp75bEcl6mIePhV8+/9seF/i3rhWJJCHBZvhxZRHmnAAKU+RaMsyV72/xYJUgUVzzxsOBntRzkzROJ+EyjS51T7GUsYL57E1Ji3HxhF2+oSBTE/2iv2i/lAvTg== 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=7yRcI0aIWYxt1AKxTAA9r4DRnyuryJWpmKCVNT81VQM=; b=SMUM3MgRZArdknlmhVpcXAwjOmxEUK+x6go6fADpwnOV07YkqUITb2OpTbSymXDZoNNmwmzmzXZKjP/m7uI/prAn/HDp5zy3w3mTN4GFLi9u0ES42jcIJHbtrMEtfiVbxMu1zehgP4U+9+cCxZzjQ2HaKZKrZVA4VVNow0y9+2bhqz3OaDuxf8IyHkes9nZMtVGZD81Z75DI8NEMqb1G9FMmIAkDuIKBlrQRkPcWh24pRWZejKwbpGf2Nt10rQzxVRJOTmE0A0Zq8bABrCOmRkhsHrm4D0YFY5/6X5V5hBWASjMKIDyvcmJDypNG60Tpc76zK1ZBhJIU4iiAo30BQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 84.19.233.75) smtp.rcpttodomain=amd.com smtp.mailfrom=opensource.cirrus.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=opensource.cirrus.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus4.onmicrosoft.com; s=selector2-cirrus4-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7yRcI0aIWYxt1AKxTAA9r4DRnyuryJWpmKCVNT81VQM=; b=SxrUeQV7xusDyKuKAbgTSmQuvYQvKMXevBw91hMp8YH2sKWgoLRr9Nyz5yQby/7skTczndotyQK3kQCvY1PAGjoYWNCHIftJndyVw4DwwF3AninLaolg4QKfcawu6VivsZvoB70oMmhKlFngCHe+kWKlG4TOcMiqEIW1PQcirNw= Received: from DM6PR06CA0097.namprd06.prod.outlook.com (2603:10b6:5:336::30) by IA1PR19MB6417.namprd19.prod.outlook.com (2603:10b6:208:3e7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.7; Tue, 27 Jan 2026 17:35:14 +0000 Received: from DS1PEPF0001709C.namprd05.prod.outlook.com (2603:10b6:5:336:cafe::d) by DM6PR06CA0097.outlook.office365.com (2603:10b6:5:336::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9542.16 via Frontend Transport; Tue, 27 Jan 2026 17:35:17 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 84.19.233.75) smtp.mailfrom=opensource.cirrus.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=opensource.cirrus.com; Received-SPF: Fail (protection.outlook.com: domain of opensource.cirrus.com does not designate 84.19.233.75 as permitted sender) receiver=protection.outlook.com; client-ip=84.19.233.75; helo=edirelay1.ad.cirrus.com; Received: from edirelay1.ad.cirrus.com (84.19.233.75) by DS1PEPF0001709C.mail.protection.outlook.com (10.167.18.106) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Tue, 27 Jan 2026 17:35:14 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id DCF63406541; Tue, 27 Jan 2026 17:35:12 +0000 (UTC) Received: from lonswws01.ad.cirrus.com (lonswws01.ad.cirrus.com [198.90.188.26]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id A7D95820249; Tue, 27 Jan 2026 17:35:12 +0000 (UTC) From: Simon Trimmer To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com, Vijendar.Mukunda@amd.com, syed.sabakareem@amd.com, Simon Trimmer , Maciej Strozek Subject: [PATCH 4/4] ASoC: amd: acp: Add ACP7.0 match entries for Cirrus Logic parts Date: Tue, 27 Jan 2026 17:34:49 +0000 Message-ID: <6cac5670fd5bc14201d925584251d75e59307431.1769534442.git.simont@opensource.cirrus.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709C:EE_|IA1PR19MB6417:EE_ X-MS-Office365-Filtering-Correlation-Id: 4930d0b0-6fbb-411e-af9c-08de5dca6dfe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|61400799027|36860700013|82310400026|54012099003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?t5mQ59DRuMlxB12ej29jgXpjjTnu3P9Qfsm6XbV64Xj3x0IQ0NpzQcm53gx2?= =?us-ascii?Q?q/APoVGU7JZoDvUFGKVIO0UivqkhLAKb7ALMx/6G+9nU0LI2QWneXK8+u/OH?= =?us-ascii?Q?gnEvkxdmvG+WfNfUxm0U7ElL0/bVasXXLGMkxLOU4wzkGLzINLhrCANZkzQM?= =?us-ascii?Q?qBPorIQuzrfNGTDLBp1/ce38tJc30HIS7n4iYsGD4TYjuORsMxuLFh0VXNPW?= =?us-ascii?Q?f+N8IbA3QZM8GRNKR9UZ99r4Km16y2Efq/VO3DgZasVPq7hcLE32sTkbfB8K?= =?us-ascii?Q?h/IO9K3u26gQUWiJ53fNxeGcQh4Ya8N47AV6GkkQcvsWbLGdyvuYGRr5N31e?= =?us-ascii?Q?3LRAR6sbPglXEOa5GOwfoJ+bK+hMoi9kbnCNMx8ZH7GozosnOTR7bK0dV/zy?= =?us-ascii?Q?iusLXxAiFu9w74OPJUIo2Yd8yjQyA/lD3lH1/HKZuGrVDdDeHpTXhwZ7/BNR?= =?us-ascii?Q?yLNVi600dmrzu1BzzGnXh9BO4sGcD7SyniEML1Hzg6ivjAyN40giVE0Lnnj0?= =?us-ascii?Q?HQjYAoIL0T2WbhiWQzUdM5VaTd8UsbOxBV50xIhLrJEy9nXIs4JXEQZWthM6?= =?us-ascii?Q?iMmWwTFOL5iiwtPSLEmkI4VHBJXL5doLeEIdOtgacYIYQnLSO9KMp2FexQW/?= =?us-ascii?Q?BVmRSP6UJHGx+iXO9Sa+LO68aHuaPqqzAFrEH8KToN1UPyEK/MVIPSCr4SYE?= =?us-ascii?Q?zJKF9JTwrRQnN28tpw+aD85Bq9/npP0b4fMYr6Pf4+S+9VOGykRhO4M4EjOA?= =?us-ascii?Q?e2T9i0MGnnGiDzsJwREUGmuzFB+j0C/M4ztQ9VeFth5uOnSRcFYI6wUqbYtb?= =?us-ascii?Q?l4HhWkQVSBWkxKzWqNKFQNFfN1sKKKhdfnhtvcsP629PJ9mPc/DYQBz2qzi9?= =?us-ascii?Q?qDyYRHj6QOyEc30DTY6UVx9Ld6zkzAuSzMYcoW14yg8J9G8u9W6u9yhHOvJB?= =?us-ascii?Q?LNaq0wVd7VDtiM8HWzxanzzSDLmhD7g6t8kJyODFiQqa8T9g5PB8rqihpOvd?= =?us-ascii?Q?rJ5AIoMZvGoB00ZZSLan3pFGZw5N8aOOo3RH/uedqkeygTuM2KfUFqFMFW2k?= =?us-ascii?Q?m2sFMiaD9VJalunqyOw5/8W/dzXA8vfLL2wza6mmZtVQPI71rtT8RzYFAZWB?= =?us-ascii?Q?WSc9OWgdRRo/sI6uOqfrX7nMtXo+a4QbMoEA92Mnvh10GK+xw3XNqakA70qk?= =?us-ascii?Q?PG8mOnKrnu1+M28kvO8YS8Au74UFoqxaY328dcqZrFSISKdGmCsDSVw+ML4E?= =?us-ascii?Q?VAIol+Rm9ttftgs/eNPwq8Ob8WBczPKFtAos3T63SW6RB3pxSLXbKi5qyrUQ?= =?us-ascii?Q?BWKeNmPIZmGpZ5TjbUHrZiS/fclHmx1WKlNbV0nJUHbK4w5Ke8oWYDCO18N9?= =?us-ascii?Q?Y8f4g9cjH163btqMhNLOInlMyKNiukgUDCTfGkhdcpnJDiihXFbGG8ud+Ian?= =?us-ascii?Q?y6D8/q4KEBIFiirV+GnKPAeChJbLpE68wVCr4CPiFcLYWP+x5F8X+WFXcX2h?= =?us-ascii?Q?NE8wTyb439z6Jh1Q+IIteybiY473LSRgRfrNg/0+r5eQxjJwxyjyCGU650tu?= =?us-ascii?Q?BcZHwCQpn/dUmU8lTCyH5mgC6JsX/dzgUnfYU7vcI35xhWtAhdzaeaUbYG7M?= =?us-ascii?Q?JwV8ZitWDFvN07xsekcItdFfmW+JH55KB5VK5aJzTcgcgzFSUdBv+fxIqDYW?= =?us-ascii?Q?0TdU/A=3D=3D?= X-Forefront-Antispam-Report: CIP:84.19.233.75;CTRY:GB;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:edirelay1.ad.cirrus.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(61400799027)(36860700013)(82310400026)(54012099003);DIR:OUT;SFP:1102; X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2026 17:35:14.0640 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4930d0b0-6fbb-411e-af9c-08de5dca6dfe X-MS-Exchange-CrossTenant-Id: bec09025-e5bc-40d1-a355-8e955c307de8 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bec09025-e5bc-40d1-a355-8e955c307de8;Ip=[84.19.233.75];Helo=[edirelay1.ad.cirrus.com] X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TreatMessagesAsInternal-DS1PEPF0001709C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR19MB6417 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDE0MyBTYWx0ZWRfX3/zqX1DSdt4S pq8EhiQP4UQV696Mai3+WU/dI+YW9epQBaE3MHU/vWhmFSXLH+XuEYPzR1kjxBoNZYpYkWuhrPd /uzRaNQndg1C9ELHhFEgIAQu6J439Am7QLal8ht+QmUx9SGMklhHNbuwYWBPV+yUv3snBDemA71 sPoebQRFkB99/TFE6Ui/YKOTRKi0I3EToNdoqbm7v0A5d5M9YBdsD09NkCkG1n0lI/H5PyZPgeb bolnfk6GRgsX1D5CXFmfaPbLmv+RNRekjoCz7ntk+Lqm79dX9JlPoIXeYmuTxaaSNbf4OLMyGMo FxLrfCzSjZemHWBB2o589ZNrBwS7hXjdZKjwikSPxfHgNG5sQkq4XAcbmkA6G50r3VS8bJ7ZzvP B4bIv/euNthVdxxn56CBcrwyvfsE50MRgrQA3ys4qHDXxJCZSQ08wfuo1FsW6Y6be13H5cquPkN jggsCM89UOXTSfJkwTA== X-Proofpoint-GUID: NMg5all5eX1kkYXHeVny7xXSH9ooKHr2 X-Authority-Analysis: v=2.4 cv=KvBAGGWN c=1 sm=1 tr=0 ts=6978f758 cx=c_pps a=1WsizuO/r3fBCnyzjpuYlw==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=vUbySO9Y5rIA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=w1d2syhTAAAA:8 a=PbTEBv9fd1OlC3OAmMIA:9 X-Proofpoint-ORIG-GUID: NMg5all5eX1kkYXHeVny7xXSH9ooKHr2 X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" This adds some match entries for a few system configurations: cs42l45 link 1 UID 0 cs35l63 link 0 UID 0 cs35l63 link 0 UID 2 cs35l63 link 0 UID 4 cs35l63 link 0 UID 6 cs42l45 link 0 UID 0 cs35l63 link 1 UID 0 cs35l63 link 1 UID 1 cs42l45 link 0 UID 0 cs35l63 link 1 UID 1 cs35l63 link 1 UID 3 cs42l45 link 1 UID 0 cs35l63 link 0 UID 0 cs35l63 link 0 UID 1 cs35l63 link 0 UID 0 cs35l63 link 0 UID 2 cs35l63 link 0 UID 4 cs35l63 link 0 UID 6 cs42l43 link 0 UID 1 cs42l43b link 0 UID 1 cs42l45 link 0 UID 0 cs42l45 link 1 UID 0 Signed-off-by: Simon Trimmer Reviewed-by: Maciej Strozek --- sound/soc/amd/acp/amd-acp70-acpi-match.c | 256 +++++++++++++++++++++++ 1 file changed, 256 insertions(+) diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/a= md-acp70-acpi-match.c index de8f5a2a8e9d..dd2b010efdaa 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -214,6 +214,78 @@ static const struct snd_soc_acpi_adr_device cs35l56x4_= l1u3210_adr[] =3D { }, }; =20 +static const struct snd_soc_acpi_adr_device cs35l63x2_l0u01_adr[] =3D { + { + .adr =3D 0x00003001FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_l_endpoint, + .name_prefix =3D "AMP1" + }, + { + .adr =3D 0x00003101FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_r_endpoint, + .name_prefix =3D "AMP2" + }, +}; + +static const struct snd_soc_acpi_adr_device cs35l63x2_l1u01_adr[] =3D { + { + .adr =3D 0x00013001FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_l_endpoint, + .name_prefix =3D "AMP1" + }, + { + .adr =3D 0x00013101FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_r_endpoint, + .name_prefix =3D "AMP2" + }, +}; + +static const struct snd_soc_acpi_adr_device cs35l63x2_l1u13_adr[] =3D { + { + .adr =3D 0x00013101FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_l_endpoint, + .name_prefix =3D "AMP1" + }, + { + .adr =3D 0x00013301FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_r_endpoint, + .name_prefix =3D "AMP2" + }, +}; + +static const struct snd_soc_acpi_adr_device cs35l63x4_l0u0246_adr[] =3D { + { + .adr =3D 0x00003001FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_l_endpoint, + .name_prefix =3D "AMP1" + }, + { + .adr =3D 0x00003201FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_r_endpoint, + .name_prefix =3D "AMP2" + }, + { + .adr =3D 0x00003401FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_2_endpoint, + .name_prefix =3D "AMP3" + }, + { + .adr =3D 0x00003601FA356301ull, + .num_endpoints =3D 1, + .endpoints =3D &spk_3_endpoint, + .name_prefix =3D "AMP4" + }, +}; + static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] =3D { { .adr =3D 0x00003001FA424301ull, @@ -223,6 +295,24 @@ static const struct snd_soc_acpi_adr_device cs42l43_l0= u0_adr[] =3D { } }; =20 +static const struct snd_soc_acpi_adr_device cs42l43_l0u1_adr[] =3D { + { + .adr =3D 0x00003101FA424301ull, + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l43" + } +}; + +static const struct snd_soc_acpi_adr_device cs42l43b_l0u1_adr[] =3D { + { + .adr =3D 0x00003101FA2A3B01ull, + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints), + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l43" + } +}; + static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123= _adr[] =3D { { .adr =3D 0x00013001FA424301ull, @@ -256,6 +346,26 @@ static const struct snd_soc_acpi_adr_device cs42l43_l1= u0_cs35l56x4_l1u0123_adr[] }, }; =20 +static const struct snd_soc_acpi_adr_device cs42l45_l0u0_adr[] =3D { + { + .adr =3D 0x00003001FA424501ull, + /* Re-use endpoints, but cs42l45 has no speaker */ + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints) - 1, + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l45" + } +}; + +static const struct snd_soc_acpi_adr_device cs42l45_l1u0_adr[] =3D { + { + .adr =3D 0x00013001FA424501ull, + /* Re-use endpoints, but cs42l45 has no speaker */ + .num_endpoints =3D ARRAY_SIZE(cs42l43_endpoints) - 1, + .endpoints =3D cs42l43_endpoints, + .name_prefix =3D "cs42l45" + } +}; + static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] =3D { { .mask =3D BIT(1), @@ -265,6 +375,33 @@ static const struct snd_soc_acpi_link_adr acp70_cs35l5= 6x4_l1u3210[] =3D { {} }; =20 +static const struct snd_soc_acpi_link_adr acp70_cs35l63x4_l0u0246[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs35l63x4_l0u0246_adr), + .adr_d =3D cs35l63x4_l0u0246_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u1[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs42l43_l0u1_adr), + .adr_d =3D cs42l43_l0u1_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l43b_l0u1[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs42l43b_l0u1_adr), + .adr_d =3D cs42l43b_l0u1_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u= 3210[] =3D { { .mask =3D BIT(0), @@ -288,6 +425,80 @@ static const struct snd_soc_acpi_link_adr acp70_cs42l4= 3_l1u0_cs35l56x4_l1u0123[] {} }; =20 +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l0u0[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs42l45_l0u0_adr), + .adr_d =3D cs42l45_l0u0_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l0u0_cs35l63x2_l1u= 01[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs42l45_l0u0_adr), + .adr_d =3D cs42l45_l0u0_adr, + }, + { + .mask =3D BIT(1), + .num_adr =3D ARRAY_SIZE(cs35l63x2_l1u01_adr), + .adr_d =3D cs35l63x2_l1u01_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l0u0_cs35l63x2_l1u= 13[] =3D { + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs42l45_l0u0_adr), + .adr_d =3D cs42l45_l0u0_adr, + }, + { + .mask =3D BIT(1), + .num_adr =3D ARRAY_SIZE(cs35l63x2_l1u13_adr), + .adr_d =3D cs35l63x2_l1u13_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l1u0[] =3D { + { + .mask =3D BIT(1), + .num_adr =3D ARRAY_SIZE(cs42l45_l1u0_adr), + .adr_d =3D cs42l45_l1u0_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l1u0_cs35l63x2_l0u= 01[] =3D { + { + .mask =3D BIT(1), + .num_adr =3D ARRAY_SIZE(cs42l45_l1u0_adr), + .adr_d =3D cs42l45_l1u0_adr, + }, + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs35l63x2_l0u01_adr), + .adr_d =3D cs35l63x2_l0u01_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr acp70_cs42l45_l1u0_cs35l63x4_l0u= 0246[] =3D { + { + .mask =3D BIT(1), + .num_adr =3D ARRAY_SIZE(cs42l45_l1u0_adr), + .adr_d =3D cs42l45_l1u0_adr, + }, + { + .mask =3D BIT(0), + .num_adr =3D ARRAY_SIZE(cs35l63x4_l0u0246_adr), + .adr_d =3D cs35l63x4_l0u0246_adr, + }, + {} +}; + static const struct snd_soc_acpi_link_adr acp70_alc712_vb_l1[] =3D { { .mask =3D BIT(1), @@ -336,6 +547,26 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_ma= chines[] =3D { .links =3D acp70_cs42l43_l0u0_cs35l56x4_l1u3210, .drv_name =3D "amd_sdw", }, + { + .link_mask =3D BIT(0) | BIT(1), + .links =3D acp70_cs42l45_l1u0_cs35l63x4_l0u0246, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(0) | BIT(1), + .links =3D acp70_cs42l45_l0u0_cs35l63x2_l1u01, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(0) | BIT(1), + .links =3D acp70_cs42l45_l0u0_cs35l63x2_l1u13, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(0) | BIT(1), + .links =3D acp70_cs42l45_l1u0_cs35l63x2_l0u01, + .drv_name =3D "amd_sdw", + }, { .link_mask =3D BIT(1), .links =3D acp70_cs42l43_l1u0_cs35l56x4_l1u0123, @@ -346,11 +577,36 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_m= achines[] =3D { .links =3D acp70_cs35l56x4_l1u3210, .drv_name =3D "amd_sdw", }, + { + .link_mask =3D BIT(0), + .links =3D acp70_cs35l63x4_l0u0246, + .drv_name =3D "amd_sdw", + }, { .link_mask =3D BIT(0), .links =3D acp70_rt722_only, .drv_name =3D "amd_sdw", }, + { + .link_mask =3D BIT(0), + .links =3D acp70_cs42l43_l0u1, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(0), + .links =3D acp70_cs42l43b_l0u1, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(0), + .links =3D acp70_cs42l45_l0u0, + .drv_name =3D "amd_sdw", + }, + { + .link_mask =3D BIT(1), + .links =3D acp70_cs42l45_l1u0, + .drv_name =3D "amd_sdw", + }, { .link_mask =3D BIT(1), .links =3D acp70_alc712_vb_l1, --=20 2.43.0