ACPI: x86: Add ACPI_QUIRK_UART1_SKIP for Lenovo Yoga Book yb1-x90f/l

[linux-2.6-microblaze.git] / drivers / acpi / x86 / utils.c

diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 4cfee2d..c2b925f 100644 (file)
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -259,10 +259,11 @@ bool force_storage_d3(void)
  * drivers/platform/x86/x86-android-tablets.c kernel module.
  */
 #define ACPI_QUIRK_SKIP_I2C_CLIENTS                            BIT(0)
-#define ACPI_QUIRK_UART1_TTY_UART2_SKIP                                BIT(1)
-#define ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY                    BIT(2)
-#define ACPI_QUIRK_USE_ACPI_AC_AND_BATTERY                     BIT(3)
-#define ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS                    BIT(4)
+#define ACPI_QUIRK_UART1_SKIP                                  BIT(1)
+#define ACPI_QUIRK_UART1_TTY_UART2_SKIP                                BIT(2)
+#define ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY                    BIT(3)
+#define ACPI_QUIRK_USE_ACPI_AC_AND_BATTERY                     BIT(4)
+#define ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS                    BIT(5)
 
 static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
        /*
@@ -319,6 +320,7 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"),
                },
                .driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |
+                                       ACPI_QUIRK_UART1_SKIP |
                                        ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |
                                        ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),
        },
@@ -449,6 +451,9 @@ int acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *s
        if (dmi_id)
                quirks = (unsigned long)dmi_id->driver_data;
 
+       if ((quirks & ACPI_QUIRK_UART1_SKIP) && uid == 1)
+               *skip = true;
+
        if (quirks & ACPI_QUIRK_UART1_TTY_UART2_SKIP) {
                if (uid == 1)
                        return -ENODEV; /* Create tty cdev instead of serdev */