Merge tag 'for-6.4/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[platform/kernel/linux-starfive.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 23507d2..c2c7013 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -23,6 +23,7 @@
 
 #define pr_fmt(fmt) "ACPI: PM: " fmt
 
+#include <linux/dmi.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -1022,6 +1023,21 @@ void acpi_resume_power_resources(void)
 }
 #endif
 
+static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {
+       {
+               /*
+                * The Toshiba Click Mini has a CPR3 power-resource which must
+                * be on for the touchscreen to work, but which is not in any
+                * _PR? lists. The other 2 affected power-resources are no-ops.
+                */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Click Mini L9W-B"),
+               },
+       },
+       {}
+};
+
 /**
  * acpi_turn_off_unused_power_resources - Turn off power resources not in use.
  */
@@ -1029,6 +1045,9 @@ void acpi_turn_off_unused_power_resources(void)
 {
        struct acpi_power_resource *resource;
 
+       if (dmi_check_system(dmi_leave_unused_power_resources_on))
+               return;
+
        mutex_lock(&power_resource_list_lock);
 
        list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {