ACPI / x86: Skip AC and battery devices on x86 Android tablets with broken DSDTs

So far all of the tablets for which the skip i2c-client/serdev enumeration
quirks have been added also all have broken ACPI AC / battery devices
extend the existing quirks for these tablets to also skip the broken
AC / battery devices.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 5411f2f1254e511d40172cadd719ec65f4fe8167..ffdeed5334d6f30b5c082f4cbdb3f3b0dea685ee 100644 (file)
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -273,14 +273,16 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ME176C"),
                },
                .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
-                                       ACPI_QUIRK_UART1_TTY_UART2_SKIP),
+                                       ACPI_QUIRK_UART1_TTY_UART2_SKIP |
+                                       ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),
        },
        {
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
                        DMI_MATCH(DMI_PRODUCT_NAME, "TF103C"),
                },
-               .driver_data = (void *)ACPI_QUIRK_SKIP_I2C_CLIENTS,
+               .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
+                                       ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),
        },
        {
                /* Whitelabel (sold as various brands) TM800A550L */
@@ -290,7 +292,8 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
                        /* Above strings are too generic, also match on BIOS version */
                        DMI_MATCH(DMI_BIOS_VERSION, "ZY-8-BI-PX4S70VTR400-X423B-005-D"),
                },
-               .driver_data = (void *)ACPI_QUIRK_SKIP_I2C_CLIENTS,
+               .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
+                                       ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),
        },
 #endif
        {}