Skip to content

Commit 9572324

Browse files
committed
Merge tag 'platform-drivers-x86-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Hans de Goede: "Various bug-fixes and hardware-id additions" * tag 'platform-drivers-x86-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: platform/x86/intel: hid: add quirk to support Surface Go 3 platform/x86: amd-pmc: Fix s2idle failures on certain AMD laptops platform/x86: touchscreen_dmi: Add TrekStor SurfTab duo W1 touchscreen info platform/x86: lg-laptop: Recognize more models platform/x86: thinkpad_acpi: Add lid_logo_dot to the list of safe LEDs platform/x86: thinkpad_acpi: Restore missing hotkey_tablet_mode and hotkey_radio_sw sysfs-attr
2 parents cd8c917 + 7d0c009 commit 9572324

File tree

5 files changed

+42
-3
lines changed

5 files changed

+42
-3
lines changed

drivers/platform/x86/amd-pmc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#define AMD_CPU_ID_CZN AMD_CPU_ID_RN
7777
#define AMD_CPU_ID_YC 0x14B5
7878

79-
#define PMC_MSG_DELAY_MIN_US 100
79+
#define PMC_MSG_DELAY_MIN_US 50
8080
#define RESPONSE_REGISTER_LOOP_MAX 20000
8181

8282
#define SOC_SUBSYSTEM_IP_MAX 12

drivers/platform/x86/intel/hid.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ static const struct dmi_system_id button_array_table[] = {
9999
DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Tablet Gen 2"),
100100
},
101101
},
102+
{
103+
.ident = "Microsoft Surface Go 3",
104+
.matches = {
105+
DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
106+
DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),
107+
},
108+
},
102109
{ }
103110
};
104111

drivers/platform/x86/lg-laptop.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,18 @@ static int acpi_add(struct acpi_device *device)
657657
if (product && strlen(product) > 4)
658658
switch (product[4]) {
659659
case '5':
660+
if (strlen(product) > 5)
661+
switch (product[5]) {
662+
case 'N':
663+
year = 2021;
664+
break;
665+
case '0':
666+
year = 2016;
667+
break;
668+
default:
669+
year = 2022;
670+
}
671+
break;
660672
case '6':
661673
year = 2016;
662674
break;

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,6 +3015,8 @@ static struct attribute *hotkey_attributes[] = {
30153015
&dev_attr_hotkey_all_mask.attr,
30163016
&dev_attr_hotkey_adaptive_all_mask.attr,
30173017
&dev_attr_hotkey_recommended_mask.attr,
3018+
&dev_attr_hotkey_tablet_mode.attr,
3019+
&dev_attr_hotkey_radio_sw.attr,
30183020
#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
30193021
&dev_attr_hotkey_source_mask.attr,
30203022
&dev_attr_hotkey_poll_freq.attr,
@@ -5726,11 +5728,11 @@ static const char * const tpacpi_led_names[TPACPI_LED_NUMLEDS] = {
57265728
"tpacpi::standby",
57275729
"tpacpi::dock_status1",
57285730
"tpacpi::dock_status2",
5729-
"tpacpi::unknown_led2",
5731+
"tpacpi::lid_logo_dot",
57305732
"tpacpi::unknown_led3",
57315733
"tpacpi::thinkvantage",
57325734
};
5733-
#define TPACPI_SAFE_LEDS 0x1081U
5735+
#define TPACPI_SAFE_LEDS 0x1481U
57345736

57355737
static inline bool tpacpi_is_led_restricted(const unsigned int led)
57365738
{

drivers/platform/x86/touchscreen_dmi.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,16 @@ static const struct ts_dmi_data trekstor_primetab_t13b_data = {
905905
.properties = trekstor_primetab_t13b_props,
906906
};
907907

908+
static const struct property_entry trekstor_surftab_duo_w1_props[] = {
909+
PROPERTY_ENTRY_BOOL("touchscreen-inverted-x"),
910+
{ }
911+
};
912+
913+
static const struct ts_dmi_data trekstor_surftab_duo_w1_data = {
914+
.acpi_name = "GDIX1001:00",
915+
.properties = trekstor_surftab_duo_w1_props,
916+
};
917+
908918
static const struct property_entry trekstor_surftab_twin_10_1_props[] = {
909919
PROPERTY_ENTRY_U32("touchscreen-min-x", 20),
910920
PROPERTY_ENTRY_U32("touchscreen-min-y", 0),
@@ -1502,6 +1512,14 @@ const struct dmi_system_id touchscreen_dmi_table[] = {
15021512
DMI_MATCH(DMI_PRODUCT_NAME, "Primetab T13B"),
15031513
},
15041514
},
1515+
{
1516+
/* TrekStor SurfTab duo W1 10.1 ST10432-10b */
1517+
.driver_data = (void *)&trekstor_surftab_duo_w1_data,
1518+
.matches = {
1519+
DMI_MATCH(DMI_SYS_VENDOR, "TrekStor"),
1520+
DMI_MATCH(DMI_PRODUCT_NAME, "SurfTab duo W1 10.1 (VT4)"),
1521+
},
1522+
},
15051523
{
15061524
/* TrekStor SurfTab twin 10.1 ST10432-8 */
15071525
.driver_data = (void *)&trekstor_surftab_twin_10_1_data,

0 commit comments

Comments
 (0)