try little bluetooth revert

Author: antheas

handheld.patch

@@ -8268,7 +8268,7 @@ Patchset: surface-typecover
  1 file changed, 98 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 847462650549..eea3fdbe28e9 100644
+index 24da73964763..42c393912645 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -8450,7 +8450,7 @@ index 847462650549..eea3fdbe28e9 100644
  	del_timer_sync(&td->release_timer);
 
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2277,6 +2368,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2290,6 +2381,11 @@ static const struct hid_device_id mt_devices[] = {
  		MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
  			USB_DEVICE_ID_XIROKU_CSR2) },
 
@@ -8494,7 +8494,7 @@ Patchset: surface-typecover
  1 file changed, 122 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index eea3fdbe28e9..382dd01beb82 100644
+index 42c393912645..c44a43db1444 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -77,6 +77,7 @@ MODULE_LICENSE("GPL");
@@ -9999,7 +9999,7 @@ Signed-off-by: Jonathan LoBue <[email protected]>
  1 file changed, 8 insertions(+)
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 660fd984a928..28d64002645b 100644
+index d1d39f4cc942..43be6b94bbc9 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
 @@ -7645,6 +7645,7 @@ enum {
@@ -10023,7 +10023,7 @@ index 660fd984a928..28d64002645b 100644
  	[ALC294_FIXUP_ASUS_ALLY_PINS] = {
  		.type = HDA_FIXUP_PINS,
  		.v.pins = (const struct hda_pintbl[]) {
-@@ -10610,6 +10617,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -10616,6 +10623,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
  	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),
  	SND_PCI_QUIRK(0x1043, 0x17f3, "ROG Ally NR2301L/X", ALC294_FIXUP_ASUS_ALLY),
@@ -10964,10 +10964,10 @@ Subject: HID: Add quirk to ignore the touchscreen battery on OneXPlayer X1
  2 files changed, 3 insertions(+)
 
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 8a991b30e3c6..006c75f80f8a 100644
+index 92cff3f2658c..67ffbecc9114 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -994,6 +994,7 @@
+@@ -996,6 +996,7 @@
  #define USB_VENDOR_ID_NOVATEK		0x0603
  #define USB_DEVICE_ID_NOVATEK_PCT	0x0600
  #define USB_DEVICE_ID_NOVATEK_MOUSE	0x1602
@@ -32042,7 +32042,7 @@ Co-developed-by: linh1987
  1 file changed, 10 insertions(+)
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 28d64002645b..6de3ad58ed63 100644
+index 43be6b94bbc9..0c0456af6c3b 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
 @@ -7526,6 +7526,7 @@ enum {
@@ -32067,15 +32067,15 @@ index 28d64002645b..6de3ad58ed63 100644
  	[ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = {
  		.type = HDA_FIXUP_FUNC,
  		.v.func = alc269_fixup_limit_int_mic_boost,
-@@ -10989,6 +10997,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -11018,6 +11026,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
  	SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),
  	SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),
 +	SND_PCI_QUIRK(0x1f66, 0x0103, "AYANEO AIR 1S", ALC269VB_FIXUP_AYANEO_SPKR_PIN_FIX),
  	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),
  	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),
  	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),
-@@ -11112,6 +11121,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
+@@ -11141,6 +11150,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
  	{.id = ALC269VB_FIXUP_ASUS_ZENBOOK, .name = "asus-zenbook"},
  	{.id = ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A, .name = "asus-zenbook-ux31a"},
  	{.id = ALC269VB_FIXUP_ORDISSIMO_EVE2, .name = "ordissimo"},
