Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'platform-drivers-x86-v6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Ilpo Järvinen:
"Fixes and New Hotkey Support:
- input + dell-wmi-base: Electronic privacy screen on/off hotkey
support
- int3472: Fix unregister double free
- wireless-hotkey: Fix Kconfig typo"
* tag 'platform-drivers-x86-v6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
platform: x86: Kconfig: fix minor typo in help for WIRELESS_HOTKEY
platform/x86: dell-wmi-base: Handle electronic privacy screen on/off events
Input: Add keycodes for electronic privacy screen on/off hotkeys
MAINTAINERS: Update int3472 maintainers
platform/x86: int3472: Fix double free of GPIO device during unregister
+28
-7
+2
-1
MAINTAINERS
+2
-1
MAINTAINERS
···
12862
12862
K: \bSGX_
12863
12863
12864
12864
INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
12865
-
M: Daniel Scally <djrscally@gmail.com>
12865
+
M: Daniel Scally <dan.scally@ideasonboard.com>
12866
+
M: Sakari Ailus <sakari.ailus@linux.intel.com>
12866
12867
S: Maintained
12867
12868
F: drivers/platform/x86/intel/int3472/
12868
12869
F: include/linux/platform_data/x86/int3472.h
+1
-1
drivers/platform/x86/Kconfig
+1
-1
drivers/platform/x86/Kconfig
···
432
432
depends on INPUT
433
433
help
434
434
This driver provides supports for the wireless buttons found on some AMD,
435
-
HP, & Xioami laptops.
435
+
HP, & Xiaomi laptops.
436
436
On such systems the driver should load automatically (via ACPI alias).
437
437
438
438
To compile this driver as a module, choose M here: the module will
+12
drivers/platform/x86/dell/dell-wmi-base.c
+12
drivers/platform/x86/dell/dell-wmi-base.c
···
365
365
/* Backlight brightness change event */
366
366
{ KE_IGNORE, 0x0003, { KEY_RESERVED } },
367
367
368
+
/*
369
+
* Electronic privacy screen toggled, extended data gives state,
370
+
* separate entries for on/off see handling in dell_wmi_process_key().
371
+
*/
372
+
{ KE_KEY, 0x000c, { KEY_EPRIVACY_SCREEN_OFF } },
373
+
{ KE_KEY, 0x000c, { KEY_EPRIVACY_SCREEN_ON } },
374
+
368
375
/* Ultra-performance mode switch request */
369
376
{ KE_IGNORE, 0x000d, { KEY_RESERVED } },
370
377
···
442
435
"Dell tablet mode switch",
443
436
SW_TABLET_MODE, !buffer[0]);
444
437
return 1;
438
+
} else if (type == 0x0012 && code == 0x000c && remaining > 0) {
439
+
/* Eprivacy toggle, switch to "on" key entry for on events */
440
+
if (buffer[0] == 2)
441
+
key++;
442
+
used = 1;
445
443
} else if (type == 0x0012 && code == 0x000d && remaining > 0) {
446
444
value = (buffer[2] == 2);
447
445
used = 1;
+1
-4
drivers/platform/x86/intel/int3472/clk_and_regulator.c
+1
-4
drivers/platform/x86/intel/int3472/clk_and_regulator.c
···
245
245
if (IS_ERR(regulator->rdev))
246
246
return PTR_ERR(regulator->rdev);
247
247
248
-
int3472->regulators[int3472->n_regulator_gpios].ena_gpio = gpio;
249
248
int3472->n_regulator_gpios++;
250
249
return 0;
251
250
}
252
251
253
252
void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472)
254
253
{
255
-
for (int i = 0; i < int3472->n_regulator_gpios; i++) {
254
+
for (int i = 0; i < int3472->n_regulator_gpios; i++)
256
255
regulator_unregister(int3472->regulators[i].rdev);
257
-
gpiod_put(int3472->regulators[i].ena_gpio);
258
-
}
259
256
}
-1
include/linux/platform_data/x86/int3472.h
-1
include/linux/platform_data/x86/int3472.h
···
100
100
struct regulator_consumer_supply supply_map[GPIO_REGULATOR_SUPPLY_MAP_COUNT * 2];
101
101
char supply_name_upper[GPIO_SUPPLY_NAME_LENGTH];
102
102
char regulator_name[GPIO_REGULATOR_NAME_LENGTH];
103
-
struct gpio_desc *ena_gpio;
104
103
struct regulator_dev *rdev;
105
104
struct regulator_desc rdesc;
106
105
};
+12
include/uapi/linux/input-event-codes.h
+12
include/uapi/linux/input-event-codes.h
···
631
631
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
632
632
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
633
633
634
+
/*
635
+
* Keycodes for hotkeys toggling the electronic privacy screen found on some
636
+
* laptops on/off. Note when the embedded-controller turns on/off the eprivacy
637
+
* screen itself then the state should be reported through drm connecter props:
638
+
* https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties
639
+
* Except when implementing the drm connecter properties API is not possible
640
+
* because e.g. the firmware does not allow querying the presence and/or status
641
+
* of the eprivacy screen at boot.
642
+
*/
643
+
#define KEY_EPRIVACY_SCREEN_ON 0x252
644
+
#define KEY_EPRIVACY_SCREEN_OFF 0x253
645
+
634
646
#define KEY_KBDINPUTASSIST_PREV 0x260
635
647
#define KEY_KBDINPUTASSIST_NEXT 0x261
636
648
#define KEY_KBDINPUTASSIST_PREVGROUP 0x262