From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A11A01DF98A; Sun, 24 Nov 2024 13:47:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456036; cv=none; b=sUYyOxT14FZs/jT1urNkaQctBveF2ffK5wTEuydat4lLOvbPQmx07OHQ5DwZxm5hAkROmrlZglnXiogmdAItzd5nEmR0KLDKFlhQnMROv/6waqCyDJH9elpJJ7XWWivEfj/Jcv2coL/vgvhXHrnjyoW6yqTHY096MLh0RKy7UKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456036; c=relaxed/simple; bh=Bg7KxdvCN2lOwgIQF2+y4+nRzi5FSz6uNeLv2O9w56c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uP+lugQ/9PYuU0MATxnZssu104nA9wIMnjPUnEmvateZX+HgFsT3CLVBaw+bM+Ys4tFlreKraN0SUi5gE2UKuY3ydcUrc5dSGMTw+gYoAbxlfZTYEm2TvK6QSz13BhMqef9QniLOCNuk4D4SGIy6YdbmqU4XEvys0TiHDh9o0M4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jAFhf4E5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jAFhf4E5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B489C4CECC; Sun, 24 Nov 2024 13:47:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456036; bh=Bg7KxdvCN2lOwgIQF2+y4+nRzi5FSz6uNeLv2O9w56c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAFhf4E57YxuxD0sxwWlIaDlnxlYtq0oqngtGmBU53BZhu7b4VbHIWcpunBQdSsXn KSXtBcmo69fOgyaS/BHmczaavnLwZWiv+z7c4fbfXHCnUklbLcYP6SzIPEv0vhsLok CKI0Rk0itU96azkmUd2fPdcQy6Zppb5tC+J8HNVgC6gHkGC0hTSIsFaKNrmB3eODZ8 kRhPJ2a2OdUC5265oexuEpD9x4Kj6JsakbbuXw/owVmkVuk4t+KEs3QOW3iM5TH51a RBb5psT4aB/GbYbm9QKWPmf1WuLddf/QL/ZjB2pGQdx9HMG95XX6UJJQeY/U3/XS0m v3sNEUy5Le0Kg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, bo.liu@senarytech.com, kovalev@altlinux.org, cs@tuxedo.de, me@oldherl.one, jaroslaw.janik@gmail.com, songxiebing@kylinos.cn, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 13/61] ALSA: hda/conexant: Use the new codec SSID matching Date: Sun, 24 Nov 2024 08:44:48 -0500 Message-ID: <20241124134637.3346391-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124134637.3346391-1-sashal@kernel.org> References: <20241124134637.3346391-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.63 Content-Transfer-Encoding: 8bit From: Takashi Iwai [ Upstream commit 1f55e3699fc9ced72400cdca39fe248bf2b288a2 ] Now we can perform the codec ID matching primarily, and reduce the conditional application of the quirk for conflicting PCI SSID between System76 and Tuxedo devices. Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20241008120233.7154-3-tiwai@suse.de Signed-off-by: Sasha Levin --- sound/pci/hda/patch_conexant.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5cd3589153b6d..b3208b068dd80 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -832,23 +832,6 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = { {} }; -/* pincfg quirk for Tuxedo Sirius; - * unfortunately the (PCI) SSID conflicts with System76 Pangolin pang14, - * which has incompatible pin setup, so we check the codec SSID (luckily - * different one!) and conditionally apply the quirk here - */ -static void cxt_fixup_sirius_top_speaker(struct hda_codec *codec, - const struct hda_fixup *fix, - int action) -{ - /* ignore for incorrectly picked-up pang14 */ - if (codec->core.subsystem_id == 0x278212b3) - return; - /* set up the top speaker pin */ - if (action == HDA_FIXUP_ACT_PRE_PROBE) - snd_hda_codec_set_pincfg(codec, 0x1d, 0x82170111); -} - static const struct hda_fixup cxt_fixups[] = { [CXT_PINCFG_LENOVO_X200] = { .type = HDA_FIXUP_PINS, @@ -1013,8 +996,11 @@ static const struct hda_fixup cxt_fixups[] = { .v.pins = cxt_pincfg_sws_js201d, }, [CXT_PINCFG_TOP_SPEAKER] = { - .type = HDA_FIXUP_FUNC, - .v.func = cxt_fixup_sirius_top_speaker, + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x1d, 0x82170111 }, + { } + }, }, }; @@ -1113,8 +1099,8 @@ static const struct hda_quirk cxt5066_fixups[] = { SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI), SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205), - SND_PCI_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER), - SND_PCI_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER), + HDA_CODEC_QUIRK(0x2782, 0x12c3, "Sirius Gen1", CXT_PINCFG_TOP_SPEAKER), + HDA_CODEC_QUIRK(0x2782, 0x12c5, "Sirius Gen2", CXT_PINCFG_TOP_SPEAKER), {} }; -- 2.43.0