From nobody Sun May 24 22:35:58 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 29506370AFC; Wed, 20 May 2026 16:37:47 +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=1779295071; cv=fail; b=pIxe66I9bFcM0JwAlO38GyJvus3i2fdxA8KWYCuFFJrBJA3rk3LYISsAahSs17XyUgMmt/WwhdyjFLDhrZu0tv/nqkPbOt4FtgkIkEZ8PxuJdeXbFDtOxkJNpu2L2XnnsggiP4qCCHxYyuVGSZut5yB4wTM/jHPObzlJXZdSc5A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779295071; c=relaxed/simple; bh=posqzQ3AEtaUXxTz39QJNjSJnS+pIvqFI9FCnRYdSvA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EeKMa4M6MRWhmdyiG+HbSrPxHEHQdEqP4UoUHd+8IeAooN9Sub1tZcNk/IRmttPZDijNRCQNAjiXE947IBZOzIB6tOviAZIJ4/uxnVtOgNvNN/hDMkfQ1nvnF2H3ji8plkiyXshUpm2UNvfAQXQbQTaDnSNcrvKNPNvaetK11/U= 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=TbqCkIcr; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=dAMY0Y1S; 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="TbqCkIcr"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="dAMY0Y1S" 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 64KCd4601158575; Wed, 20 May 2026 11:36:45 -0500 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=0lmSm5ogNnY8vt+E6po7mL0xVIZluHnD7+bWTdAyvXE=; b= TbqCkIcrV5WxQkthKlyzwfTvp/q924rRnDuMWn/xE6kzS84X6nmLgpWDMeskeYID HCbhI/nvmiVmbhUHcg/x/0NYYkULcDegnkrlPeJeor+K1dtC1gniC1cezd5B06dt zXZDbCC2EuwdrbhgWFNITJpghNTMzIc7A31IQtn6f3zrC1J9IYrZhMQQnRiLVK6h IBIEr8KEjnbEk7nXGbVc2sQnDD/FO/PwgEcppGh+YIenb87Ihy9/hX8wENmQSz6o tg3t4NvTVOCCz9Omi7WVk0C78MutuHRr6NKq13jlZ6SI3vxhdTRmFcksn0H6/M94 91gfRWGSCQbBquBAbXr7Og== Received: from bl0pr03cu003.outbound.protection.outlook.com (mail-eastusazon11022082.outbound.protection.outlook.com [52.101.53.82]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4e93g1h32u-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 20 May 2026 11:36:44 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HPEzbyvvrS0X9Vrf4FPcnZoAIrBeMD+WNk75Jnb41HqBZoow87gXaldfiSdEr6WWpX+NxDyCas1LlqibIy+RW25L930uh99yPgvdP4zJ4p5TSjS0Ugv9ZkNYvH4rHpHY1se5baUMQOgVkqVn1nWEjyp8LUww+uyjduWK6uV+FCXV9smysEeRlkPKu5Wqw9VeH9Ty5PMSzi6jYT7uqR0KRcuotj1BjFkybTTP9m/01HAXdCgLewbuMqc6+jcCYzRiESPVShVSuGDR4+lBByR/hCTBkyoqYc/CbakyPCbbnNGd//H7Mk2PFBzQ5RYZ/j/PJsMHmB1MOCFkOmt3Z0DaHg== 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=0lmSm5ogNnY8vt+E6po7mL0xVIZluHnD7+bWTdAyvXE=; b=FhEy5059XH5Or5sO9PFZHw+9vrx7Wzmg9kAmeUfQFnaoLi3LWAfofWUT+cfpTeXt9OeHm35Mbt/0/5ZVKAuP2kCJjyCPV60rwQB+Xa+tHQNKa069KJxUb9I+86LQN2oxaiJHG2mtzCAqXLBiJoFlA+Xnw2panlJkvsns96LPZGUeDZ+uriqfdLuQr1S1h5aMX3RL7icOfjB3ZPboQKU0NRD4OZkIbVuO6L2uKmSE55xWe0FTND3lN7CFdm2ERUILKOTHEWESbMxMNkwZYkPVy5XtN0h58Ifh94PE+w/VWAc4vUY4hCLsu19UqVGDjQ1xiOtQKlJqvZedPavceWFNeg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 84.19.233.75) smtp.rcpttodomain=cirrus.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=0lmSm5ogNnY8vt+E6po7mL0xVIZluHnD7+bWTdAyvXE=; b=dAMY0Y1SywSPHqs+bKliv2f2ZYHPSmq4giA1Y/DiVeXszamLL78yrpx/EKmn9e14gR0QZ/ZH/6H4NRWceYGnoz42U3dxXR7lcM83b7+yFco3+pOKebYCeBK0BeJkgbfJI8PNU6qa+GRC/0HOn+4udHyvH424Or5tSBKeNQ5dafM= Received: from BN9P221CA0005.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::28) by MW3PR19MB4266.namprd19.prod.outlook.com (2603:10b6:303:4d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.16; Wed, 20 May 2026 16:36:37 +0000 Received: from BN2PEPF000044A4.namprd02.prod.outlook.com (2603:10b6:408:10a:cafe::54) by BN9P221CA0005.outlook.office365.com (2603:10b6:408:10a::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.14 via Frontend Transport; Wed, 20 May 2026 16:36:37 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (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: SoftFail (protection.outlook.com: domain of transitioning opensource.cirrus.com discourages use of 84.19.233.75 as permitted sender) Received: from edirelay1.ad.cirrus.com (84.19.233.75) by BN2PEPF000044A4.mail.protection.outlook.com (10.167.243.155) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.11 via Frontend Transport; Wed, 20 May 2026 16:36:36 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 4C16D406550; Wed, 20 May 2026 16:36:35 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.12]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 26D0082025A; Wed, 20 May 2026 16:36:35 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org, vkoul@kernel.org Cc: lgirdwood@gmail.com, pierre-louis.bossart@linux.dev, yung-chuan.liao@linux.intel.com, peter.ujfalusi@linux.intel.com, oder_chiou@realtek.com, jack.yu@realtek.com, shumingf@realtek.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH 1/3] ASoC: soc-acpi-intel-ptl-match: Make Chrome matches conditional Date: Wed, 20 May 2026 17:36:29 +0100 Message-ID: <20260520163631.3300102-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> References: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> 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: BN2PEPF000044A4:EE_|MW3PR19MB4266:EE_ X-MS-Office365-Filtering-Correlation-Id: 231deb2b-1b7d-49ea-2a72-08deb68df62d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|61400799027|7416014|36860700016|18002099003|16102099003|22082099003|56012099003|11063799006; X-Microsoft-Antispam-Message-Info: fm/6TTbzoXFka9EyMcwoHFqdu8598LHIW836qXlM9trOLXGopylU7auGfu1znDfbfxKN3121aOwSd7A81qgH1n3PqWaj10HLixDiNkJvSuNN4llTxMe/VyQMB6tNs4GCiSte1tSBXl9Xmc2uoZKLuWUAIeri77Yc7aWvYUc5f5iAJZ5Nq2+/WhwlwEX7GOCwwj7fwtwBUIByVxjWiNc02+CFs2WpW88rV1XrSczqtoqZGppa3KFEz2P7dCjkc6Fm5N5d7ChajvY2BGc6AetyGoJqaYlhs1AEnYso8GZlwUMWilWsozMuQ8xMUYcqmXL1ptkVUXbmYgfH/ljBlB8oVrLJzIr0Q0XecI4e7auSInRndZwkCDBisekXs2XMarVRhUnUQgHjWFkF7RVt4St24D3qnxsxb3LlWP4qN/lurY++9E41kiIdVXRNXKN9ugfwKtPU6cmGgOzdLwlQlB5+Dx2Hptn/9GNE0/R0qc1DVxkQxPp7alAZR1PUKbSDd+LqOozmS07PdmWElkQ8HbVPp8LJbXmj4rT6QQZd/DNpHqtmWnFHnbmyuuZ/R8TAHUtSvlG7019/7Xws2dvA/vnGn6Cf2gpR8T1ZZTsJ7/sCj7O3Eyt0YSu3C1gibsq11hakp6iKsuEkL3rDyPbYm8IX0LpSAuBLCD4PnWLCHBHs6U68CeBPBSq/GBz2vI3ZxuGEwBV/RJ87420rbCGh/BaJk2cW6+g7dh0UeX4bGz1o9XI= 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)(7416014)(36860700016)(18002099003)(16102099003)(22082099003)(56012099003)(11063799006);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6wud8WuNmJjVijaY8Rx05/VCOLeKRhzG1/E2c4tHMrnfU/dZBapI5bMc0KH1g8sLrFUIxfMss4thVYW4oPzOXLWQOoDufHTbbKiuswaR54eq0OWLYQxKwIFUbE+k2So18V0p+qVku4E1YB89BBu1QqD5n9SVewU8AEXWPv5VD4r/tJJGxUUIqELD5fURN3sknNfD2vTKGkwEQpy6Rnh0EZMgqkyTf0ozxjPSTo4VsS2LRBkg5vMO0JI/ixB8uEoriQD5vBcU3JZJuoqi1Y7f6rOyulwqBHu6bG0z8CsHEg+iOs6IuRRCzTplA9fLyASHEICF/XT6GK6SUzLyaheUMavJhbwfAdoIQ1p2+Dr1winCxkPxIfdB/r4+23XXglKEaTjuiHMhoLihHLzaHp9xltYhGdTG5l4xjjlcKnvnth7sriVK5N6b78tZPuX8cY8z X-Exchange-RoutingPolicyChecked: jbXuZwOkpvex2p0YUNikiZ4si5K64qJhTS6cUyOINBJSMpuqKt77gngtSAgEauLOpZM0L1tnNInv6VKfhDi6P57whtRM4o2DYfMO/bSMh3Wmb6lAjTR5ZydrXnTIb3TWgTZgHA1defajR4T8+r5X6Ezawael5WQGT5RW25eIJdxNdeGXQifcMLJsGHjheLc8oNHd0Vw/v7h/zIlVoNKG/xmmBBxP2R25FBDP9Cynl/hrZRzkDrLeZcJvQJ4lhsXvGNAymVg5F399d6agI+ajsVFRLXEb9+LsEsECsppih1v5oUG78p7EUL62WUB3iUu1O7tTgWGVHbrWtAwkdP42hw== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2026 16:36:36.7867 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 231deb2b-1b7d-49ea-2a72-08deb68df62d 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-BN2PEPF000044A4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR19MB4266 X-Proofpoint-ORIG-GUID: syAqsfIeEfLZvmjpH--E8Aau5FqlxGgm X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE2MSBTYWx0ZWRfXw6RwUBK+0CH/ RmQ/N6Zain2jGvOnKxyQqmTAA58n7tN1lVpfUL43cScUl+MMw5ADMkNILPbHsrJlM1BznO073Ze mB9/Ag52YXGfzXkZFEEt/gA7FhxrpcoWPP1OL9FGQggQOLpBhDgatJjgl3Ep1XNNe38ifnjtBVC iL9zRFaz6XLtJ4lORnE2kbrvmX9STk6YfOxlMIXMRh9/gcMbiXMtTvQHgvLb2PHU7LgtPKtvHYr GfGDNv49++Lhwl4jBzl4LBk523vORD/KCxPu0/RQ0dldWgmGryjvcmC+An31Ux+HTjxG14ovoJK Mnsn/eCZgVa6nUJN+XepjQUJGClhnF2RhR8Eapb8n8wHajcbO5ZZSEHb5GDNnf9v+WlrKu8+Ad6 JdP3rknvVONAvLQr4pok0PLPNGvGvqZi2KgHbAiNLEw6mqua/rxo9/jGiZ5LsYPJXO5E3KAbpE+ gQeNRSEKkEbhGdX1Z/g== X-Authority-Analysis: v=2.4 cv=Wrcb99fv c=1 sm=1 tr=0 ts=6a0de31c cx=c_pps a=fzV1Iv4YRLQDDQDbumTdQQ==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=KfkQE9S9VqCBgivYGm0O:22 a=w1d2syhTAAAA:8 a=bz7lhGWuN2dzd1EYfvcA:9 X-Proofpoint-GUID: syAqsfIeEfLZvmjpH--E8Aau5FqlxGgm X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" For PTL onwards Cirrus are intending to rely on function topologies, rather than using a match table for each system type. Chrome systems tend to have custom magic in the topology and thus need to load a specific file. This causes problems as these system can have the same layout as generic laptops causing the match to apply to other laptops. Add a DMI quirk that forces these matches to only apply to specific devices. Signed-off-by: Charles Keepax --- .../soc/intel/common/soc-acpi-intel-ptl-match.c | 1 + .../intel/common/soc-acpi-intel-sdca-quirks.c | 16 ++++++++++++++++ .../intel/common/soc-acpi-intel-sdca-quirks.h | 1 + 3 files changed, 18 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/= intel/common/soc-acpi-intel-ptl-match.c index ad3af8834e431..c6bf70e393975 100644 --- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c @@ -632,6 +632,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_mac= hines[] =3D { .link_mask =3D BIT(2) | BIT(3), .links =3D ptl_cs42l43_agg_l3_cs35l56_l2, .drv_name =3D "sof_sdw", + .machine_check =3D snd_soc_acpi_intel_no_function_topology, .sof_tplg_filename =3D "sof-ptl-cs42l43-agg-l3-cs35l56-l2.tplg", }, { diff --git a/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c b/sound/so= c/intel/common/soc-acpi-intel-sdca-quirks.c index 3eaa058f84608..7caabc501b163 100644 --- a/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c +++ b/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c @@ -6,6 +6,7 @@ * */ =20 +#include #include #include #include @@ -37,6 +38,21 @@ bool snd_soc_acpi_intel_sdca_is_device_rt712_vb(void *ar= g) } EXPORT_SYMBOL_NS(snd_soc_acpi_intel_sdca_is_device_rt712_vb, "SND_SOC_ACPI= _INTEL_SDCA_QUIRKS"); =20 +static const struct dmi_system_id function_topology_quirk_table[] =3D { + { + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + }, + }, + {} +}; + +bool snd_soc_acpi_intel_no_function_topology(void *arg) +{ + return !!dmi_check_system(function_topology_quirk_table); +} +EXPORT_SYMBOL_NS(snd_soc_acpi_intel_no_function_topology, "SND_SOC_ACPI_IN= TEL_SDCA_QUIRKS"); + MODULE_DESCRIPTION("ASoC ACPI Intel SDCA quirks"); MODULE_LICENSE("GPL"); MODULE_IMPORT_NS("SND_SOC_SDCA"); diff --git a/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h b/sound/so= c/intel/common/soc-acpi-intel-sdca-quirks.h index bead5ec6243f9..2ea0a1881c4bd 100644 --- a/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h +++ b/sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h @@ -10,5 +10,6 @@ #define _SND_SOC_ACPI_INTEL_SDCA_QUIRKS =20 bool snd_soc_acpi_intel_sdca_is_device_rt712_vb(void *arg); +bool snd_soc_acpi_intel_no_function_topology(void *arg); =20 #endif --=20 2.47.3 From nobody Sun May 24 22:35:58 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 C733836D9F5; Wed, 20 May 2026 16:37:51 +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=1779295073; cv=fail; b=IPu+3ROXvUdpX5mVOUa32T4zjZvNTplQdaSGnvaxNZ3Et0pQ0R4JEb0UEX4AMx7ilLQzBHyAuaOGYv9zfO9zh/AcX4IU2hQYNvUmAGVSPnRqxtjjigwcAIEL8GG7N4A71laW8pZNqPO6DlroT52KdrJ93fnL7oSBDfwszwY5jhs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779295073; c=relaxed/simple; bh=iQaazIprB17dlP4Eqz9kfXgc/fHbjCk92DCyGSPrE9k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U6XBR2UstYqZDZ8aVRodXUalmAkDQqzkeLOpf/9JqBs8cAnHaztCnzVBJVv+ZAaLXdWd2LAn+H4k//g4fXPsDBVUdDtCEebevFHRgNrzdh/EbSE409ojRRSueA9VTQGQq+v/5SVn9l6T9XIBk2V6Yd1UO8qWYG/Hj+Bbarf/jIc= 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=Eogliu4b; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=fS4VyTgY; 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="Eogliu4b"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="fS4VyTgY" 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 64KCdDio1158784; Wed, 20 May 2026 11:36:41 -0500 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=ewo7Pruh1T+Xw+yBeJDm3rG97ydxgWBHy7XqrAXu/MY=; b= Eogliu4blX7TrUel5vaJejPJrlellJuSMiz0Nj5ej2JMoCpMcQ6YOxF1J86hNIjD 8jxHVRMS5jg059rzIreUDSGt0RB5rKSgpzadPiLDjv/mCkiEGaG3x3/7kycT5hYr 14lige35mcaIDBNdYU6cfpKKQw5VykBmgvB2LFMDO0n6ORolfwhiWgsO9m67lNDl 3JD/zNMA3S5xQKjW08sZLXI8YAIDm9lR7wB91JAEcoOSQOHXJJJwwOsdeIJeKek1 lMFlEqaVfFZmN8eNBQ3UQ+GtTuK+lQ8tQHflvnS2r9Nz3U9bMkh7aFLEpGdXEytv iCanB25YqXajYhZUJ9qGBw== Received: from dm1pr04cu001.outbound.protection.outlook.com (mail-centralusazon11020133.outbound.protection.outlook.com [52.101.61.133]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4e93g1h32n-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 20 May 2026 11:36:40 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xaYhN066CAKeOHacU5mbQpTxMfigFTZ1HQfqDrxNhJKQZ6Uf4YjAV79FkLEtplpBliPfKiIyBJKndGB1KMNBcs+3/mRo69mtY3ZE1iPO3uDFM+w0RquBaFoj9SUec0ZX7ZRN0Vz0AfuNWBElDtSiwyX+isaz7/VQVIdVcmIqDuRbVVe09G5ZCNrx3shUoGZOhAUlaAY7YV9kZ+2tDqXLwkZKer21lhDupyLxoRZK0nnXLQEoREPjt5JZReaxNGV1awli4xLN1no2vy4DsI1G93HZy+3bHHLbcH6Zpu+oJAgoknzfWRisF39i7EIzptVwURJ/3TffXaOLul7A2k+dvA== 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=ewo7Pruh1T+Xw+yBeJDm3rG97ydxgWBHy7XqrAXu/MY=; b=fkJF568yxTawPC1Yr7uqqVAF+UYkXpg+prliXbIt45wP8ovQog5ia+Euo6+bUH8gDIPD8f8EwSxz08bS7iwq0lBcePtkB06PkN0n5ukzZADSGaqgieTMSWBVHQR+sUFN/1M4HQiLrTF2XbPN9zBKLSx8F67xnIhjmu/SIbHkssjJ39sTIp2LkcudfgAAPliMzVy69GRD+FtTs3LPtdf3cpIKOep3pR/1fOM4Kb+JJbDLoz5ymp//rFwqp7A3zzpr9H7E/iUyLWD7fFg7KBMbuH0YVxEuiR2SiAnQ0IszMWyLvSRmarsA9XEXSlQFK6XBIKDEM6FDrbQcqSvFxEi6Rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 84.19.233.75) smtp.rcpttodomain=cirrus.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=ewo7Pruh1T+Xw+yBeJDm3rG97ydxgWBHy7XqrAXu/MY=; b=fS4VyTgY6yA7ITHXzAmsx47XWV3WlsWYEKLUbr8IWnBfzni+m1dmn/JtnA+mDmvnXjMKD2q+yXgrnnjdFOyI6b4SB67+rVFCflKsQ2SqbFurhc4+HnjOOJxlqZkUoM6VUUONbLcDxQL4ISjo4WFpVRfNg8R7sf9crLUVyZX6gI4= Received: from SA9PR13CA0088.namprd13.prod.outlook.com (2603:10b6:806:23::33) by BL1PPF55934F95F.namprd19.prod.outlook.com (2603:10b6:20f:fc04::ea6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.23; Wed, 20 May 2026 16:36:37 +0000 Received: from SN1PEPF000397B4.namprd05.prod.outlook.com (2603:10b6:806:23:cafe::7b) by SA9PR13CA0088.outlook.office365.com (2603:10b6:806:23::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.16 via Frontend Transport; Wed, 20 May 2026 16:36:37 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (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: SoftFail (protection.outlook.com: domain of transitioning opensource.cirrus.com discourages use of 84.19.233.75 as permitted sender) Received: from edirelay1.ad.cirrus.com (84.19.233.75) by SN1PEPF000397B4.mail.protection.outlook.com (10.167.248.58) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.11 via Frontend Transport; Wed, 20 May 2026 16:36:36 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 447CF406544; Wed, 20 May 2026 16:36:35 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.12]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 2AB6982026C; Wed, 20 May 2026 16:36:35 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org, vkoul@kernel.org Cc: lgirdwood@gmail.com, pierre-louis.bossart@linux.dev, yung-chuan.liao@linux.intel.com, peter.ujfalusi@linux.intel.com, oder_chiou@realtek.com, jack.yu@realtek.com, shumingf@realtek.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH 2/3] ASoC: Intel: soc-acpi-intel-ptl-match: Remove unnecessary cs42l43 match Date: Wed, 20 May 2026 17:36:30 +0100 Message-ID: <20260520163631.3300102-3-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> References: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> 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: SN1PEPF000397B4:EE_|BL1PPF55934F95F:EE_ X-MS-Office365-Filtering-Correlation-Id: 79973aa6-cc27-4cd0-ccdd-08deb68df63a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|61400799027|36860700016|82310400026|22082099003|56012099003|16102099003|18002099003|11063799006|6133799003; X-Microsoft-Antispam-Message-Info: FDs7hkw1XpErA8uy1vy/b/AuIdgUYZ5v64EYS0wisdz/0phogX/4rzYZz4/WHQlAyUEJNyOKQtglUQLuhSGvWUMn0SDpc9dQtZosPE+Y2WEFSgNn4NYOKQbJqV0P53D81eoCr0rSTMp99UxrHsh1sN7wOgh//DfrxR70kyYI7LZvkxHxWtBuVjH9GJRrfCBHNCeft0SUu83Sa2nw1HKj4TSUgnQkU8VuENaSoMk4yrUTeRMj2b+x543GrpGAUd9pW52Gu9OpMAlSC7FySN1cGZJLpGrcxMKr1mz9LQIFcxFvg7wCRqX4jjqse8Kv7cwxVcKtDUXraaRIQwzJCnYdOD7yUIrcW1adpCEVrDtOfuzn5cQG8/EX4M8MHCPPUQtEkcr0pHr3tqZHLuAgtgBpJ/GjKI/W/34ovQNm1JZzYpbU9V1g+plEOGT7ucM5N5JJoOygTl2b9qw4dAE+FNP0OWQRMqg0qExEspD2SXrUuEatljYWqFEDdrXWMviYzKUSW6KPxMBwYZ3BM+KMoZV8OSQlm4Z0ib350bbBjOuJIIi0GPdCzAYABJeKNrwE/pfYAhIKpSpRBjQE8s5cZIiPYeGY8xMmkpbXsGqaH7tEvhbDCKOxrnaEaHplgD+iOm7BZSMScQiptkRkpnfuDCh2XAirhIiVDLK/Vs1riPghGgnV+Fkg0mlmYA3pkIT1q5ln+dol++Zcr7tHb9j9O24/szyK/fVXDGXiF0V7PjIJ+EU= 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)(7416014)(376014)(61400799027)(36860700016)(82310400026)(22082099003)(56012099003)(16102099003)(18002099003)(11063799006)(6133799003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1MLjf7aIq/RtTexQ/YtAImaagbv1pEHpurMugo1GYQs5QSAJbYROtW56Oh0WfuS/9Na0JWfD0mFuw2wKmTaCfyYvevBra3PWDLAmFqmvQe/yiTX3lejNxMTl6F80iVKGdwuKTIHB33jCobBjVO0v17CGEXrUh0/+Rl2p40e3xrq0yy4jY5XMGQjT1cEbzmvCZfkegE99Slna00RuCi6eR8CBPrEou1xguNUxiyKUxuvivAWmI6gUkBEazQZBHA2DkXpm8YdihDpRobfKC+HeMnua/wszAFUI6V4XZ0qkO4hU5E5LM5s3V8Rf4Arx+Z7GcWvgn2xWIzTEn/f/b+s+/O8vduXHn/NJoxfNbz7cm0yWeRVm0w6+l5dMBHhq64jABp4Quk4efv1f2r6w+o8W00rt/mbXlW/3POXsoZFTAaXobZoEb7pUdYNP2YNzGk9K X-Exchange-RoutingPolicyChecked: ublSMwfH2X5m2OLNPUL8GI9knD7pw+MP4Ro9fxDyl9mPfWmqCfNlroPJsM5IrlrobxGxW/gIDsMlAa616JIj6OkaGIP1RKzSg3cwJ/YV44y607ZHACcepX7dY+SVuJMtoPDRLcK2wCF6jI6c+JppkOzRHJlxMhhZqoKonl8Ouky9M8C+RVC8Thr6zcj3/f+r9lNSAF8jdTvuTYj0yacaTYJfz+y0hKka3m36YzloM/boXUZ9Zi32Yc3q2m+P8i9a2j5QAFl44ZsZx3FIEJTHmiL32pCMFrtv6pJBMXrNXRD8Om/mre6U5lvO2VcsoryFBgJ6rCCAnWMzgMru+gWXzQ== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2026 16:36:36.8093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79973aa6-cc27-4cd0-ccdd-08deb68df63a 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-SN1PEPF000397B4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PPF55934F95F X-Proofpoint-ORIG-GUID: SIRgF8vOdcAXuYX0jsUa6W1XKwT9pehO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE2MSBTYWx0ZWRfX+Ey/yervPg0K VBH5Onnm/gPQP1LE5sYKtL1f3mVjgLUee68kISxhPfquWDKD1GpdkNnyXyTJZGnWV1on4b1ZmWz 199e41gPu/vAGRsU6giDYHmLnuzGM7ppCT1hICwxZLmtvHvx1mpr8c9a5lE4NyxVlV8dxFacNsG OqLzama/3Nn7VAbY/srS/5wRZbA2vHthfT3rXYX/3nHAe9gIFqXLy3Sn2nHTmZ2z7A72OIRS23E lgfGjn7tRauDI6kaOOytIR2hF17ZbUHjBSEXGdCAM01/LBIPaSI2osBWPWUoAhN9/Up5mrf4WM6 n5G2BuhckTmLmDSiJGqkIrrENXSF57Adnpbaqm9B04m8HvkYBHWpQSnhB99LFtRFCadATmd7ldB 0YU7OpTTYzL9xOzMzIjg/uk9ve7HR2din6nP4MIuguY7oh79W5M4L36C965cbS88UU2T3aZSkIG gsdeDZUiUv1UYcEo8QQ== X-Authority-Analysis: v=2.4 cv=Wrcb99fv c=1 sm=1 tr=0 ts=6a0de319 cx=c_pps a=3l++41Tsbfu3Vy6U+n14cA==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=KfkQE9S9VqCBgivYGm0O:22 a=w1d2syhTAAAA:8 a=YSoufPJkrKXdQH4yDjUA:9 X-Proofpoint-GUID: SIRgF8vOdcAXuYX0jsUa6W1XKwT9pehO X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" For PTL onwards Cirrus are intending to rely on function topologies, rather than using a match table for each system type. Remove this unnecessary match table entry. Having the match entries can mean that systems match when they should use function topologies instead, resulting in incorrect audio configurations. Although, admittedly this is not too likely with this 6x amp configuration as those are quite rare, but best to follow best practice. Signed-off-by: Charles Keepax --- .../intel/common/soc-acpi-intel-ptl-match.c | 118 ------------------ 1 file changed, 118 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c b/sound/soc/= intel/common/soc-acpi-intel-ptl-match.c index c6bf70e393975..f7694b2a2b02e 100644 --- a/sound/soc/intel/common/soc-acpi-intel-ptl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-ptl-match.c @@ -92,48 +92,6 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint= =3D { .group_id =3D 1, }; =20 -static const struct snd_soc_acpi_endpoint spk_1_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 1, - .group_id =3D 1, -}; - -static const struct snd_soc_acpi_endpoint spk_2_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 2, - .group_id =3D 1, -}; - -static const struct snd_soc_acpi_endpoint spk_3_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 3, - .group_id =3D 1, -}; - -static const struct snd_soc_acpi_endpoint spk_4_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 4, - .group_id =3D 1, -}; - -static const struct snd_soc_acpi_endpoint spk_5_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 5, - .group_id =3D 1, -}; - -static const struct snd_soc_acpi_endpoint spk_6_endpoint =3D { - .num =3D 0, - .aggregated =3D 1, - .group_position =3D 6, - .group_id =3D 1, -}; - static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] =3D { /* Jack Endpoint */ { @@ -202,15 +160,6 @@ static const struct snd_soc_acpi_endpoint cs42l43_amp_= spkagg_endpoints[] =3D { }, }; =20 -static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] =3D { - { - .adr =3D 0x00023001fa424301ull, - .num_endpoints =3D ARRAY_SIZE(cs42l43_amp_spkagg_endpoints), - .endpoints =3D cs42l43_amp_spkagg_endpoints, - .name_prefix =3D "cs42l43" - } -}; - static const struct snd_soc_acpi_adr_device cs42l43_3_agg_adr[] =3D { { .adr =3D 0x00033001FA424301ull, @@ -235,48 +184,6 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_= lr_adr[] =3D { } }; =20 -static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] =3D { - { - .adr =3D 0x00013001fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_1_endpoint, - .name_prefix =3D "AMP1" - }, - { - .adr =3D 0x00013101fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_2_endpoint, - .name_prefix =3D "AMP2" - }, - { - .adr =3D 0x00013201fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_3_endpoint, - .name_prefix =3D "AMP3" - } -}; - -static const struct snd_soc_acpi_adr_device cs35l56_3_3amp_adr[] =3D { - { - .adr =3D 0x00033301fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_4_endpoint, - .name_prefix =3D "AMP4" - }, - { - .adr =3D 0x00033401fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_5_endpoint, - .name_prefix =3D "AMP5" - }, - { - .adr =3D 0x00033501fa355601ull, - .num_endpoints =3D 1, - .endpoints =3D &spk_6_endpoint, - .name_prefix =3D "AMP6" - } -}; - static const struct snd_soc_acpi_adr_device rt711_sdca_0_adr[] =3D { { .adr =3D 0x000030025D071101ull, @@ -408,25 +315,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_= agg_l3_cs35l56_l2[] =3D { {} }; =20 -static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = =3D { - { - .mask =3D BIT(2), - .num_adr =3D ARRAY_SIZE(cs42l43_2_adr), - .adr_d =3D cs42l43_2_adr, - }, - { - .mask =3D BIT(1), - .num_adr =3D ARRAY_SIZE(cs35l56_1_3amp_adr), - .adr_d =3D cs35l56_1_3amp_adr, - }, - { - .mask =3D BIT(3), - .num_adr =3D ARRAY_SIZE(cs35l56_3_3amp_adr), - .adr_d =3D cs35l56_3_3amp_adr, - }, - {} -}; - static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] =3D { { .mask =3D BIT(0), @@ -599,12 +487,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_ma= chines[] =3D { .sof_tplg_filename =3D "sof-ptl-rt713-l3-rt1320-l1.tplg", .get_function_tplg_files =3D sof_sdw_get_tplg_files, }, - { - .link_mask =3D BIT(1) | BIT(2) | BIT(3), - .links =3D ptl_cs42l43_l2_cs35l56x6_l13, - .drv_name =3D "sof_sdw", - .sof_tplg_filename =3D "sof-ptl-cs42l43-l2-cs35l56x6-l13.tplg", - }, { .link_mask =3D BIT(0) | BIT(2) | BIT(3), .links =3D ptl_rt722_l0_rt1320_l23, --=20 2.47.3 From nobody Sun May 24 22:35:58 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 9896937269C; Wed, 20 May 2026 16:37:53 +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=1779295075; cv=fail; b=cbq5uamMirPxAUGd6CZwun89naMy/koi/d7Nt5VUZhg7MUQ/I0CLgXHbM8d/2FDcEd1rS1wF+E8XDNT5qxKuLL8gwg3gNJGwNHeb00KAufu8FwixGH8+gew/bR6Xlp3oW+zzEwP+XBqVR8eJQ/v/Mms3k21AStl985Qs2LmqFJU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779295075; c=relaxed/simple; bh=NDzq6XF8fyshVzWuxmwp2sdJ2kEtwjk11NjVGUaRxlw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qwgDZSDu8GY9+KV3voqyhKhfOjR+JK/84r0uqLpg9PBMmRACj/2buNpVjHr6c4B2FXA0/YXdjMo1/Hr+FY5b/LGMovYw7PlgYwj5uN+UzZUoGO1x5+XtF+xx/q16FB0FIi6Z6gykKEeC654zGsD/vfonlHgIQQIitFHWJeIGVVA= 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=a0w+xZdE; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=vqShfgDI; 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="a0w+xZdE"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="vqShfgDI" 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 64KCf0EZ1071208; Wed, 20 May 2026 11:36:47 -0500 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=+pUzBoTpzvgSRVLvXqIY9dGKSO2eMViOL59AE95V7I4=; b= a0w+xZdEQikurH3myJVwD5IkxSWp8AIAOEnwESk9FOa1lZarsJWa+6Ke4mRpy0uj 5ZzB7mGH7ScxqAKY1s8O2IA6s0SIMJ2c9iLec8MN2nvNWiY1Rap8oVNujRi6Oi9r Z4btF+olPdUxcy3x32N+UF2bTEn1vLuWgUoC4NGmtcKRQuEEPJDUck5/UZt5+JBQ 5009mmUxobPEZ38VUHIWmwlD8CIm2bf3bJRkXN0pqo02NCmZzRrQmUVf1kaRqbbg aigh8tI/BfNnNLaPeG0THKuEv6KB6Va2zmYordsXIfjIboqQBhL1X9jpG/AcX0Mv I6kwbwvxpEBZSgCIafnTGA== Received: from co1pr03cu002.outbound.protection.outlook.com (mail-westus2azon11020104.outbound.protection.outlook.com [52.101.46.104]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4e93xch42h-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 20 May 2026 11:36:46 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=miNIlFVnqFvsLAHNdk+v76bLHqIlnmGvN1kceUHveKY5Y8chC5GYaNMxVVll30Wu99TlD5MgY/EgJzWOqonnsYP5/rwXGHtu/NCl93X4oQ5sS8hPXMeb43NpLBJ5nN0unqp+sROfW14hz6nF0jdwKNVYJb+J/JP8UPkhMP/duDpqz09UimEyLNjKXLJ+UcZq3kOMXn7CTVbxWPzJIqmKRQsK79O49MB5LbuG0NdyjBjbi0dXCH/5dVf8eqjuaxbMIl4Ky+LCkOHNnl62BRx+Pzdt/RMcA9Q4FEEMlZWxdu3ztjDfS3Hpz3KcokSk9br9l6X4xXN4pmcJlWejMjCfiQ== 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=+pUzBoTpzvgSRVLvXqIY9dGKSO2eMViOL59AE95V7I4=; b=cCGm/4BeqJBs59Ga/DH7aPbojPo8LtA+UokMAUD8maDY+xh2lNZVQQpJs1z9wT/+Uxwo63VrreatD5Ef9jU3EiqwuB1W84nbtD1w44d2WdO4HB6hCO3gOTE3UVGO29HuR1n7vP9gQfK4YIECUQakUyd7kRCkl91OHMn63zHJm4iTPYGFI2oPKys+yDCCsGhmYc6s5IDPD49AmeUt6VHwlc56aikJ3muj8k9mT+pKHH2e2k4YbD0QRzuoNjcSN8JPT+/ouP9vXjJ+SGA9XfODJUYLSWlyuDajJbhjy1VAw752ril5WRa989P0ZildfiUT3Bum9l4su77ieu0sTCJsFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 84.19.233.75) smtp.rcpttodomain=cirrus.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=+pUzBoTpzvgSRVLvXqIY9dGKSO2eMViOL59AE95V7I4=; b=vqShfgDI+EvGzupB6gWOIEtI1X8UPODxNQpOiQ8Q005qfy0+7Pe8LCUXHFZl5A0lbEUsx8krGUr6DJ4z3NLdSTxKBXMG0ff+SLPT9U4K8RE9avQhuplIlMNrCPj5KWcy4hz1xi1iNKt2xqTZXyRQv7gi4qZXDutHs7HVKk9f4ms= Received: from PH5P220CA0008.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:34a::6) by PH3PPF4FB38FDFE.namprd19.prod.outlook.com (2603:10b6:518:1::c1c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9913.11; Wed, 20 May 2026 16:36:39 +0000 Received: from SN1PEPF000397B0.namprd05.prod.outlook.com (2603:10b6:510:34a:cafe::5e) by PH5P220CA0008.outlook.office365.com (2603:10b6:510:34a::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.16 via Frontend Transport; Wed, 20 May 2026 16:36:37 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (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: SoftFail (protection.outlook.com: domain of transitioning opensource.cirrus.com discourages use of 84.19.233.75 as permitted sender) Received: from edirelay1.ad.cirrus.com (84.19.233.75) by SN1PEPF000397B0.mail.protection.outlook.com (10.167.248.54) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.48.11 via Frontend Transport; Wed, 20 May 2026 16:36:36 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 4923E40654A; Wed, 20 May 2026 16:36:35 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.12]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 2DDE8822542; Wed, 20 May 2026 16:36:35 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org, vkoul@kernel.org Cc: lgirdwood@gmail.com, pierre-louis.bossart@linux.dev, yung-chuan.liao@linux.intel.com, peter.ujfalusi@linux.intel.com, oder_chiou@realtek.com, jack.yu@realtek.com, shumingf@realtek.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH 3/3] soundwire: dmi-quirks: Disable ghost Realtek devices Date: Wed, 20 May 2026 17:36:31 +0100 Message-ID: <20260520163631.3300102-4-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> References: <20260520163631.3300102-1-ckeepax@opensource.cirrus.com> 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: SN1PEPF000397B0:EE_|PH3PPF4FB38FDFE:EE_ X-MS-Office365-Filtering-Correlation-Id: e66be463-f3dc-416a-889b-08deb68df61b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|61400799027|36860700016|18002099003|22082099003|56012099003|16102099003|11063799006; X-Microsoft-Antispam-Message-Info: 4XXRkm3fQh2BMqOnBmqU2lnL6W3sL29YxhrsiN8o9IptKkI48v7CgJTXe/cytPMxbAcrsQwOfrM4Z2n+42igPnixnqk50lBEjqqYnl8BlitnhnqyMJ1ax6828A12D83Fw68UwvPcaEPCJt6OOMZfE+A0Fds1IuldX2PjjWPg0MBAYvZE0rOCPH2s5I2b3VMWwCxevnl1cZdQA1s3hFznMlgArf6l9tbYc1IXifW+YAUF/T0p6zwgvW7xvXX3KGRnhVRhm3z9ICDj1Hhs25BY8qGuop/0OaiWWIgLdoMIP1yj5+gPJzaq/FHW4MjQAliwvgb+TxymZ3MoQgjgNYKrCheZkofZihAh5I+D8O8mvUunHsALOz2Z3nqNzSBgjqHPODvJACdOBST0lliv+vDNKIr4Ur0foqkRehejdFF0bGKcgXfeg/0g6xDp2lvrG5jJovMw8vQjtbXFN64tApwmFtRCJRNbTC7hxxWpKBsDaCSdPnVUQRn/Z0cNbFphVtDfqHS/RYxlBzHFQ4RN5DW6JHPrbuoOX9le93g9pjRwC3aWSFxhUk2mztCMuaE3gqKWVGZ3D16kbwN/HCV4HgpBEeQNLLcwWQugDDgfq3P9jkS91X+6hvKN2KvINBtI7JX+6xPFB2bx0h/a9Rm/aSl4chXO5WW5U49D433RZsI6lAdDFqauhHVjJ45ZPcs4J22V58V3wH4x/76GhYxr4gNrgWGh8mAat7gYjywqPsrHGFs= 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)(7416014)(82310400026)(61400799027)(36860700016)(18002099003)(22082099003)(56012099003)(16102099003)(11063799006);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I+jNv4C5yIX/8L4Z/4X8pWH5ei7Vs6vn0tC0UupNg4qzPxipgeEVk2oIMqbhtRAwbebrQcyHcQxYCjZSSlcfljF4I+7+N3v8dpKofgXwHzHSpZwL0xsk2tyrcxzd1svqO/0cjth0N+NZK3D53cvr41UgjyXJuXi4BoFBpKaijwGUJrls43ZwG8lpw1RPwdBxe9Tb5LtA0g2JWzO3sflowEFIX6WtldN5Ad6ck8gTpVK534B5V/DLWHdoerTfPU9mltveVfrFzeEBLKW8fRJV8/6AoqFnUqcIaVXi/HtZtqaorC1U10iyxdyFLn5l8G6+dvHm4sytgSATCskMVk+qeTO2fuJw6FWHzjBU91d0ktwYBZTKRbGucYUVFBSHMnKlFwhhPYpzH1I6gtK7cvY619bYXpK9L98onVhWPENutqHHs00t4qAFVkG0ACBZu6Un X-Exchange-RoutingPolicyChecked: YxjwMCMSIhT2ee/lpVXPHsgBIACi/LOygQ2k1C0d3J9nOg26Rpc3lKq4qDPhCSmtkEL0I9BhRSkxiMiddIseBA/rWiX8gn/VOv92LECFT7aN+vLJpRDPgFk8/FdhEpKvtRTyminuP0Swdnpi9+n8dfGlkJntcH9CKzi7dPR+3pMvh4H+Omxzb3nXw75WInlaffuTJm9r1VOchHrG4aHtGziS6kTNFPWqvBdhWWht0bWC9LFLknRalUib4WbD6B8nsgfskaFPPvE3i2qamm5TW5o5zkp730CN2muXnhVHzXuxcLdMrjhEmTrPTol83Iq16C1A98B1q9SXX41FfntJ1w== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2026 16:36:36.5938 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e66be463-f3dc-416a-889b-08deb68df61b 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-SN1PEPF000397B0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH3PPF4FB38FDFE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTIwMDE2MSBTYWx0ZWRfX/rEbrmRKo/jj S1182HDxjxoqxqx6zCtO8IBFf9rDWazwCIeqHSl5e/zmDBDTxPd2V47iGaquZKyFY1YDJfTF03t 3ZmYuSfc1uoUw43PYwIkSUb+ID2RC9gfbuDkJAnKQ9IGve42jaBXQgiSQ0Kc84DKqb6bf3JyjxJ PQ7LfgR0PXXJxN+arSk6LYnAV/tKAEVb37gH69dEolkc8V23xOUxdkMfPXxHABtezelnb9oEfLl lA9UL5OgBNF1oNILiWzbXBgHG6v4j2jBjxK4ZN8hIbkAs0wb0Tj3g2yOXCtEnHIGXbmd5kJK06k A+QnDpuoN328SmoqK1bhVSLk/1U/sywyPnrcZbz7swh3Vu1UPDxkS2OljA8HzKmefCogoaGAVpk unPnPB9VZb0qP95EdTZT7To2fbzBcUFQIOfjNXGA8Y9czH8dUikATLos1T3Um17GO0EKmjmpJoO qt+2Gm/jYXTb9iqBfYA== X-Proofpoint-GUID: PQ-orQamo-HnvgYpmIY_0NZnZjl3vi3f X-Authority-Analysis: v=2.4 cv=Wrgb99fv c=1 sm=1 tr=0 ts=6a0de31e cx=c_pps a=y/6OeRevqtbd3HODipuDjg==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=NGcC8JguVDcA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=Dj2-6B8FqX4mGL0U3gbX:22 a=w1d2syhTAAAA:8 a=Zb5XEA37cf-f1xfAQQ4A:9 X-Proofpoint-ORIG-GUID: PQ-orQamo-HnvgYpmIY_0NZnZjl3vi3f X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" Many systems ship with a Realtek audio codec in the ACPI that doesn't physically exist in the system. This confuses the newer function topology system that creates the soundcard, as it builds the card based on the ACPI information. Whilst we are working with the laptop vendors to try and stop this happening there are quite a few systems where this has shipped. Add a quirk to disable this "ghost" device. Currently this patch should cover: - Asus UX5406AA - Lenovo Yoga Pro 9i (83SF) - Lenovo Yoga Slim 7 Ultra (83QK) Signed-off-by: Charles Keepax Reviewed-by: Pierre-Louis Bossart --- drivers/soundwire/dmi-quirks.c | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c index 5854218e1a274..32a46a2d90f7c 100644 --- a/drivers/soundwire/dmi-quirks.c +++ b/drivers/soundwire/dmi-quirks.c @@ -90,6 +90,19 @@ static const struct adr_remap intel_rooks_county[] =3D { {} }; =20 +/* + * Many platforms have ghost realtek devices in the ACPI that don't physic= ally + * exist, remove those devices. + */ +static const struct adr_remap ghost_realtek[] =3D { + /* rt722 on link3 */ + { + 0x000330025d072201ull, + 0x0000000000000000ull + }, + {} +}; + static const struct dmi_system_id adr_remap_quirk_table[] =3D { /* TGL devices */ { @@ -164,6 +177,28 @@ static const struct dmi_system_id adr_remap_quirk_tabl= e[] =3D { }, .driver_data =3D (void *)hp_omen_16, }, + /* PTL devices */ + { + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "ASUS"), + DMI_MATCH(DMI_BOARD_NAME, "UX5406AA"), + }, + .driver_data =3D (void *)ghost_realtek, + }, + { + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83QK"), + }, + .driver_data =3D (void *)ghost_realtek, + }, + { + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83SF"), + }, + .driver_data =3D (void *)ghost_realtek, + }, {} }; =20 --=20 2.47.3