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 A9A80143752 for ; Mon, 29 Jul 2024 12:03:04 +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=1722254584; cv=none; b=qs47PkN1iP2KFhr4xVkWzSGi589qNGrdjs2eKVFzGLny0NENIvtGGflrl4CbkQncIovJWsk5HDBNbpJCuOK9qYaSQmuc/gVbUnSI7ej9iu2SvFV3IRdnRpauSlZGbDAyeXKAgLA6ZXJU6EEDTH0YFKYv74+HEZ5q9LA1pAB5ei0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722254584; c=relaxed/simple; bh=SvSTNcEsWtUdaSscemuUWBsXAIEn/rW+VBFSADKhwTw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=uh3vlgTVvoWQ0++qCH3LmrYmto+qWowv0lQHSxE7ZWv9HtqseYowFs/y1kFRwvGX+qPVWPXk8GB/HDc65RLKFFK4VcUqiU9wesQEI6w8Wf128zbvbpl4laWynozktp4/+a3I/jmwnzGxU3P09OlvZpVnYiy98WD45iCaSdT/Eu4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FgMWJrOJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FgMWJrOJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7637C32786; Mon, 29 Jul 2024 12:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722254584; bh=SvSTNcEsWtUdaSscemuUWBsXAIEn/rW+VBFSADKhwTw=; h=Subject:To:Cc:From:Date:From; b=FgMWJrOJgf7VziDyfTJanbdbiSbvbjON55zb5XJwxEhDzKCAm/K+Ck6YQT8Ws4DVC 5j9tuDeKsxv8A+uvfLRYApc6Ons3n9TmLbzCW0TpU/IsU6n0FiHv6nC3y9XgKZK51n Z4sRGQdB4TS6IpiOR68cNvXc5swollRvxJFEgxdk= Subject: FAILED: patch "[PATCH] ALSA: hda/realtek: cs35l41: Fixup remaining asus strix models" failed to apply to 6.6-stable tree To: luke@ljones.dev,stable@vger.kernel.org,tiwai@suse.de Cc: From: Date: Mon, 29 Jul 2024 14:03:00 +0200 Message-ID: <2024072959-wilt-balsamic-2f7d@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x e6e18021ddd0dc5af487fb86b6d7c964e062d692 # git commit -s git send-email --to '' --in-reply-to '2024072959-wilt-balsamic-2f7d@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: e6e18021ddd0 ("ALSA: hda/realtek: cs35l41: Fixup remaining asus strix models") 2be46155d792 ("ALSA: hda/realtek: Adjust G814JZR to use SPI init for amp") 0bfe105018bd ("ALSA: hda/realtek: cs35l41: Support ASUS ROG G634JYR") 24b6332c2d4f ("ALSA: hda: Add Lenovo Legion 7i gen7 sound quirk") b5cb53fd3277 ("ALSA: hda/tas2781: add fixup for Lenovo 14ARB7") ba7053b4b4a4 ("ALSA: hda: Add driver properties for cs35l41 for Lenovo Legion Slim 7 Gen 8 serie") d110858a6925 ("ALSA: hda: cs35l41: Prevent firmware load if SPI speed too low") ee694e7db47e ("ALSA: hda: cs35l41: Support additional Dell models without _DSD") 2b35b66d82dc ("ALSA: hda: cs35l41: Support additional ASUS Zenbook 2023 Models") b257187bcff4 ("ALSA: hda: cs35l41: Support additional ASUS Zenbook 2022 Models") b592ed2e1d78 ("ALSA: hda: cs35l41: Support additional ASUS ROG 2023 models") 8c4c216db8fb ("ALSA: hda: cs35l41: Add config table to support many laptops without _DSD") f01b371b0794 ("ALSA: hda: cs35l41: Use reset label to get GPIO for HP Zbook Fury 17 G9") 447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From e6e18021ddd0dc5af487fb86b6d7c964e062d692 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Tue, 23 Jul 2024 13:12:24 +1200 Subject: [PATCH] ALSA: hda/realtek: cs35l41: Fixup remaining asus strix models Adjust quirks for 0x3a20, 0x3a30, 0x3a50 to match the 0x3a60. This set has now been confirmed to work with this patch. Signed-off-by: Luke D. Jones Fixes: 811dd426a9b1 ("ALSA: hda/realtek: Add quirks for Asus ROG 2024 laptops using CS35L41") Cc: Link: https://patch.msgid.link/20240723011224.115579-1-luke@ljones.dev Signed-off-by: Takashi Iwai diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c3a86a99f8c6..462194bf6954 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10359,10 +10359,10 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1f62, "ASUS UX7602ZM", ALC245_FIXUP_CS35L41_SPI_2), SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), - SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC245_FIXUP_CS35L41_SPI_2), - SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x3a20, "ASUS G614JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), + SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), - SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),