@@ -32099,7 +32099,7 @@ Co-developed-by: Bouke Sybren Haarsma <[email protected]>
  1 file changed, 49 insertions(+)
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 6de3ad58ed63..d564f71d0b53 100644
+index 0c0456af6c3b..a7db7ee664cd 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
 @@ -6719,6 +6719,20 @@ static void alc294_gx502_toggle_output(struct hda_codec *codec,
@@ -32178,7 +32178,7 @@ index 6de3ad58ed63..d564f71d0b53 100644
  	[ALC299_FIXUP_PREDATOR_SPK] = {
  		.type = HDA_FIXUP_PINS,
  		.v.pins = (const struct hda_pintbl[]) {
-@@ -10997,6 +11045,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -11026,6 +11074,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
  	SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),
  	SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),
@@ -34264,7 +34264,7 @@ and makes them unable to be called as part of the screen turning off.
 This patch adds a set of callbacks to allow calling the Display On/Off
 notifications outside of the suspend/resume path.
 
-Co-developed-by: Mario Limonciello <[email protected]>
+Co-Developed-by: Mario Limonciello <[email protected]>
 Signed-off-by: Antheas Kapenekakis <[email protected]>
 ---
  include/linux/suspend.h |  2 ++
@@ -34671,6 +34671,8 @@ calls and the term "Screen" for the state ("Screen Off"). Currently,
 the code uses "Screen On/Off" to name the variables, which is about
 to become confusing as they become callbacks. To prepare for that,
 rename the variables to "Display On/Off".
+
+Signed-off-by: Antheas Kapenekakis <[email protected]>
 ---
  drivers/acpi/x86/s2idle.c | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
@@ -34769,7 +34771,7 @@ Subject: acpi/x86: s2idle: call Display On/Off as part of callbacks
 Move the Display On/Off notifications into dedicated callbacks that gate
 the ACPI mutex, so they can be called outside of the suspend path.
 
-Co-developed-by: Mario Limonciello <[email protected]>
+Co-Developed-by: Mario Limonciello <[email protected]>
 Signed-off-by: Antheas Kapenekakis <[email protected]>
 ---
  drivers/acpi/x86/s2idle.c | 67 +++++++++++++++++++++++++++++----------
@@ -68370,18 +68372,18 @@ Signed-off-by: Luke D. Jones <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index d564f71d0b53..b8b10eb53410 100644
+index a7db7ee664cd..48cf7d1f17b6 100644
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -10718,7 +10718,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
+@@ -10724,7 +10724,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
  	SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
  	SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS),
  	SND_PCI_QUIRK(0x1043, 0x1e63, "ASUS H7606W", ALC285_FIXUP_CS35L56_I2C_2),
 -	SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_CS35L56_I2C_2),
 +	SND_PCI_QUIRK(0x1043, 0x1e83, "ASUS GA605W", ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC),
  	SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
+ 	SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C),
  	SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2),
- 	SND_PCI_QUIRK(0x1043, 0x1ee2, "ASUS UM6702RA/RC", ALC287_FIXUP_CS35L41_I2C_2),
 -- 
 2.47.0
 
@@ -68498,3 +68500,36 @@ index 9d6139a24982..9d886bded108 100644
 -- 
 2.47.0
 
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Antheas Kapenekakis <[email protected]>
+Date: Tue, 19 Nov 2024 21:27:17 +0100
+Subject: Revert "Bluetooth: btusb: Don't fail external suspend requests"
+
+This reverts commit e63125eec47dcc169cf62a2a56448bec92a0a271.
+
+Might be causing issues with hibernation on the Ally.
+---
+ drivers/bluetooth/btusb.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 9d886bded108..e6f23692c9d6 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -4127,10 +4127,8 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
+ 
+ 	BT_DBG("intf %p", intf);
+ 
+-	/* Don't auto-suspend if there are connections; external suspend calls
+-	 * shall never fail.
+-	 */
+-	if (PMSG_IS_AUTO(message) && hci_conn_count(data->hdev))
++	/* Don't suspend if there are connections */
++	if (hci_conn_count(data->hdev))
+ 		return -EBUSY;
+ 
+ 	if (data->suspend_count++)
+-- 
+2.47.0
+

kernel.spec

@@ -170,7 +170,7 @@ Summary: The Linux kernel
 # This is needed to do merge window version magic
 %define patchlevel 11
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 305%{?buildid}%{?dist}
+%define specrelease 301%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.11.9