From nobody Tue Jun 16 16:52:37 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 DE62630E0ED; Thu, 30 Apr 2026 15:10:42 +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=1777561844; cv=fail; b=AoKUxDabhV/MZKvjVs/gCKEn1yA32oEJIAL5qgt0FYe8P1ViG5kaBFs69ZACLikHk03sQdorDCfUg66lp1TByUJWqxDhH4PaEQUYKfy8mEZaee3g+Gen/FmqtCJvBfHCpXFC1lg4lU7V/ZG9KVyAqn9jrNQ9bY/nc7UZBpPPMSc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777561844; c=relaxed/simple; bh=7/e1GRx3MuW+xkxbrHPYenjJtRODiO7Va5xLqxAzeFI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GQxzJu4ov4ksqakwedKgcly+9Rla9+xJW19bFvpucvBwphFoBew81YqE31tN09Y/gQphDYvMOnoKBlOzUX90Se6eqRqyczXd+5pQnNy0cmHeZRlVgUr3VHyVIwbCu8z8p9/8UxJ4JNxxI/Zuq1epLC75dNwEY5tGUdnPZQjgAhQ= 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=FdPZea43; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=b2KYGtYd; 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="FdPZea43"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="b2KYGtYd" 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 63U5NwWI2865616; Thu, 30 Apr 2026 10:09:43 -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=9s+e64GgZm7A4uMkb5RLaL/E0VSTXziB2qDU8dovn14=; b= FdPZea43FgTr8QCMSXj5zFEfBFv7spYflLMCOhJB0aiZvU6+P7us+TeC36Y4w7Tm JzNXuSOSZuqjC9sYnAcF040WvRUGbr9cmwz5yhBG60KBHvrbMCIAoZVctep3PJ6f QptMEa5sm9GP3Maa/DGjyteR66lk2REFycp5H3MjpwgAC12a55kgS6TESsAKK21s q/VmC/3tlKz82oGLyDmohrxa4vySgM682gL/TdeAXvlWI2gBfR3sujaYo5u6LzQi wX9342Skcoes4RHw3lwXVPqebhwOj+kVNoPS5dDnpoY7r3NwUZcO7pdNGAXtLr3q So4T8fFtu23Fcno2pbGh+w== Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020117.outbound.protection.outlook.com [52.101.56.117]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4dru10eu9a-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 30 Apr 2026 10:09:43 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YRTtxbQXxX+rPizx+NONOBHBp7XXHBJULHqV2lXD++ZE+n3zx5WPz7hkxSOsHp3Cx6+R4hga0SASBLIAk80ynZl1NOwww6QL+zhcWaSC8fkwUl9OcTxAzni3pDj6b568B2Uq5wvmehTZYLsahYeioSK7dGpBICfR2oV8N5+f0VMNBBdFT+k4MXdrxgcHqm4yQ5mJHeIE/CbrsopKaYLb74mQeS4coPvCrWUp4fFENNCxIAM5f+PUjYvPlwZhUi0iAq8F4faQlcEp2WtKL2HhZ3QCHivkQwgSf9nmr/9UQ9SwIkS4gd5yekEZ6qVIboPW6/O8ibNZgaUvVPXI8Ro60w== 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=9s+e64GgZm7A4uMkb5RLaL/E0VSTXziB2qDU8dovn14=; b=POyS+AgdIW0BEe0uqoJGx2ha47FU6hHXhfO7zzHF3ruUZHeiG+MjHVN0u2BaCNLqVZiF+UfKX69cS/ek6FCJOeySY2h+4Ks62VqUes4iZVg8LfOckX4h1FTrNszM8bTkfb/UuxcVbk0aFM2eTewoAQ0Uf9+GFh2XNNsKje7BtSTs8HRl+eURsz+1B92ByQCDm8xOLRTfvMm3Aqn0VSLyy/zhSHwnjUzS172N4z9b5PWOXSJtJZAU9KsB14lEHATDKNoNBMrR3vIoeLr9Kz322twN1zDi+CpskHl6bS4ddMfuFbBnV86b2r+h5LM5EW27traJJ/n/N3+FM8xX9TS4Fw== 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=9s+e64GgZm7A4uMkb5RLaL/E0VSTXziB2qDU8dovn14=; b=b2KYGtYdCV3VgPtVNB02Bl9smbr/gwmRWsVxacBO7SBc8oDqFXLkvDwU7GrY/8vy8GyLoadYlRzhlk2iABBH98X5kklDETFkcsiSi75YQnpjNcMACRSSZQfpPYCyTQURVIh+opcJZYwb9qMW5310ZaMi2i4xkGRKibc5SL+687w= Received: from SJ0PR13CA0024.namprd13.prod.outlook.com (2603:10b6:a03:2c0::29) by PH7PR19MB7463.namprd19.prod.outlook.com (2603:10b6:510:27a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.19; Thu, 30 Apr 2026 15:09:37 +0000 Received: from MW1PEPF0001615F.namprd21.prod.outlook.com (2603:10b6:a03:2c0:cafe::89) by SJ0PR13CA0024.outlook.office365.com (2603:10b6:a03:2c0::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.16 via Frontend Transport; Thu, 30 Apr 2026 15:09: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 MW1PEPF0001615F.mail.protection.outlook.com (10.167.249.90) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.0 via Frontend Transport; Thu, 30 Apr 2026 15:09: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 78990406550; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 5663282025A; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org Cc: lgirdwood@gmail.com, yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.dev, peter.ujfalusi@linux.intel.com, niranjan.hy@ti.com, kevin-lu@ti.com, baojun.xu@ti.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH v3 1/3] ASoC: SDCA: Add correct masks whilst reporting SDCA jack status Date: Thu, 30 Apr 2026 16:09:29 +0100 Message-ID: <20260430150931.2025953-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260430150931.2025953-1-ckeepax@opensource.cirrus.com> References: <20260430150931.2025953-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: MW1PEPF0001615F:EE_|PH7PR19MB7463:EE_ X-MS-Office365-Filtering-Correlation-Id: 49585a25-600a-4d1a-3f16-08dea6ca7e6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|61400799027|36860700016|7416014|376014|82310400026|16102099003|56012099003|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: y+ktwVq9FF/XouGK3H7Oje8bOCNeN+ieFL8wzBWRMydhYaQ97MkzvD6FfYtxFucXL2Ne5RcaPdE2CB5NlOKc7hI2ZQL76CZAdWvpZyK2bYzQEW9dbC4JIdjCOc6GjPrO1clH6wmy+LgXKqy4B+PTfN9RaZiZ0j15n8O9LhO7kUmTUTdj3aS58wi8eTq9TVNK8rBmlzejAcd2oeP4DqGI8ijPpcT3JOvM+XEQ/MOybdRJnnWTwMYGUBaZ+R8B1tbBrcPfXj/dzJNPzXEpYzGVBZzSeQ/zEVkMnsMS8WMWXrgxAvHVUa8D+yrlkDWNYDwqB77AjyrZlHsX/PWRw56vLDLdwc+i+wpTmUVJtPkIe4GcyXKGbKW3+RlhL4aaJRWAcLNORj8O/XkADABrxsSxMt9A+Hee959nywAjhlggsnVWhuPuUwG+0+5SLzCsEKKbtskWGVPQm8Sei8Z73oCBzYsVc8l13Br7lPZl0yGNdsdlfGLCsnYH6+utSD8LnXDmwLQTbIFConupohgztpSBxczfWucYiJHicgPeGvaJQItXSzA1uxLiHg7LDy7vwhm8gUxQKYlpbszyXs+paM5dnI/DKLSVbGHEEz/7qwYcILAGhjKgUSqfocJoZgART2FLsEgdcUkm1Mi4BtVq+fWLWfC/XCGei2vWRDSZTj++2WC/t2ebQUh1MO8RjL6FrXWLMJvC2oW+ZV7p+c+Ykio6seTY4lzyNzTqEh9kgSMivVZSCeaNc74DtNOx1CuI06UTNbYxpxgiP83WYIJAT43upQ== 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)(61400799027)(36860700016)(7416014)(376014)(82310400026)(16102099003)(56012099003)(22082099003)(18002099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zgwPSAUxED0nWxsbv/Bc04Qp1lbd/y4DAcZbglp2d3fEXyV8PwXSYzWzHULaHE/v1yn/JMZwzefGcxF32jh0lLb9UNM8xLjebk41nBc02G3GekLHWLNo+TJAKrMisYntECuRhpABjpIxFLB4r/vIdJKg/9D0NFkQImcBSygzw39Y7hDnjJe+dP8GhJ+ml7AK2+cIwTgsKgdtt9ja7/aGmQc1XlPm4ruZwwpp8FlK7UxNYngC9XM8RPRv2LrdPKKVq9hduu3K/a6VB8nsIxszL+aJ2U7Pd8DSldSjvP98olczonbCB4zRfD776fG4bji0QF/Zsnh2uvjwX8Ykt6cR4WAeYWSSHAIIc09mKwgyY9TAnfrWuJfYVe7GcG0hOxT3awYH+LQiVvcBpGZHrvNwLkelSAAxdwxqtygHViDAwei3FdD6y9a1ELTLw8nk+r/v X-Exchange-RoutingPolicyChecked: vuIXuIbEmzSWtGfxmxPD6gvm1gL9WJLyikEBccvUnODvBiHnM1hLIovqS6NvcA5iwcsjXxEE9aX3TeQuVIqFfL3L5fUY3Al8h+k0EWSSI/N+fdquqmDVr2KuqGbdBGvoX9VCt0ibzTLhzlyfYZikErLe1N3TYRy5bLmJX5XXozPjqJ9gOLQ2PEkNnFlxr1UuJb6kWO74QXNKMwQ+Pk897JKKvlnEsf7dZzdTI03QjR4IItn++QsSbsGePHws3mMaGwAkEowRRnS7ogJ8XnFas28jKk4dbp7G9Iu0VqcSmnQAibxfPDHi0sxrhxFDeVHP/J3gF9amF6nAEjItnpRhXg== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 15:09:36.4554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49585a25-600a-4d1a-3f16-08dea6ca7e6c 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-MW1PEPF0001615F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR19MB7463 X-Proofpoint-ORIG-GUID: aHroiWgkusB0s_027sBBUxfH9ATSeFki X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDMwMDE1NiBTYWx0ZWRfXyryiinlBBF5P n1rPA0iEDI08fFFHSXe3ZQo4sCWE/YzEAc1Jcy5ycu0sVsUKF8TlOOIUc1PDVubRIPea6v08VSq 4CKI31sKxebrawFhUMzkXUX9MHSvzUyHil0hYmpPNq4EUg3CDSlYEOc/I4r9ME4fc3fbdfGH5T/ eyRg8JSfkh3TsblnJWt28FY+nLEq3oC+J6yegL6NSgAydy0GXhzfCLC8/xxu0TKokWZIPwftDYG qGVIrRUj7KUEZTxtnNZaEN83W7JL4xPGjDKijJx1ptynNTG8XCKtc48zp3kfUQO2vQs8ypOONWr Qia2ZDWWlk8QU9pkM6Ff34Jn3yMjyJ8r650uJIkPiYB2/bRPX6jTPBSCu42S8QGXQBb2i4j3RqZ 60g0cHS5fRCKMK+5f7L0fqxCDSX87oMr3kjXQqKno9/rVh00CT+iab1CmVmHlx0nyzIT7KcQaib iS/v0Srnb8GP0aRWBUw== X-Authority-Analysis: v=2.4 cv=EuTiaycA c=1 sm=1 tr=0 ts=69f370b7 cx=c_pps a=v6Z6meDQFn3ji2zknzBGMg==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=A5OVakUREuEA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=Dj2-6B8FqX4mGL0U3gbX:22 a=w1d2syhTAAAA:8 a=M2GLoMmDkqpnuoSPwl0A:9 X-Proofpoint-GUID: aHroiWgkusB0s_027sBBUxfH9ATSeFki X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" Currently, all SDCA jacks simply report against a mask of 0xFFFF. This works fine for system with a single SDCA jack control as the status reflects that single control at all times. However, if two SDCA jack controls exist in the system, such as a separate representation for input and output, then the second control can cancel reports from the other since it will only report its relevant bits and zero in all other slots. This is exactly what the mask is for. Build up a mask using all the possible states for an SCDA jack control at registration time and use that mask when reporting a particular jack. It is worth noting this still doesn't handle cases such as two headphone jacks as that would require separate ALSA jacks to report to. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Charles Keepax --- Changes since v2: - Slightly reorder sdca_jack_set_jack just to make things a littler neater. include/sound/sdca_jack.h | 3 ++ sound/soc/sdca/sdca_jack.c | 75 ++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/include/sound/sdca_jack.h b/include/sound/sdca_jack.h index 3ec22046d3ebc..181541f0f4d8c 100644 --- a/include/sound/sdca_jack.h +++ b/include/sound/sdca_jack.h @@ -18,10 +18,13 @@ struct snd_soc_jack; * struct jack_state - Jack state structure to keep data between interrupts * @kctl: Pointer to the ALSA control attached to this jack * @jack: Pointer to the ASoC jack struct for this jack + * @mask: Possible reported jack status bits for this jack */ struct jack_state { struct snd_kcontrol *kctl; struct snd_soc_jack *jack; + + unsigned int mask; }; =20 int sdca_jack_alloc_state(struct sdca_interrupt *interrupt); diff --git a/sound/soc/sdca/sdca_jack.c b/sound/soc/sdca/sdca_jack.c index 49d317d3b8c85..a2d95b124b789 100644 --- a/sound/soc/sdca/sdca_jack.c +++ b/sound/soc/sdca/sdca_jack.c @@ -145,6 +145,32 @@ int sdca_jack_alloc_state(struct sdca_interrupt *inter= rupt) } EXPORT_SYMBOL_NS_GPL(sdca_jack_alloc_state, "SND_SOC_SDCA"); =20 +static int type_get_mask(enum sdca_terminal_type type) +{ + switch (type) { + case SDCA_TERM_TYPE_LINEIN_STEREO: + case SDCA_TERM_TYPE_LINEIN_FRONT_LR: + case SDCA_TERM_TYPE_LINEIN_CENTER_LFE: + case SDCA_TERM_TYPE_LINEIN_SURROUND_LR: + case SDCA_TERM_TYPE_LINEIN_REAR_LR: + return SND_JACK_LINEIN; + case SDCA_TERM_TYPE_LINEOUT_STEREO: + case SDCA_TERM_TYPE_LINEOUT_FRONT_LR: + case SDCA_TERM_TYPE_LINEOUT_CENTER_LFE: + case SDCA_TERM_TYPE_LINEOUT_SURROUND_LR: + case SDCA_TERM_TYPE_LINEOUT_REAR_LR: + return SND_JACK_LINEOUT; + case SDCA_TERM_TYPE_MIC_JACK: + return SND_JACK_MICROPHONE; + case SDCA_TERM_TYPE_HEADPHONE_JACK: + return SND_JACK_HEADPHONE; + case SDCA_TERM_TYPE_HEADSET_JACK: + return SND_JACK_HEADSET; + default: + return 0; + } +} + /** * sdca_jack_set_jack - attach an ASoC jack to SDCA * @info: SDCA interrupt information. @@ -154,7 +180,8 @@ EXPORT_SYMBOL_NS_GPL(sdca_jack_alloc_state, "SND_SOC_SD= CA"); */ int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_ja= ck *jack) { - int i, ret; + int i, j; + int ret; =20 guard(mutex)(&info->irq_lock); =20 @@ -162,6 +189,7 @@ int sdca_jack_set_jack(struct sdca_interrupt_info *info= , struct snd_soc_jack *ja struct sdca_interrupt *interrupt =3D &info->irqs[i]; struct sdca_control *control =3D interrupt->control; struct sdca_entity *entity =3D interrupt->entity; + struct sdca_control_range *range; struct jack_state *jack_state; =20 if (!interrupt->irq) @@ -169,6 +197,20 @@ int sdca_jack_set_jack(struct sdca_interrupt_info *inf= o, struct snd_soc_jack *ja =20 switch (SDCA_CTL_TYPE(entity->type, control->sel)) { case SDCA_CTL_TYPE_S(GE, DETECTED_MODE): + range =3D sdca_selector_find_range(interrupt->dev, entity, + SDCA_CTL_GE_SELECTED_MODE, + SDCA_SELECTED_MODE_NCOLS, 0); + if (!range) + return -EINVAL; + + for (j =3D 0; j < range->rows; j++) { + enum sdca_terminal_type type; + + type =3D sdca_range(range, SDCA_SELECTED_MODE_TERM_TYPE, j); + + jack_state->mask |=3D type_get_mask(type); + } + jack_state =3D interrupt->priv; jack_state->jack =3D jack; =20 @@ -191,7 +233,6 @@ int sdca_jack_report(struct sdca_interrupt *interrupt) struct jack_state *jack_state =3D interrupt->priv; struct sdca_control_range *range; enum sdca_terminal_type type; - unsigned int report =3D 0; unsigned int reg, val; int ret; =20 @@ -213,35 +254,7 @@ int sdca_jack_report(struct sdca_interrupt *interrupt) type =3D sdca_range_search(range, SDCA_SELECTED_MODE_INDEX, val, SDCA_SELECTED_MODE_TERM_TYPE); =20 - switch (type) { - case SDCA_TERM_TYPE_LINEIN_STEREO: - case SDCA_TERM_TYPE_LINEIN_FRONT_LR: - case SDCA_TERM_TYPE_LINEIN_CENTER_LFE: - case SDCA_TERM_TYPE_LINEIN_SURROUND_LR: - case SDCA_TERM_TYPE_LINEIN_REAR_LR: - report =3D SND_JACK_LINEIN; - break; - case SDCA_TERM_TYPE_LINEOUT_STEREO: - case SDCA_TERM_TYPE_LINEOUT_FRONT_LR: - case SDCA_TERM_TYPE_LINEOUT_CENTER_LFE: - case SDCA_TERM_TYPE_LINEOUT_SURROUND_LR: - case SDCA_TERM_TYPE_LINEOUT_REAR_LR: - report =3D SND_JACK_LINEOUT; - break; - case SDCA_TERM_TYPE_MIC_JACK: - report =3D SND_JACK_MICROPHONE; - break; - case SDCA_TERM_TYPE_HEADPHONE_JACK: - report =3D SND_JACK_HEADPHONE; - break; - case SDCA_TERM_TYPE_HEADSET_JACK: - report =3D SND_JACK_HEADSET; - break; - default: - break; - } - - snd_soc_jack_report(jack_state->jack, report, 0xFFFF); + snd_soc_jack_report(jack_state->jack, type_get_mask(type), jack_state->ma= sk); =20 return 0; } --=20 2.47.3 From nobody Tue Jun 16 16:52:37 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 8DC562F6184; Thu, 30 Apr 2026 15:10:23 +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=1777561826; cv=fail; b=SMpkkE/3g5M6XqpKNodJs+K9HTYesqCljWhnMZ1TGfvtuLcf6eoJx/Wmrg+hEYq/MLnWpHI9QS0lGrHvuijhc7ZYabKMFsbc9UritPDXklkUq7SXnXasoDtM/uAEIRG2iCNkDJRdj3QRJhWkfy94f7G7v4Exsp2EdRlV+6hiAnA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777561826; c=relaxed/simple; bh=7q0LTTqI044sOpG4ReQF9zpqTdXNIDVncZzON84Ubtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TyzX6K0CK9zRtjVqRidRWspo9iKwdQHHt/J5h3wXPzbtEZ5FcYJ9irm5qEgoOZC6j6OuLFSkPCl38U6DPJFGlBB5tEpCkbQs9W9kdM64e2wuquLePCZvl7v+7uR7h94bgezBocZQvfMuISPqM0+hx9fWdVNvZ/zxrgbFf0bq5EE= 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=SldHInK0; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=dkQkKWyW; 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="SldHInK0"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="dkQkKWyW" 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 63UDXSTv1588093; Thu, 30 Apr 2026 10:09:40 -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=GTMNRi5tLwAD4Bc4EakJWwkLCmIAaf/EPBuzrUYRGc8=; b= SldHInK0jOOmgi9TVn19fyW2nHpbjISFbM7KfszIzfDjYRJYMxVZNunBlEi8mlF0 FBXR43+APdw4258LLMsa5axhZVSc0ImPKwVNOQeR2ru2ThZ8JNaVFLHCB/OftfsA kXp6EkjwD/JZsnR+ujnsRL/tYKwa2zIrKKPqAsFHqdwWCuwXuFy7/XnZJXWCVw56 2AKij/Usjs4CoUrISZ3zLL+t/BwclUErVo7iU3DEu4jKuarMjqSXqM5SiMSZcjTw SveBE+A1pM9F0ez/PmCTOuP4I/tOUP6PJtL8nsdx5nFIOcn72iF7HK1Ugkru1RK2 ChX87DedFsNS8Wb7bNZa+Q== Received: from ph7pr06cu001.outbound.protection.outlook.com (mail-westus3azon11020137.outbound.protection.outlook.com [52.101.201.137]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4dv82e84ve-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 30 Apr 2026 10:09:39 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YZzGrotRhsXzSFbjbon7z8lzcOhDpFtevFjPfDwgPr+8ru8jWKTlwyU9PN4C9nIdEzl23tWNwEanUj1+VT+2JIcgd4VKzh/kM0c9pR37qqW7s8UGDmiMoUBre9WqJNpwHy5m7aq8Pm9l60lqmfpuS6mmu7OZ9SS1fhMy5+b5pIXrfmhhQDLvnjo2ZpH9vBSo6t++TvazxkPd1HbT7pRubDNcvp+tPmBsbIP6OIxDU/U3QVylsK45uEirKGRjphrUA+kpyPDVB7oAPNOuVHR4RXXzDMjdZto+JcWdimZt1vtTH1klXs6MfLjLk2D2hQWRFFyNnjOVhcRFwIW8RRQ4bw== 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=GTMNRi5tLwAD4Bc4EakJWwkLCmIAaf/EPBuzrUYRGc8=; b=jpaomGD+ey/pkAwmgEjRd+GPKudGp6qGE4UcgMTSwNp22f59ly2uLYMYoPnhVKKmcu9qsZoeztCDyRe9l4CEQXACxqAkCICYEe3OKV3y7+9MVA3fyNpboaJ8KnX880RV+asZP21orMx2Un7i2Bd4+2vkQ/GvVinpLyvg1O0IZrw8AtjCRKvtcMh3c5sXGbt8DoMmTeRfLsbsobYybI4XoLrbVzkF851mP+uS1WXDKypAwOVdTSCe9TeuaYQkqsEHtkcRyOWmU43TpG8xH+QaX2saoZX+CwPjl3HPRnusOAADfhyu4uuv+v04zsf0eN3wsAIMv10x61gaFrFGLUN5MQ== 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=GTMNRi5tLwAD4Bc4EakJWwkLCmIAaf/EPBuzrUYRGc8=; b=dkQkKWyW5jnp7sr4zzoT1j/uPvY5PFwhC3bhtnmnG6E6Jv8j325cVT0vHB5W7tZOkWyF9KnhdDaPFEYH/2jMPW9L0mnjG45Qt1KK+SYUaKcQSSsZT0JVhRMmTR2dg/YWcTofYhzCGO62QSqKVYf3q927Tp0YPoUAxFszamJwDNg= Received: from SJ0PR13CA0004.namprd13.prod.outlook.com (2603:10b6:a03:2c0::9) by DSVPR19MB997261.namprd19.prod.outlook.com (2603:10b6:8:38a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.20; Thu, 30 Apr 2026 15:09:37 +0000 Received: from MW1PEPF0001615F.namprd21.prod.outlook.com (2603:10b6:a03:2c0:cafe::e9) by SJ0PR13CA0004.outlook.office365.com (2603:10b6:a03:2c0::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.16 via Frontend Transport; Thu, 30 Apr 2026 15:09: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 MW1PEPF0001615F.mail.protection.outlook.com (10.167.249.90) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9891.0 via Frontend Transport; Thu, 30 Apr 2026 15:09: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 7D5FF406554; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 5A97982026C; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org Cc: lgirdwood@gmail.com, yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.dev, peter.ujfalusi@linux.intel.com, niranjan.hy@ti.com, kevin-lu@ti.com, baojun.xu@ti.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH v3 2/3] ASoC: SDCA: Remove sdca_function_data duplication Date: Thu, 30 Apr 2026 16:09:30 +0100 Message-ID: <20260430150931.2025953-3-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260430150931.2025953-1-ckeepax@opensource.cirrus.com> References: <20260430150931.2025953-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: MW1PEPF0001615F:EE_|DSVPR19MB997261:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a8d43e1-9608-4b9f-e71d-08dea6ca7e64 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|61400799027|36860700016|82310400026|7416014|18002099003|56012099003|22082099003|16102099003; X-Microsoft-Antispam-Message-Info: j3lqIx2eKZAta0JC2aIUYKgBKgzN1pPc4ZCQYONGNGDHZkiKxmZuG6eONxhj/eRIEEnP2n7t/ibvvcdl154PKlPDUPnfuAPOAK+Ek2dibZ4W+uT/5nIZyV/FJ2cYhh32Q8kyUu4aqw2QMDXAnvWtWkccjhe6DH2iD9Sb+GdUW3aSuoVqh/mYcMx5qSSq0lrY9x+cDqiIfVuutSvmuHG2zevNp6kTq5UP5bSENywZew8PrW6z0MgCuU+1R23iEwHcy2ME4IhwpAanUiRVnMhFLvmBv55C1kjUfDAN2Vc38CPBiw9FqHtLXTFBrVMGFymithXUY0SMoJguBr3wSiEJAGTDbJJEYkUDNuoBBuVUx2il+TeAtCCWj4BwAvab7w9cYWD1p8nfMoAax4Q9I4UTZmCfE+HLbf/6zv4x87fBqb0Ir68eMinFH5CMYDmlOWiyGe2uHlIMwawP23vm9le8M+OvsjdiytV6no49k0zCpqn+WS+yirfmTGiXrC+jxfoP1hvqe2vEQK2LOk2XMUDApg/CQeXr0d2rR8cvzZcSYaH+MSLy0TY1UBSTBBst19/1OzKr2fefH7QDNmAWTGUE2rX/oZZbD82rREdqJ2KD517IgMwLfx+TGkWU7MCwTEv+HvAZwdAl+BR/OP8wdXxnBOg47mQupGAD7CXCKWXrp7y2q2VTxoCLWuSTfirzQGMLcf3D/TC2cBBKzkh3rBnKk4tycWmhcwCDriMCWMtQvpe1kXf1lFCeQRLz5/T5kWvSp86U4jB4rtFOo4r7YtS4yA== 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)(36860700016)(82310400026)(7416014)(18002099003)(56012099003)(22082099003)(16102099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZZp4OQEYKlEuZn7648P1JxnN9GyC5KXLHyDhRcSRFJ/vWdjkHO+0WoPynFFOKQctMHTtj6s2rQUg6i62rC6og8eHU0Nfgq0vrZcjs4CzGfE2hVHcjy7UVI0iZDHIyCYspVYHa7jC0TuabLPApXd4C2PgD0zQyB6yXUp1W6RHpIn2OT4imN72RyKv3Z+9gMln8HLUxCPutaaFwQzbdTHrE3n3imP2QoTMjqWQMvApQCo0vHFUDHamHGMKrb81VvZhHK3AguOnoaO9lBSGy8yVqKRxLcLIhG59twW18dzT+VtxJTbv7DIIe6a00uMb/4uLN9jpkXx6Q1c1Qt7bWUpkSBLjVbdHMixZN/4bXR0F523gR9Z8jp8fdy4Ke2cvr+oHfIrWaQ43jR8nr5ANEnDZLO0Vl1OGj3+3UO9TbxwvW6whAjh35AAo1KmkjWMvKXKY X-Exchange-RoutingPolicyChecked: ZGubCAWh3bfbXqE2bPx5TExgeOxo+vtcNVgp9JVEV+nip+MBDNgNGKRM/azvaiHvCT53h0NaEDtHHd1+wHsZF21gGlGkxmvNguYIX8CWQKWd8boVXziPjNNH1RHwlHacJ2EnMKRpDW4YAiXLcCyzw1RC46gT3hVx3pvx+Ughtqqr9tSzApQ9DHVZFOktJCVSxSLjn4K8V/ZWa3TdKWFUgmA8kmmC8PebMTKhW7nSd5ufCR+kJPqgB/x45qnqrVf7JPgFDdDQ/9cF/VUVwvLUjCbg5kb8xCP6P7Ts4/+my6hEPrfrsW2NUHpUIpz37c3JRYfHeGD2uY6aJhnrCqRchQ== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 15:09:36.4083 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a8d43e1-9608-4b9f-e71d-08dea6ca7e64 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-MW1PEPF0001615F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DSVPR19MB997261 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDMwMDE1NiBTYWx0ZWRfX2E/d0JXG9FIn EAMC+Pp5RYNxol5n7jobpt4VJz1mCokP8JMi5GGol+rm5gV6kDRVMQLAXATX6/MyI4wnGNQuyGi y3Rxy6pkm+4BOJjiO1jj0utXR91p//RrTZHVXPWg0d+7HhBVzyeqOFb8digxWDt8jat8Q9aeD5i KrVEdQJE+HNZ3krPrxzW3MBvJRPVDljeOSSiHWGeYkd2VItT9vadFQ/vjmp1ghlEpJmKCTGfi+w EnurQ86hBBOELqIK6go1aKcoTBfl9qKSJ2fI0I/Fw7etWIG3rrvzsaFfU3AhZXrwzby4TyqqBtK u39+T63pA5EhS7UACHbDug52esVwB5I0pS07dod/8Bykwyo0703qcnf7VwnPUS98Mp4bnDR4TGb aZSjcdrRY5MC3D+zQqF9qg+n+JUVKO5FqbRrGET3PfMe9nWBZLG4XyXxlF1gSIS6Cjc1fmNeWVK RxCMkoLMuh01RpAAJGw== X-Authority-Analysis: v=2.4 cv=P64KQCAu c=1 sm=1 tr=0 ts=69f370b4 cx=c_pps a=m7gYBUTXKXNlxA7KPONIMQ==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=A5OVakUREuEA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=KfkQE9S9VqCBgivYGm0O:22 a=w1d2syhTAAAA:8 a=YCwCtIK0V8ENfNN9dB4A:9 a=O8hF6Hzn-FEA:10 X-Proofpoint-GUID: ZVcJ71ECUi_CoH-YC9CBOWvovxXqo0ZC X-Proofpoint-ORIG-GUID: ZVcJ71ECUi_CoH-YC9CBOWvovxXqo0ZC X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" The class driver internally has an array of sdca_function_data pointers that it uses to store the parsed DisCo data. However, there is already an sdca_function_data attached to the auxdev device. It makes more sense to use the one already provided in the auxdev device, as it could also be used by custom drivers for parts that require those. Using the auxdev copy also prevents the need for the class function drivers to search through the array for the correct data, which currently is based off matching the function type. This has problems when two functions have the same type as the current code will find the same data for both drivers, using the auxdev copy of the data avoids this problem. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Charles Keepax --- Changes since v2: - Add missing set of function_data->desc in tas2783 include/sound/sdca_function.h | 1 - sound/soc/codecs/tas2783-sdw.c | 6 +++--- sound/soc/sdca/sdca_class.c | 7 ------- sound/soc/sdca/sdca_class.h | 1 - sound/soc/sdca/sdca_class_function.c | 23 +++++------------------ sound/soc/sdca/sdca_functions.c | 25 ++++++++++--------------- 6 files changed, 18 insertions(+), 45 deletions(-) diff --git a/include/sound/sdca_function.h b/include/sound/sdca_function.h index 0e871c786513f..b1489178b0ef8 100644 --- a/include/sound/sdca_function.h +++ b/include/sound/sdca_function.h @@ -1452,7 +1452,6 @@ static inline u32 sdca_range_search(struct sdca_contr= ol_range *range, } =20 int sdca_parse_function(struct device *dev, struct sdw_slave *sdw, - struct sdca_function_desc *desc, struct sdca_function_data *function); =20 const char *sdca_find_terminal_name(enum sdca_terminal_type type); diff --git a/sound/soc/codecs/tas2783-sdw.c b/sound/soc/codecs/tas2783-sdw.c index 90008d2d06e2c..38009168c5a11 100644 --- a/sound/soc/codecs/tas2783-sdw.c +++ b/sound/soc/codecs/tas2783-sdw.c @@ -1310,10 +1310,10 @@ static s32 tas_sdw_probe(struct sdw_slave *peripher= al, return dev_err_probe(dev, -ENOMEM, "failed to parse sdca functions"); =20 + function_data->desc =3D &peripheral->sdca_data.function[i]; + /* Parse the function */ - ret =3D sdca_parse_function(dev, peripheral, - &peripheral->sdca_data.function[i], - function_data); + ret =3D sdca_parse_function(dev, peripheral, function_data); if (!ret) tas_dev->sa_func_data =3D function_data; else diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c index 6e9b66f718019..a6a3da8de4371 100644 --- a/sound/soc/sdca/sdca_class.c +++ b/sound/soc/sdca/sdca_class.c @@ -183,7 +183,6 @@ static void class_boot_work(struct work_struct *work) static int class_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_= id *id) { struct device *dev =3D &sdw->dev; - struct sdca_device_data *data =3D &sdw->sdca_data; struct regmap_config *dev_config; struct sdca_class_drv *drv; int ret; @@ -199,12 +198,6 @@ static int class_sdw_probe(struct sdw_slave *sdw, cons= t struct sdw_device_id *id if (!dev_config) return -ENOMEM; =20 - drv->functions =3D devm_kcalloc(dev, data->num_functions, - sizeof(*drv->functions), - GFP_KERNEL); - if (!drv->functions) - return -ENOMEM; - drv->dev =3D dev; drv->sdw =3D sdw; mutex_init(&drv->regmap_lock); diff --git a/sound/soc/sdca/sdca_class.h b/sound/soc/sdca/sdca_class.h index 6f24ea2bbd381..8b63e62485e64 100644 --- a/sound/soc/sdca/sdca_class.h +++ b/sound/soc/sdca/sdca_class.h @@ -24,7 +24,6 @@ struct sdca_class_drv { struct regmap *dev_regmap; struct sdw_slave *sdw; =20 - struct sdca_function_data *functions; struct sdca_interrupt_info *irq_info; =20 struct mutex regmap_lock; diff --git a/sound/soc/sdca/sdca_class_function.c b/sound/soc/sdca/sdca_cla= ss_function.c index 31fc08d513077..1496a15f7d2ac 100644 --- a/sound/soc/sdca/sdca_class_function.c +++ b/sound/soc/sdca/sdca_class_function.c @@ -27,6 +27,7 @@ #include #include #include "sdca_class.h" +#include "sdca_function_device.h" =20 struct class_function_drv { struct device *dev; @@ -294,8 +295,7 @@ static int class_function_probe(struct auxiliary_device= *auxdev, { struct device *dev =3D &auxdev->dev; struct sdca_class_drv *core =3D dev_get_drvdata(dev->parent); - struct sdca_device_data *data =3D &core->sdw->sdca_data; - struct sdca_function_desc *desc; + struct sdca_dev *sdev =3D auxiliary_dev_to_sdca_dev(auxdev); struct snd_soc_component_driver *cmp_drv; struct snd_soc_dai_driver *dais; struct class_function_drv *drv; @@ -305,7 +305,6 @@ static int class_function_probe(struct auxiliary_device= *auxdev, int ndefaults; int num_dais; int ret; - int i; =20 drv =3D devm_kzalloc(dev, sizeof(*drv), GFP_KERNEL); if (!drv) @@ -328,21 +327,9 @@ static int class_function_probe(struct auxiliary_devic= e *auxdev, =20 drv->dev =3D dev; drv->core =3D core; + drv->function =3D &sdev->function; =20 - for (i =3D 0; i < data->num_functions; i++) { - desc =3D &data->function[i]; - - if (desc->type =3D=3D aux_dev_id->driver_data) - break; - } - if (i =3D=3D core->sdw->sdca_data.num_functions) { - dev_err(dev, "failed to locate function\n"); - return -EINVAL; - } - - drv->function =3D &core->functions[i]; - - ret =3D sdca_parse_function(dev, core->sdw, desc, drv->function); + ret =3D sdca_parse_function(dev, core->sdw, drv->function); if (ret) return ret; =20 @@ -377,7 +364,7 @@ static int class_function_probe(struct auxiliary_device= *auxdev, return dev_err_probe(dev, PTR_ERR(drv->regmap), "failed to create regmap"); =20 - switch (desc->type) { + switch (drv->function->desc->type) { case SDCA_FUNCTION_TYPE_UAJ: case SDCA_FUNCTION_TYPE_RJ: cmp_drv->set_jack =3D class_function_set_jack; diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_function= s.c index 196bade11ab5d..02abb7315b727 100644 --- a/sound/soc/sdca/sdca_functions.c +++ b/sound/soc/sdca/sdca_functions.c @@ -2158,27 +2158,22 @@ static int find_sdca_filesets(struct device *dev, s= truct sdw_slave *sdw, * sdca_parse_function - parse ACPI DisCo for a Function * @dev: Pointer to device against which function data will be allocated. * @sdw: SoundWire slave device to be processed. - * @function_desc: Pointer to the Function short descriptor. * @function: Pointer to the Function information, to be populated. * * Return: Returns 0 for success. */ int sdca_parse_function(struct device *dev, struct sdw_slave *sdw, - struct sdca_function_desc *function_desc, struct sdca_function_data *function) { + struct fwnode_handle *node =3D function->desc->node; u32 tmp; int ret; =20 - function->desc =3D function_desc; - - ret =3D fwnode_property_read_u32(function_desc->node, - "mipi-sdca-function-busy-max-delay", &tmp); + ret =3D fwnode_property_read_u32(node, "mipi-sdca-function-busy-max-delay= ", &tmp); if (!ret) function->busy_max_delay =3D tmp; =20 - ret =3D fwnode_property_read_u32(function_desc->node, - "mipi-sdca-function-reset-max-delay", &tmp); + ret =3D fwnode_property_read_u32(node, "mipi-sdca-function-reset-max-dela= y", &tmp); if (ret || tmp =3D=3D 0) { dev_dbg(dev, "reset delay missing, defaulting to 100mS\n"); function->reset_max_delay =3D 100000; @@ -2187,26 +2182,26 @@ int sdca_parse_function(struct device *dev, struct = sdw_slave *sdw, } =20 dev_dbg(dev, "%pfwP: name %s busy delay %dus reset delay %dus\n", - function->desc->node, function->desc->name, - function->busy_max_delay, function->reset_max_delay); + node, function->desc->name, function->busy_max_delay, + function->reset_max_delay); =20 - ret =3D find_sdca_init_table(dev, function_desc->node, function); + ret =3D find_sdca_init_table(dev, node, function); if (ret) return ret; =20 - ret =3D find_sdca_entities(dev, sdw, function_desc->node, function); + ret =3D find_sdca_entities(dev, sdw, node, function); if (ret) return ret; =20 - ret =3D find_sdca_connections(dev, function_desc->node, function); + ret =3D find_sdca_connections(dev, node, function); if (ret) return ret; =20 - ret =3D find_sdca_clusters(dev, function_desc->node, function); + ret =3D find_sdca_clusters(dev, node, function); if (ret < 0) return ret; =20 - ret =3D find_sdca_filesets(dev, sdw, function_desc->node, function); + ret =3D find_sdca_filesets(dev, sdw, node, function); if (ret) return ret; =20 --=20 2.47.3 From nobody Tue Jun 16 16:52:37 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 6CFFA2C235E; Thu, 30 Apr 2026 15:10:32 +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=1777561835; cv=fail; b=h+ts+IOc7QL5Oh9wRcmEECbT/yxftKyn+ZO9mqiwML5L1mSaC3LSLxMXXT4JGM0k/9Gev27+J0jEyIjokkNrMxkyybu008gzzAu944AEfoHLebai/kgG89QbZBUxsAxx4lANcwlKO/Tb8Dpbh0drYBMA5/EmdUvTJdnObsA0Q9w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777561835; c=relaxed/simple; bh=pRr3JlNulsGZKPLGd9mYVpcwlQZsYXppKZ3ljGMlwl0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VywgUZA3jwt0Mi1+1EmpKfYMijd4w9QTnwdlfq4+OmiLvPjNqNJ1w70chwpEcdqhnyoi3TXPXuQsZ8Quf4yfQafC8qf+Nw+gm3HRZQzvc5qPab+ZsMsnPVmOTgI2SqVrZJZsmLD48siLpXmDqKu/b37bAMSUHGzztTu/iJLUf34= 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=O99sgwNW; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b=osDqLf9U; 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="O99sgwNW"; dkim=pass (1024-bit key) header.d=cirrus4.onmicrosoft.com header.i=@cirrus4.onmicrosoft.com header.b="osDqLf9U" 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 63UDXJfG1587864; Thu, 30 Apr 2026 10:09:42 -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=4Yy0W/1o0S/p6110mJT0vDTXMo1Y9NPa8nz6AJm6LPc=; b= O99sgwNWmXX6vI5fTvqW6Esif+yaEp/hNsC6up+SdngLhadHZXZr+2m2125wmGl2 Bc5nQF1/+DVpWBemBktXUHsAa7bpeQvToXlrFtdJraAtgBWQmG+djr9AuhMCiAoi bDHuExipXbUGIIcNv/kMxShUMiShDpS/SUUXyihlIYgH3qUqCNE4o4K3JrDJXQN4 mWr2F29AJgqrmqfwXya7ERMvld4qafrtvA23wKzNClDaroxHKimei/2hfLZnYlOP vXY2KDVNkUaSwoFL/aARYJWp4U1GCYxmsls+ss16q1hG61E8mKWNmC8WH6th4HK0 1EitbNoPx7/dY72ymctdJA== Received: from mw6pr02cu001.outbound.protection.outlook.com (mail-westus2azon11022095.outbound.protection.outlook.com [52.101.48.95]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 4dv82e84vf-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 30 Apr 2026 10:09:42 -0500 (CDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dcDfJuLmvnJLedUYr9/bWE2imbXMbwBzDFojBOzyOSbZLDKG+np7vLyEquMkSE4I1PrG0hQY1RAGy1NsYKJB4Rqfc/NkwO9wZklnZDit+J1o6sreoVJMCyt+p4ZWKIaaDuK+8dLnT8Q0NJa6CjmQp8VTPDAT1wa2TXJhaRVfYKckcdvOZfhcHayQjIr95sM4rzQyw5xRLiz2/Npt8z7vETrMsfJ+kLuPIpxCGdP3UT+GI8E+llJIbAyw69MdUER4QLnZM2rsPBW9PqsgnTy0z0zPoHJ0ivtCU8vBe78GZfROh9/L7B0qA1qXxKt0wIEKEHNuBuQ04GR4VDisQuzpJg== 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=4Yy0W/1o0S/p6110mJT0vDTXMo1Y9NPa8nz6AJm6LPc=; b=a86ICIlVx1OlU2cmMxZTCDjz494z2xvBbr1eIOQqUaO4Y/hXEIukPpaevThayVj0dqbp2VdlWrnxH4gP/qvpi0jbBOFWAXKDzb9Kl2O/BV0codoKHdaQwlKGyvEKM7VoJ7swD82yfjQBAyXeAq44i4VfLmzj6WX26A9p0CbhBIzFp6X+ltADHORfNVdUZrfDUKFCh/iFMoHNBfTgeWRy/wtblXJnSW/qyEPu51SeVmoqMsbcgJoAzhkqPWN7BAYYWO09NXp590w5VbyZTH7TR+WS8PlQh4HcUbEXyTpSPK/rZFcZk8n0KwFq0nKpk85hVoRNIXOKCOcGHJKGABdsRQ== 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=4Yy0W/1o0S/p6110mJT0vDTXMo1Y9NPa8nz6AJm6LPc=; b=osDqLf9UJjITEcByau3ymia2P3KWaU827XIiFDNb/RM8vZzVzRGMw4v9NYBFQLl+dwmbW/Ui2RDHjZrV4iWEnquGvMSUYlVYOvKe45jQTrhLvhG8aOWXq7F4mFhMbdw2a7Jx9+OIlArFTue9+YEgnop7aJOebyXrqSS9NG5zpvs= Received: from SN7PR04CA0078.namprd04.prod.outlook.com (2603:10b6:806:121::23) by MW4PR19MB7007.namprd19.prod.outlook.com (2603:10b6:303:22d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9870.20; Thu, 30 Apr 2026 15:09:36 +0000 Received: from SA2PEPF00003F64.namprd04.prod.outlook.com (2603:10b6:806:121:cafe::d3) by SN7PR04CA0078.outlook.office365.com (2603:10b6:806:121::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.22 via Frontend Transport; Thu, 30 Apr 2026 15:09:36 +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 SA2PEPF00003F64.mail.protection.outlook.com (10.167.248.39) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9870.22 via Frontend Transport; Thu, 30 Apr 2026 15:09:35 +0000 Received: from ediswmail9.ad.cirrus.com (ediswmail9.ad.cirrus.com [198.61.86.93]) by edirelay1.ad.cirrus.com (Postfix) with ESMTPS id 82E9D406558; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTPSA id 5DAE8822542; Thu, 30 Apr 2026 15:09:34 +0000 (UTC) From: Charles Keepax To: broonie@kernel.org Cc: lgirdwood@gmail.com, yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.dev, peter.ujfalusi@linux.intel.com, niranjan.hy@ti.com, kevin-lu@ti.com, baojun.xu@ti.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH v3 3/3] ASoC: SDCA: Support devices with multiple functions of identical type Date: Thu, 30 Apr 2026 16:09:31 +0100 Message-ID: <20260430150931.2025953-4-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260430150931.2025953-1-ckeepax@opensource.cirrus.com> References: <20260430150931.2025953-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: SA2PEPF00003F64:EE_|MW4PR19MB7007:EE_ X-MS-Office365-Filtering-Correlation-Id: ac793f1a-9f36-4f5d-cf09-08dea6ca7de0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|61400799027|36860700016|82310400026|16102099003|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: GwauI0BXD7l4Cdvf7cjngeBZB41dV+F+2q+PRT6zPMKDsoTjcgrc2ruFWzYOuOqzLHNGQHtpaT6kpOu8W0BHBYjgPDa2ZRSxQqR9anGVLAgaJ//BTBHvTeeb3LtYJ3I5A+L4JlI/DWYuFWZF8j6GtRjvxciJ++7zl9rgOc0dhBtgKJ5RAesLt4cmQy2QWchHIWomcMVrDqojz1i8pRs/hNQZ2G+xZWpkQDB2TIeSVtDm90KzJgBPhm66eMGy9tgyk8oAKrU419vUlw5Kkz+gZ7NsBEVdEItu+IYNEQLdQ6pe7GMLKJvdO8gk6Ln9vD/zO8rYHShpNioVgVBb9fp47/EtW6Pzs7G3IqwTl0DpeMmH3wdWBkHSTVlxyo4LmDFdeKAAlENkuYDkeAYjOppt6kgAzDiZEjeGAs5mFx/ajtBFTbijbrY68vqLNCZlxvL8+r+pauBmw0EZYiAPC4pvJPTi/qLTTIzIHBxLFNKqXF+HnLeqSv618+SJyr7JQS/w+iXcUgdv2Di3BqfZeQXRXaMm+1Bv6Crl2GeA/3dVY7xDXqK1Va/X8mDoN0vFsax7ZMV1Wrorw7p0+uY5PRgF7tgnspnIDiEESFa6MbOhYTEr9+DcXRkB8648GtTRGvYQv6Rsn1QAefho+lsG7me9FbrN8L1XktWjJvzjSnDKj2h+7lAkhTluHYdwa6scgq1yKrFWg3za290ET9/kW8apFgZ8yGROMn79Hw5/6uKaAQMAxN9UHVlS+1T6+XL3SwPoSL0uSuszER+3tV1EQMU/lg== 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)(16102099003)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zM0NQ3wJK0va0OvSJnDy/PEOTyfRLcF+w0RkLa9BqUFBM9qbiSEOKDBmsoC+Ec9gR0DTq7hIhSelsGmiwMX9X5XviQJL0N2ElQDUAb9jncFKwDL+06iDCGm2NMmhX1K7TARFUQrTiI86xKZdJudLgyry+9G/8L+KqKbSTUNenSl+nO9FPAr8WHenRrvV+juS8TVCFpF4ZyUPEbjVSjdsb3LPRQcFL9h9oV/gZplafY8+pDQzc/6iVvu0UNP8AwGFQfxItP95bxSY2rYHveZfnvoybFFTFrHbyvmj6edD776XQHhnS/AtwZNu8CoTkmG9qOSkCBDivvd2VGJX1Wsyy00z2dm9+v2h9vavnz7rQI+a98fZDAIFgaFUWWB5F710Va9B1BmXB5yIhcOzNwrNCXhX/ml2gtzdaxVQ4K1K/R3Avm7s0D8gC0xhZcQ9W+sE X-Exchange-RoutingPolicyChecked: H9b2rFSfq+C/04lguvZTp+jES3c4nO2WqyOGIwFMeOQUV17rSIhebN2J1QZuilxNLP8zI8TMEmCjb0E/15y9aFt7mBdfczFh0gYODIUp4eikFJdIth+qiW53ODNQbq+LBUSUIo9VdS9fB+G5YpjHAQbSQf10IeF54C1y5AuTocNlP+HtnHcQnmymtq8pBuD6qr9HvIAepwP+GD6IVL1DVI7L4oIFgWHPy5apmCticdJmUv8mNEfGQQu6xFdt+RictK1hE++rXl04wJE0SOqBoecWQA024oToRueb5QZEsHKXfpVEBl4jBA+gDM493dvVR8Eb5+5vRkIIBBh2Ajs4Wg== X-OriginatorOrg: opensource.cirrus.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2026 15:09:35.5976 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac793f1a-9f36-4f5d-cf09-08dea6ca7de0 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-SA2PEPF00003F64.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR19MB7007 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDMwMDE1NiBTYWx0ZWRfXzBB25BEtmh6R FgYroKfy06Sep7KxDMABhHfdmTqkSIDfGCoHUwOfeIe08racM6OhEERQCDHyDE0DwQJ/Qb/KwCD URfDckEk3WULes3ywP/hRdAFa8B0TOg6sWXixeL6ZUF545Cv95typLv3izEupjKMik4B0kMKXmz pmBmkw4VP+fmrmUVABmBj60AeOD4Ymx+jGQ/jYgaFLv/A4+9xPE17QtxNpYg5ahKklkBswekuLf /XuLWIAgGXLV/x3Nm7C0t4RL9UcsAbQU0r8rYh4l8q8llcfzeGAo1Z/L7tA81ovq/ykJQpetXk5 RO/1WpzBLkNj6w2yl8UHNxP0HVSg0nrWnrQl6TuTGDtud+NoKv5l2sKAjCe9QllzPuGd1G7FR5K dIshsQw8bJxTnBBAuK1l+hgv7SUQ048DJ/nJxlELiE8gIuyHX10/yjv4cuvqQW9bWwyi7Z09SWP kiRj0LeYp718hBGVNQQ== X-Authority-Analysis: v=2.4 cv=P64KQCAu c=1 sm=1 tr=0 ts=69f370b6 cx=c_pps a=kd6AeByrnEODuFk93iyKgA==:117 a=h1hSm8JtM9GN1ddwPAif2w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=A5OVakUREuEA:10 a=s63m1ICgrNkA:10 a=RWc_ulEos4gA:10 a=VkNPw1HP01LnGYTKEx00:22 a=iX4cTi3TZMoOKdANLEfx:22 a=KfkQE9S9VqCBgivYGm0O:22 a=w1d2syhTAAAA:8 a=uwUvDvqBefo4-HQeGWsA:9 a=O8hF6Hzn-FEA:10 X-Proofpoint-GUID: ViXm3MxcOSY3k0KScQVc7BI3U2bkJ6-B X-Proofpoint-ORIG-GUID: ViXm3MxcOSY3k0KScQVc7BI3U2bkJ6-B X-Proofpoint-Spam-Reason: safe Content-Type: text/plain; charset="utf-8" It is possible that SDCAs devices might have multiple functions of the same type, as the entity names within a function are defined by the specification it is very likely such a device will have duplicate entities. This causes problems where DAIs and ALSA controls end up with clashing names. This can be handled by adding the function address into the names to ensure uniqueness, although, ideally this would have been included from the start. User-space already has UCM using the current control names, so as a compromise the first function of a given type will use the raw entity names, then duplicates will get an added function address. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Charles Keepax --- No changes since v2. include/sound/sdca.h | 4 ++++ sound/soc/sdca/sdca_functions.c | 26 ++++++++++++++++++++++++-- sound/soc/sdca/sdca_interrupts.c | 3 +-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/include/sound/sdca.h b/include/sound/sdca.h index 67ff3c88705d5..2bdf4e333e044 100644 --- a/include/sound/sdca.h +++ b/include/sound/sdca.h @@ -26,6 +26,8 @@ struct sdca_dev; * @name: Human-readable string. * @type: Function topology type. * @adr: ACPI address (used for SDCA register access). + * @duplicate: Internal flag to indicate if other functions of the same ty= pe + * exist. */ struct sdca_function_desc { struct fwnode_handle *node; @@ -33,6 +35,8 @@ struct sdca_function_desc { const char *name; u32 type; u8 adr; + + bool duplicate; }; =20 /** diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_function= s.c index 02abb7315b727..77940bd6b33c9 100644 --- a/sound/soc/sdca/sdca_functions.c +++ b/sound/soc/sdca/sdca_functions.c @@ -98,7 +98,7 @@ static int find_sdca_function(struct acpi_device *adev, v= oid *data) u32 function_type; int function_index; u64 addr; - int ret; + int i, ret; =20 if (sdca_data->num_functions >=3D SDCA_MAX_FUNCTION_COUNT) { dev_err(dev, "maximum number of functions exceeded\n"); @@ -159,6 +159,14 @@ static int find_sdca_function(struct acpi_device *adev= , void *data) =20 /* store results */ function_index =3D sdca_data->num_functions; + + for (i =3D 0; i < function_index; i++) { + if (sdca_data->function[i].type =3D=3D function_type) { + sdca_data->function[function_index].duplicate =3D true; + break; + } + } + sdca_data->function[function_index].adr =3D addr; sdca_data->function[function_index].type =3D function_type; sdca_data->function[function_index].name =3D function_name; @@ -1466,6 +1474,7 @@ static int find_sdca_entity_xu(struct device *dev, } =20 static int find_sdca_entity(struct device *dev, struct sdw_slave *sdw, + struct sdca_function_data *function, struct fwnode_handle *function_node, struct fwnode_handle *entity_node, struct sdca_entity *entity) @@ -1481,6 +1490,13 @@ static int find_sdca_entity(struct device *dev, stru= ct sdw_slave *sdw, return ret; } =20 + if (function->desc->duplicate) { + entity->label =3D devm_kasprintf(dev, GFP_KERNEL, "%d %s", + function->desc->adr, entity->label); + if (!entity->label) + return -ENOMEM; + } + ret =3D fwnode_property_read_u32(entity_node, "mipi-sdca-entity-type", &t= mp); if (ret) { dev_err(dev, "%s: type missing: %d\n", entity->label, ret); @@ -1578,7 +1594,7 @@ static int find_sdca_entities(struct device *dev, str= uct sdw_slave *sdw, return -EINVAL; } =20 - ret =3D find_sdca_entity(dev, sdw, function_node, + ret =3D find_sdca_entity(dev, sdw, function, function_node, entity_node, &entities[i]); fwnode_handle_put(entity_node); if (ret) @@ -1605,8 +1621,14 @@ static struct sdca_entity *find_sdca_entity_by_label= (struct sdca_function_data * const char *entity_label) { struct sdca_entity *entity =3D NULL; + char tmp[64]; int i; =20 + if (function->desc->duplicate) { + snprintf(tmp, sizeof(tmp), "%d %s", function->desc->adr, entity_label); + entity_label =3D tmp; + } + for (i =3D 0; i < function->num_entities; i++) { entity =3D &function->entities[i]; =20 diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interru= pts.c index 6e10b4e660d96..4539a52a8e32b 100644 --- a/sound/soc/sdca/sdca_interrupts.c +++ b/sound/soc/sdca/sdca_interrupts.c @@ -375,8 +375,7 @@ int sdca_irq_data_populate(struct device *dev, struct r= egmap *regmap, if (!dev) return -ENODEV; =20 - name =3D kasprintf(GFP_KERNEL, "%s %s %s", function->desc->name, - entity->label, control->label); + name =3D kasprintf(GFP_KERNEL, "%s %s", entity->label, control->label); if (!name) return -ENOMEM; =20 --=20 2.47.3