Pull x86 platform driver updates from Hans de Goede: "Highlights: - Microsoft Surface devices System Aggregator Module support - SW_TABLET_MODE reporting improvements - thinkpad_acpi keyboard language setting support - platform / DPTF profile settings support: - Base / userspace API parts merged from Rafael's acpi-platform branch - thinkpad_acpi and ideapad-laptop support through pdx86 - Remove support for some obsolete Intel MID platforms through merging of the shared intel-mid-removal branch - Big cleanup of the ideapad-laptop driver - Misc other fixes / new hw support / quirks" * tag 'platform-drivers-x86-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (99 commits) platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds platform/surface: aggregator: Fix access of unaligned value tools/power/x86/intel-speed-select: Update version to 1.8 tools/power/x86/intel-speed-select: Add new command to get/set TRL tools/power/x86/intel-speed-select: Add new command turbo-mode Platform: OLPC: Constify static struct regulator_ops platform/surface: Add Surface Hot-Plug driver platform/x86: intel_scu_wdt: Drop mistakenly added const platform/x86: Kconfig: add missing selects for ideapad-laptop platform/x86: acer-wmi: Don't use ACPI_EXCEPTION() platform/x86: thinkpad_acpi: Replace ifdef CONFIG_ACPI_PLATFORM_PROFILE with depends on platform/x86: thinkpad_acpi: Fix 'warning: no previous prototype for' warnings platform/x86: msi-wmi: Fix variable 'status' set but not used compiler warning platform/surface: surface3-wmi: Fix variable 'status' set but not used compiler warning platform/x86: Move all dell drivers to their own subdirectory Documentation/ABI: sysfs-platform-ideapad-laptop: conservation_mode attribute Documentation/ABI: sysfs-platform-ideapad-laptop: update device attribute paths platform/x86: ideapad-laptop: add "always on USB charging" control support platform/x86: ideapad-laptop: add keyboard backlight control support platform/x86: ideapad-laptop: send notification about touchpad state change to sysfs ...
Showing the changes to scripts (2 of 108 files). Show all
Unified · Split
| @@ -246,5 +246,13 @@ int main(void) · 245 unmodified lines | ||
| 246 | 246 | DEVID(auxiliary_device_id); |
| 247 | 247 | DEVID_FIELD(auxiliary_device_id, name); |
| 248 | 248 | |
| 249 | + DEVID(ssam_device_id); | |
| 250 | + DEVID_FIELD(ssam_device_id, match_flags); | |
| 251 | + DEVID_FIELD(ssam_device_id, domain); | |
| 252 | + DEVID_FIELD(ssam_device_id, category); | |
| 253 | + DEVID_FIELD(ssam_device_id, target); | |
| 254 | + DEVID_FIELD(ssam_device_id, instance); | |
| 255 | + DEVID_FIELD(ssam_device_id, function); | |
| 256 | + | |
| 249 | 257 | return 0; |
| 250 | 258 | } |
| @@ -1375,6 +1375,28 @@ static int do_auxiliary_entry(const char *filename, void *symval, char *alias) · 1374 unmodified lines | ||
| 1375 | 1375 | return 1; |
| 1376 | 1376 | } |
| 1377 | 1377 | |
| 1378 | +/* | |
| 1379 | + * Looks like: ssam:dNcNtNiNfN | |
| 1380 | + * | |
| 1381 | + * N is exactly 2 digits, where each is an upper-case hex digit. | |
| 1382 | + */ | |
| 1383 | +static int do_ssam_entry(const char *filename, void *symval, char *alias) | |
| 1384 | +{ | |
| 1385 | + DEF_FIELD(symval, ssam_device_id, match_flags); | |
| 1386 | + DEF_FIELD(symval, ssam_device_id, domain); | |
| 1387 | + DEF_FIELD(symval, ssam_device_id, category); | |
| 1388 | + DEF_FIELD(symval, ssam_device_id, target); | |
| 1389 | + DEF_FIELD(symval, ssam_device_id, instance); | |
| 1390 | + DEF_FIELD(symval, ssam_device_id, function); | |
| 1391 | + | |
| 1392 | + sprintf(alias, "ssam:d%02Xc%02X", domain, category); | |
| 1393 | + ADD(alias, "t", match_flags & SSAM_MATCH_TARGET, target); | |
| 1394 | + ADD(alias, "i", match_flags & SSAM_MATCH_INSTANCE, instance); | |
| 1395 | + ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function); | |
| 1396 | + | |
| 1397 | + return 1; | |
| 1398 | +} | |
| 1399 | + | |
| 1378 | 1400 | /* Does namelen bytes of name exactly match the symbol? */ |
| 1379 | 1401 | static bool sym_is(const char *name, unsigned namelen, const char *symbol) |
| 1380 | 1402 | { |
| @@ -1450,6 +1472,7 @@ static const struct devtable devtable[] = { · 69 unmodified lines | ||
| 1450 | 1472 | {"wmi", SIZE_wmi_device_id, do_wmi_entry}, |
| 1451 | 1473 | {"mhi", SIZE_mhi_device_id, do_mhi_entry}, |
| 1452 | 1474 | {"auxiliary", SIZE_auxiliary_device_id, do_auxiliary_entry}, |
| 1475 | + {"ssam", SIZE_ssam_device_id, do_ssam_entry}, | |
| 1453 | 1476 | }; |
| 1454 | 1477 | |
| 1455 | 1478 | /* Create MODULE_ALIAS() statements. |