diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-12-11 11:22:02 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-12-11 11:22:02 +0100 |
| commit | 23e652467d2d5b21a76083b317841b54769ee48c (patch) | |
| tree | cf85ef0c45bc7961bf7e507631a509514655c317 /include/linux/platform_data | |
| parent | 682b43a049c898d060bb1bd7af4cac0d91b3594d (diff) | |
| parent | 3494a594315b56516988afb6854d75dee5b501db (diff) | |
| download | linux-stable-23e652467d2d5b21a76083b317841b54769ee48c.tar.gz linux-stable-23e652467d2d5b21a76083b317841b54769ee48c.tar.bz2 linux-stable-23e652467d2d5b21a76083b317841b54769ee48c.zip | |
Merge tag 'platform-drivers-x86-v6.7-3' into pdx86/for-next
Back merge pdx86 fixes into pdx86/for-next for further WMI work
depending on some of the fixes.
platform-drivers-x86 for v6.7-3
Highlights:
- asus-wmi: Solve i8042 filter resource handling, input, and
suspend issues
- wmi: Skip zero instance WMI blocks to avoid issues with
some laptops
- mlxbf-bootctl: Differentiate dev/production keys
- platform/surface: Correct serdev related return value to avoid
leaking errno into userspace
- Error checking fixes
The following is an automated shortlog grouped by driver:
asus-wmi:
- Change q500a_i8042_filter() into a generic i8042-filter
- disable USB0 hub on ROG Ally before suspend
- Filter Volume key presses if also reported via atkbd
- Move i8042 filter install to shared asus-wmi code
mellanox:
- Add null pointer checks for devm_kasprintf()
- Check devm_hwmon_device_register_with_groups() return value
mlxbf-bootctl:
- correctly identify secure boot with development keys
surface: aggregator:
- fix recv_buf() return value
wmi:
- Skip blocks with zero instances
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/x86/asus-wmi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 63e630276499..ab1c7deff118 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -114,6 +114,9 @@ /* Charging mode - 1=Barrel, 2=USB */ #define ASUS_WMI_DEVID_CHARGE_MODE 0x0012006C +/* MCU powersave mode */ +#define ASUS_WMI_DEVID_MCU_POWERSAVE 0x001200E2 + /* epu is connected? 1 == true */ #define ASUS_WMI_DEVID_EGPU_CONNECTED 0x00090018 /* egpu on/off */ |