summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-12-08 19:39:45 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-12-08 19:39:45 +0300
commit0634033dd104da8bf3903ff9b7f57ae81c6e1640 (patch)
tree5fd9320bfcbd5f7170af6ccacdbfdc2abcc38b82 /drivers/acpi
parent54c516aeb8b39eeae6450b7d8076d381568dca46 (diff)
parentb423f240a66ad928c4cb5ec6055dfc90ce8d894e (diff)
downloadlinux-0634033dd104da8bf3903ff9b7f57ae81c6e1640.tar.xz
Merge back ACPI EC changes for 6.2-rc1
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9b42628cf21b..9751b84c1b22 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1877,6 +1877,16 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
},
{
/*
+ * HP Pavilion Gaming Laptop 15-cx0041ur
+ */
+ .callback = ec_honor_dsdt_gpe,
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "HP"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP 15-cx0041ur"),
+ },
+ },
+ {
+ /*
* Samsung hardware
* https://bugzilla.kernel.org/show_bug.cgi?id=44161
*/