From e3a9f38c221404f9498b6df7be6a948df43e503b Mon Sep 17 00:00:00 2001 From: ferreo Date: Fri, 3 Jan 2025 16:45:44 +0100 Subject: [PATCH] Update patches/asus2.patch --- patches/asus2.patch | 246 ++++++++++++++++++++++++++------------------ 1 file changed, 145 insertions(+), 101 deletions(-) diff --git a/patches/asus2.patch b/patches/asus2.patch index 2e4f9e8..23cdb82 100644 --- a/patches/asus2.patch +++ b/patches/asus2.patch @@ -1,7 +1,7 @@ -From cf8d850a74509570e2b28dd7d499bf9694952c5e Mon Sep 17 00:00:00 2001 +From 66a2ab4a176b432d441e7d90d620f6594de89e43 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 7 Jun 2024 15:58:01 +1200 -Subject: [PATCH 01/26] Input: xpad - add support for ASUS ROG RAIKIRI PRO +Subject: [PATCH 01/27] Input: xpad - add support for ASUS ROG RAIKIRI PRO Add the VID/PID for ASUS ROG RAIKIRI PRO to xpad_device and the VID to xpad_table. @@ -12,10 +12,10 @@ Signed-off-by: Luke D. Jones 1 file changed, 1 insertion(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 92cff3f2658c..44c54419d93c 100644 +index 0f23be98c56e..1b92729bd378 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -209,6 +209,7 @@ +@@ -210,6 +210,7 @@ #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2 0x19b6 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3 0x1a30 #define USB_DEVICE_ID_ASUSTEK_ROG_Z13_LIGHTBAR 0x18c6 @@ -24,13 +24,13 @@ index 92cff3f2658c..44c54419d93c 100644 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY_X 0x1b4c #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD 0x196b -- -2.47.0 +2.47.1 -From 2c8ad48572a09c8f6ce590fdfbd61b5f56535836 Mon Sep 17 00:00:00 2001 +From 65991d72695e279390b0e68af59b852a2b5c6259 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 24 May 2024 10:54:36 +1200 -Subject: [PATCH 02/26] platform/x86: asus-wmi: don't fail if platform_profile +Subject: [PATCH 02/27] platform/x86: asus-wmi: don't fail if platform_profile already registered On some newer laptops it appears that an AMD driver can register a @@ -48,10 +48,10 @@ Signed-off-by: Luke D. Jones 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 89f5f44857d5..9fb3db881b3b 100644 +index 1101e5b2488e..293ecd228a5a 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c -@@ -4776,7 +4776,7 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -4769,7 +4769,7 @@ static int asus_wmi_add(struct platform_device *pdev) goto fail_fan_boost_mode; err = platform_profile_setup(asus); @@ -61,13 +61,13 @@ index 89f5f44857d5..9fb3db881b3b 100644 err = asus_wmi_sysfs_init(asus->platform_device); -- -2.47.0 +2.47.1 -From 9fa5363b6cd88b0c008c91223ddba52bd947d498 Mon Sep 17 00:00:00 2001 +From 0da9e8de9be25f4e922fb24c44dc280721e42413 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 1 Sep 2024 14:30:37 +1200 -Subject: [PATCH 03/26] platform/x86: asus-wmi: Refactor Ally suspend/resume +Subject: [PATCH 03/27] platform/x86: asus-wmi: Refactor Ally suspend/resume The CSEE method from ACPI is now called only on module load. This fixes an issues with USB device loss on Ally 1 after reboot. @@ -89,7 +89,7 @@ Signed-off-by: Luke D. Jones 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 9fb3db881b3b..2bfcd5e6da18 100644 +index 293ecd228a5a..acd0ec1d9aae 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -142,16 +142,20 @@ module_param(fnlock_default, bool, 0444); @@ -136,7 +136,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 /* WMI ************************************************************************/ static int asus_wmi_evaluate_method3(u32 method_id, -@@ -4736,6 +4739,17 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -4729,6 +4732,17 @@ static int asus_wmi_add(struct platform_device *pdev) if (err) goto fail_platform; @@ -154,7 +154,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 /* ensure defaults for tunables */ asus->ppt_pl2_sppt = 5; asus->ppt_pl1_spl = 5; -@@ -4748,8 +4762,6 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -4741,8 +4755,6 @@ static int asus_wmi_add(struct platform_device *pdev) asus->egpu_enable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_EGPU); asus->dgpu_disable_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_DGPU); asus->kbd_rgb_state_available = asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_TUF_RGB_STATE); @@ -163,7 +163,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_MINI_LED_MODE)) asus->mini_led_dev_id = ASUS_WMI_DEVID_MINI_LED_MODE; -@@ -4940,34 +4952,6 @@ static int asus_hotk_resume(struct device *device) +@@ -4933,34 +4945,6 @@ static int asus_hotk_resume(struct device *device) return 0; } @@ -198,7 +198,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 static int asus_hotk_restore(struct device *device) { struct asus_wmi *asus = dev_get_drvdata(device); -@@ -5008,11 +4992,32 @@ static int asus_hotk_restore(struct device *device) +@@ -5001,11 +4985,32 @@ static int asus_hotk_restore(struct device *device) return 0; } @@ -232,7 +232,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 .prepare = asus_hotk_prepare, }; -@@ -5040,6 +5045,10 @@ static int asus_wmi_probe(struct platform_device *pdev) +@@ -5033,6 +5038,10 @@ static int asus_wmi_probe(struct platform_device *pdev) return ret; } @@ -243,7 +243,7 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 return asus_wmi_add(pdev); } -@@ -5072,6 +5081,7 @@ EXPORT_SYMBOL_GPL(asus_wmi_register_driver); +@@ -5065,6 +5074,7 @@ EXPORT_SYMBOL_GPL(asus_wmi_register_driver); void asus_wmi_unregister_driver(struct asus_wmi_driver *driver) { @@ -252,13 +252,13 @@ index 9fb3db881b3b..2bfcd5e6da18 100644 platform_driver_unregister(&driver->platform_driver); used = false; -- -2.47.0 +2.47.1 -From c16ae0306ceb954c5016d81a26c96c3ad6667cf1 Mon Sep 17 00:00:00 2001 +From d15ffbaf86af112d09cc553feed43605387be83d Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 22 Sep 2024 21:40:46 +1200 -Subject: [PATCH 04/26] platform/x86: asus-wmi: export symbols used for +Subject: [PATCH 04/27] platform/x86: asus-wmi: export symbols used for read/write WMI Export some rather helpful read/write WMI symbols using a namespace. @@ -274,7 +274,7 @@ Reviewed-by: Mario Limonciello 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 2bfcd5e6da18..da425020a939 100644 +index acd0ec1d9aae..6da2c7715a9f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -388,7 +388,7 @@ int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, u32 *retval) @@ -363,13 +363,13 @@ index 365e119bebaa..6ea4dedfb85e 100644 u32 *retval) { -- -2.47.0 +2.47.1 -From 26b7a88ece41904ad7f78cf8f3e4804326070971 Mon Sep 17 00:00:00 2001 +From b4c17bb1855a52dda5f324b5a26308adc20a3429 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 21 Sep 2024 16:04:58 +1200 -Subject: [PATCH 05/26] hid-asus: Add MODULE_IMPORT_NS(ASUS_WMI) +Subject: [PATCH 05/27] hid-asus: Add MODULE_IMPORT_NS(ASUS_WMI) A small change to asus_wmi_evaluate_method() was introduced during asus-armoury driver development to put the exports behind a namespace. @@ -393,13 +393,13 @@ index a4b47319ad8e..9540e3e19cce 100644 +MODULE_IMPORT_NS(ASUS_WMI); MODULE_LICENSE("GPL"); -- -2.47.0 +2.47.1 -From 8a1c80b9ee9562de280da81db877dd2a1e74e2a3 Mon Sep 17 00:00:00 2001 +From 0a53978ad2c616b7adf33f8f7fdda776a5a0a57c Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 22 Sep 2024 21:39:43 +1200 -Subject: [PATCH 06/26] platform/x86: asus-armoury: move existing tunings to +Subject: [PATCH 06/27] platform/x86: asus-armoury: move existing tunings to asus-armoury module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -1210,7 +1210,7 @@ index 000000000000..b00d829c9da0 + +#endif /* _ASUS_BIOSCFG_H_ */ diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index da425020a939..74111d0680f8 100644 +index 6da2c7715a9f..525629097b9f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -55,8 +55,6 @@ module_param(fnlock_default, bool, 0444); @@ -1246,13 +1246,13 @@ index 6ea4dedfb85e..21313e1eb6c9 100644 #define ASUS_WMI_METHODID_SPEC 0x43455053 /* BIOS SPECification */ #define ASUS_WMI_METHODID_SFBD 0x44424653 /* Set First Boot Device */ -- -2.47.0 +2.47.1 -From feb5f3eb7f4418d5c948be938d0fdf24b1a896ef Mon Sep 17 00:00:00 2001 +From 0f43ec1f59df37f227a9eaac231326e09be4fe3e Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 19 Sep 2024 17:23:35 +1200 -Subject: [PATCH 07/26] platform/x86: asus-armoury: add panel_hd_mode attribute +Subject: [PATCH 07/27] platform/x86: asus-armoury: add panel_hd_mode attribute Add panel_hd_mode to toggle the panel mode between single and high definition modes. @@ -1308,13 +1308,13 @@ index 21313e1eb6c9..a6064995c2cc 100644 #define ASUS_WMI_DEVID_CAMERA 0x00060013 #define ASUS_WMI_DEVID_LID_FLIP 0x00060062 -- -2.47.0 +2.47.1 -From 0e97d4c5c0e26c4f7495f0d1e95c7a63e1ed31eb Mon Sep 17 00:00:00 2001 +From 8066b15e1f48352e674c29927def1c1fa3c5b48d Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 19 Sep 2024 17:19:37 +1200 -Subject: [PATCH 08/26] platform/x86: asus-armoury: add the ppt_* and nv_* +Subject: [PATCH 08/27] platform/x86: asus-armoury: add the ppt_* and nv_* tuning knobs Adds the ppt_* and nv_* tuning knobs that are available via WMI methods @@ -1589,13 +1589,13 @@ index b00d829c9da0..91ec6f4cb149 100644 + #endif /* _ASUS_BIOSCFG_H_ */ -- -2.47.0 +2.47.1 -From a3f3f35cbba03febc47c2872d805c876a7591c56 Mon Sep 17 00:00:00 2001 +From cd0478042eb3c5b861ad94b80c93e63f7233f1a7 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 2 Jun 2024 14:32:15 +1200 -Subject: [PATCH 09/26] platform/x86: asus-armoury: add dgpu tgp control +Subject: [PATCH 09/27] platform/x86: asus-armoury: add dgpu tgp control Implement the dgpu TGP control under the asus-armoury module using the fw_attributes class. @@ -1719,13 +1719,13 @@ index a6064995c2cc..8c755799eb60 100644 #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 #define ASUS_WMI_DEVID_GPU_MUX_VIVO 0x00090026 -- -2.47.0 +2.47.1 -From 0679f313756a1c0b799bb447f5b7b85ad9ffa887 Mon Sep 17 00:00:00 2001 +From 6e5bc568440a4f46c1f3ad5c658177e5def0c71b Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 2 Jun 2024 14:44:31 +1200 -Subject: [PATCH 10/26] platform/x86: asus-armoury: add apu-mem control support +Subject: [PATCH 10/27] platform/x86: asus-armoury: add apu-mem control support Implement the APU memory size control under the asus-armoury module using the fw_attributes class. @@ -1885,13 +1885,13 @@ index 8c755799eb60..88bf250dc8ca 100644 /* gpu mux switch, 0 = dGPU, 1 = Optimus */ #define ASUS_WMI_DEVID_GPU_MUX 0x00090016 -- -2.47.0 +2.47.1 -From 62df032fe8377d97cff483b37ec721862a501529 Mon Sep 17 00:00:00 2001 +From 700829ff413e3ae984b97e78043abeddf924ebb9 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 18 Sep 2024 21:19:12 +1200 -Subject: [PATCH 11/26] platform/x86: asus-armoury: add core count control +Subject: [PATCH 11/27] platform/x86: asus-armoury: add core count control Implement Intel core enablement under the asus-armoury module using the fw_attributes class. @@ -2234,13 +2234,13 @@ index 88bf250dc8ca..cc21e4272460 100644 #define ASUS_WMI_DEVID_DGPU_SET_TGP 0x00120098 #define ASUS_WMI_DEVID_APU_MEM 0x000600C1 -- -2.47.0 +2.47.1 -From 1f391b4c5eb9e8f1f18733f20b63495fc95be2d7 Mon Sep 17 00:00:00 2001 +From f199d8a6671304cdad1bc64e8616fa816518e413 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Mon, 3 Jun 2024 12:04:41 +1200 -Subject: [PATCH 12/26] platform/x86: asus-wmi: deprecate bios features +Subject: [PATCH 12/27] platform/x86: asus-wmi: deprecate bios features With the existence of the asus-armoury module the attributes no-longer need to live under the /sys/devices/platform/asus-nb-wmi/ path. @@ -2417,7 +2417,7 @@ index 80ec8b45022d..d0fc68d93f48 100644 tristate "Asus Notebook WMI Driver" depends on ASUS_WMI diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 74111d0680f8..2776a152fad9 100644 +index 525629097b9f..d4981e08f44f 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -286,11 +286,12 @@ struct asus_wmi { @@ -2737,7 +2737,7 @@ index 74111d0680f8..2776a152fad9 100644 /* Quirks *********************************************************************/ -@@ -3814,6 +3877,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) +@@ -3807,6 +3870,7 @@ static int throttle_thermal_policy_switch_next(struct asus_wmi *asus) return 0; } @@ -2745,7 +2745,7 @@ index 74111d0680f8..2776a152fad9 100644 static ssize_t throttle_thermal_policy_show(struct device *dev, struct device_attribute *attr, char *buf) { -@@ -3857,6 +3921,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, +@@ -3850,6 +3914,7 @@ static ssize_t throttle_thermal_policy_store(struct device *dev, * Throttle thermal policy: 0 - default, 1 - overboost, 2 - silent */ static DEVICE_ATTR_RW(throttle_thermal_policy); @@ -2753,7 +2753,7 @@ index 74111d0680f8..2776a152fad9 100644 /* Platform profile ***********************************************************/ static int asus_wmi_platform_profile_get(struct platform_profile_handler *pprof, -@@ -4454,27 +4519,29 @@ static struct attribute *platform_attributes[] = { +@@ -4447,27 +4512,29 @@ static struct attribute *platform_attributes[] = { &dev_attr_camera.attr, &dev_attr_cardr.attr, &dev_attr_touchpad.attr, @@ -2801,7 +2801,7 @@ index 74111d0680f8..2776a152fad9 100644 NULL }; -@@ -4496,7 +4563,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, +@@ -4489,7 +4556,11 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, devid = ASUS_WMI_DEVID_LID_RESUME; else if (attr == &dev_attr_als_enable.attr) devid = ASUS_WMI_DEVID_ALS_ENABLE; @@ -2814,7 +2814,7 @@ index 74111d0680f8..2776a152fad9 100644 devid = ASUS_WMI_DEVID_CHARGE_MODE; else if (attr == &dev_attr_egpu_enable.attr) ok = asus->egpu_enable_available; -@@ -4534,6 +4605,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, +@@ -4527,6 +4598,7 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj, ok = asus->mini_led_dev_id != 0; else if (attr == &dev_attr_available_mini_led_mode.attr) ok = asus->mini_led_dev_id != 0; @@ -2822,7 +2822,7 @@ index 74111d0680f8..2776a152fad9 100644 if (devid != -1) { ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0); -@@ -4785,6 +4857,7 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -4778,6 +4850,7 @@ static int asus_wmi_add(struct platform_device *pdev) } /* ensure defaults for tunables */ @@ -2830,7 +2830,7 @@ index 74111d0680f8..2776a152fad9 100644 asus->ppt_pl2_sppt = 5; asus->ppt_pl1_spl = 5; asus->ppt_apu_sppt = 5; -@@ -4806,17 +4879,18 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -4799,17 +4872,18 @@ static int asus_wmi_add(struct platform_device *pdev) asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX; else if (asus_wmi_dev_is_present(asus, ASUS_WMI_DEVID_GPU_MUX_VIVO)) asus->gpu_mux_dev = ASUS_WMI_DEVID_GPU_MUX_VIVO; @@ -2855,13 +2855,13 @@ index 74111d0680f8..2776a152fad9 100644 if (err) goto fail_fan_boost_mode; -- -2.47.0 +2.47.1 -From a959760e08934e6f93f74907423a8b162efdb41b Mon Sep 17 00:00:00 2001 +From 6d1521d36a9e675b28b6810a7472c9592f769718 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 10 Oct 2024 09:52:45 +1300 -Subject: [PATCH 13/26] ALSA: hda/realtek: fixup ASUS GA605W +Subject: [PATCH 13/27] ALSA: hda/realtek: fixup ASUS GA605W The GA605W laptop has almost the exact same codec setup as the GA403 and so the same quirks apply to it. @@ -2872,10 +2872,10 @@ Signed-off-by: Luke D. Jones 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 18e6779a83be..c73982b07969 100644 +index 973671e0cdb0..bfb3e95ccfaf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -10682,6 +10682,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -10603,6 +10603,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1e1f, "ASUS Vivobook 15 X1504VAP", ALC2XX_FIXUP_HEADSET_MIC), 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), @@ -2885,13 +2885,13 @@ index 18e6779a83be..c73982b07969 100644 SND_PCI_QUIRK(0x1043, 0x1eb3, "ASUS Ally RCLA72", ALC287_FIXUP_TAS2781_I2C), SND_PCI_QUIRK(0x1043, 0x1ed3, "ASUS HN7306W", ALC287_FIXUP_CS35L41_I2C_2), -- -2.47.0 +2.47.1 -From df9f13ec6573b6ed815e85220e7824d1b4cc68d7 Mon Sep 17 00:00:00 2001 +From 630e1c62a634a74b68ac1d6bcf8e5bcb5fc1a822 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Mon, 26 Aug 2024 12:49:35 +1200 -Subject: [PATCH 14/26] hid-asus-ally: Add joystick LED ring support +Subject: [PATCH 14/27] hid-asus-ally: Add joystick LED ring support Adds basic support for the joystick RGB LED rings as a multicolour LED device with 4 LEDs. @@ -3669,13 +3669,13 @@ index 9540e3e19cce..7c5269cd4d76 100644 USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD), QUIRK_ROG_CLAYMORE_II_KEYBOARD }, -- -2.47.0 +2.47.1 -From ec3b9cd614ef942a8b692e97ff47c0f425cf4e69 Mon Sep 17 00:00:00 2001 +From 38832529751a0d5abaf4464a0117b4fb2899effa Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 2 Oct 2024 23:32:46 +1300 -Subject: [PATCH 15/26] hid-asus-ally: initial Ally-X gamepad +Subject: [PATCH 15/27] hid-asus-ally: initial Ally-X gamepad Signed-off-by: Luke D. Jones --- @@ -4156,13 +4156,13 @@ index eb8617c80c2a..458d02996bca 100644 + struct device_attribute dev_attr_##_name = \ + __ATTR(_sysfs_name, 0644, _name##_show, _name##_store) -- -2.47.0 +2.47.1 -From d5e99db6992fa434d6de8db5a21c1d7eaf620f73 Mon Sep 17 00:00:00 2001 +From 104603cbab4cce4ba09d11d3776920a4e6bc716c Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 2 Oct 2024 23:51:36 +1300 -Subject: [PATCH 16/26] hid-asus-ally: initial gamepad configuration +Subject: [PATCH 16/27] hid-asus-ally: initial gamepad configuration Signed-off-by: Luke D. Jones --- @@ -4568,13 +4568,13 @@ index 458d02996bca..2b298ad4da0e 100644 #define ALLY_DEVICE_ATTR_RW(_name, _sysfs_name) \ struct device_attribute dev_attr_##_name = \ -- -2.47.0 +2.47.1 -From 4a0fc7456e163c4194f110cd59ef7399b6a80a50 Mon Sep 17 00:00:00 2001 +From 165dc43b72d144782a62290b389fce5819169847 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 5 Oct 2024 14:58:33 +1300 -Subject: [PATCH 17/26] hid-asus-ally: add button remap attributes +Subject: [PATCH 17/27] hid-asus-ally: add button remap attributes Signed-off-by: Luke D. Jones --- @@ -5266,13 +5266,13 @@ index 2b298ad4da0e..127db570a827 100644 + ALLY_DEVICE_ATTR_RW(btn_mapping_##_fname##_macro, macro_remap); \ + ALLY_BTN_ATTRS_GROUP(btn_##_fname, btn_mapping_##_fname) -- -2.47.0 +2.47.1 -From ada1f9e9c7ff4ae09bb7710294991cce42a3f897 Mon Sep 17 00:00:00 2001 +From fd95feedfc41a2aec2ca2dba52fec8254a9bc501 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 25 Oct 2024 08:56:54 +0200 -Subject: [PATCH 18/26] hid-asus-ally: add gamepad mode selection +Subject: [PATCH 18/27] hid-asus-ally: add gamepad mode selection --- drivers/hid/hid-asus-ally.c | 73 +++++++++++++++++++++++++++++++++++++ @@ -5387,13 +5387,13 @@ index 127db570a827..caec424c52e3 100644 xpad_cmd_len_leds = 0x0C, }; -- -2.47.0 +2.47.1 -From 0a7ad66ff8d362b5c1b9b5dcf9faba562da746a1 Mon Sep 17 00:00:00 2001 +From fc9b88f3382162a9fe6ec9f221ac762b27d548e0 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 5 Oct 2024 15:40:09 +1300 -Subject: [PATCH 19/26] hid-asus-ally: Turbo settings for buttons +Subject: [PATCH 19/27] hid-asus-ally: Turbo settings for buttons Signed-off-by: Luke D. Jones --- @@ -5607,13 +5607,13 @@ index caec424c52e3..4e60e4c8f6d9 100644 + ALLY_DEVICE_ATTR_RW(btn_mapping_##_fname##_turbo, turbo); \ + ALLY_BTN_ATTRS_GROUP_WITH_TURBO(btn_##_fname, btn_mapping_##_fname) -- -2.47.0 +2.47.1 -From e5d5045168db7a9f8f0a1421f24548f81804b015 Mon Sep 17 00:00:00 2001 +From dccdc1d80c57aa05d88ab2a06244f7c8ac509e03 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 5 Oct 2024 20:46:00 +1300 -Subject: [PATCH 20/26] hid-asus-ally: add vibration intensity settings +Subject: [PATCH 20/27] hid-asus-ally: add vibration intensity settings Signed-off-by: Luke D. Jones --- @@ -5778,13 +5778,13 @@ index 4e60e4c8f6d9..eea4696850fa 100644 #define ALLY_BTN_SHOW(_fname, _btn_name, _secondary) \ static ssize_t _fname##_show(struct device *dev, \ -- -2.47.0 +2.47.1 -From a81af2224afe629c1142d19f8b8f5805c503a06f Mon Sep 17 00:00:00 2001 +From 9a27e314332661084ebb2ef819bee1d205fe0f3d Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 5 Oct 2024 21:32:41 +1300 -Subject: [PATCH 21/26] hid-asus-ally: add JS deadzones +Subject: [PATCH 21/27] hid-asus-ally: add JS deadzones Signed-off-by: Luke D. Jones --- @@ -5987,13 +5987,13 @@ index eea4696850fa..76ba5fcd593a 100644 static struct attribute *_fname##_attrs[] = { \ &dev_attr_##_fname.attr, \ -- -2.47.0 +2.47.1 -From 7abfac6b05cbfe9f32fee917c34650d51f661b99 Mon Sep 17 00:00:00 2001 +From 1d825d14c04e872369d9418beb2c5c9225f8af4c Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 5 Oct 2024 21:37:27 +1300 -Subject: [PATCH 22/26] hid-asus-ally: add trigger deadzones +Subject: [PATCH 22/27] hid-asus-ally: add trigger deadzones Signed-off-by: Luke D. Jones --- @@ -6104,13 +6104,13 @@ index 76ba5fcd593a..f103b5ecff36 100644 xpad_cmd_set_leds = 0x08, xpad_cmd_check_ready = 0x0A, -- -2.47.0 +2.47.1 -From 15c0b16e4b1dbd256950366f706fc52773a04640 Mon Sep 17 00:00:00 2001 +From ba3ecac043234bc54f2a2296f1884ae37b3af2cf Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 6 Oct 2024 19:49:24 +1300 -Subject: [PATCH 23/26] hid-asus-ally: add anti-deadzones +Subject: [PATCH 23/27] hid-asus-ally: add anti-deadzones Signed-off-by: Luke D. Jones --- @@ -6289,13 +6289,13 @@ index f103b5ecff36..9c13de73749c 100644 /* Values correspond to the actual HID byte value required */ -- -2.47.0 +2.47.1 -From df4a508ee2550657b2903cce32d515df722b6cfe Mon Sep 17 00:00:00 2001 +From 104a4ed73a1e93728a31776c56c5cc6108347068 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sun, 6 Oct 2024 21:22:40 +1300 -Subject: [PATCH 24/26] hid-asus-ally: add JS response curves +Subject: [PATCH 24/27] hid-asus-ally: add JS response curves Signed-off-by: Luke D. Jones --- @@ -6529,13 +6529,13 @@ index 9c13de73749c..518d8db3af5e 100644 static struct attribute *_fname##_attrs[] = { \ &dev_attr_##_fname.attr, \ -- -2.47.0 +2.47.1 -From fb71dcd5e7083bfae98750a2753cf94f7cf4a6f5 Mon Sep 17 00:00:00 2001 +From dfd576d639ef514857a6672615d83ad89a70dbf4 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Thu, 10 Oct 2024 11:15:36 +1300 -Subject: [PATCH 25/26] hid-asus-ally: add calibrations (wip) +Subject: [PATCH 25/27] hid-asus-ally: add calibrations (wip) Signed-off-by: Luke D. Jones --- @@ -6677,13 +6677,13 @@ index 4d9954362625..03603695c484 100644 ally_cfg->vibration_intensity[0] = 0x64; ally_cfg->vibration_intensity[1] = 0x64; -- -2.47.0 +2.47.1 -From c6dafe7bc6ca6f0b9e0a1384f11cfb7fb3c5de4e Mon Sep 17 00:00:00 2001 +From 61a794cdbe346387f73238f62ebdc6e778cd44dd Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 6 Nov 2024 00:27:03 +0300 -Subject: [PATCH 26/26] debug by default +Subject: [PATCH 26/27] debug by default --- drivers/hid/hid-asus-ally.c | 2 ++ @@ -6717,5 +6717,49 @@ index 69e79446c411..fb4ae804521d 100644 #define ASUS_MINI_LED_MODE_MASK 0x03 -- -2.47.0 +2.47.1 + + +From ddf01b6d179acae59c0eff5a23823b0723681d07 Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" +Date: Tue, 17 Dec 2024 09:31:08 +1300 +Subject: [PATCH 27/27] Tmp: add GA605W & H7606W to AMD-PMF quirks. + +This will not be submitted upstream as the entire +quirk system is being removed in 6.14 kernel. + +Signed-off-by: Luke D. Jones +--- + drivers/platform/x86/amd/pmf/pmf-quirks.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/drivers/platform/x86/amd/pmf/pmf-quirks.c b/drivers/platform/x86/amd/pmf/pmf-quirks.c +index 7cde5733b9ca..02b9d0b49092 100644 +--- a/drivers/platform/x86/amd/pmf/pmf-quirks.c ++++ b/drivers/platform/x86/amd/pmf/pmf-quirks.c +@@ -29,6 +29,22 @@ static const struct dmi_system_id fwbug_list[] = { + }, + .driver_data = &quirk_no_sps_bug, + }, ++ { ++ .ident = "ROG Zephyrus G16", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA605W"), ++ }, ++ .driver_data = &quirk_no_sps_bug, ++ }, ++ { ++ .ident = "ProArt P16", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "H7606W"), ++ }, ++ .driver_data = &quirk_no_sps_bug, ++ }, + { + .ident = "ROG Ally X", + .matches = { +-- +2.47.1