Merge tag 'platform-drivers-x86-v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 5ffd87a..9efbfe0 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1735,17 +1735,26 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
        bool is_serial_bus_slave = false;
        static const struct acpi_device_id ignore_serial_bus_ids[] = {
        /*
-        * These devices have multiple I2cSerialBus resources and an i2c-client
-        * must be instantiated for each, each with its own i2c_device_id.
-        * Normally we only instantiate an i2c-client for the first resource,
-        * using the ACPI HID as id. These special cases are handled by the
-        * drivers/platform/x86/i2c-multi-instantiate.c driver, which knows
-        * which i2c_device_id to use for each resource.
+        * These devices have multiple SerialBus resources and a client
+        * device must be instantiated for each of them, each with
+        * its own device id.
+        * Normally we only instantiate one client device for the first
+        * resource, using the ACPI HID as id. These special cases are handled
+        * by the drivers/platform/x86/serial-multi-instantiate.c driver, which
+        * knows which client device id to use for each resource.
         */
                {"BSG1160", },
                {"BSG2150", },
+               {"CSC3551", },
                {"INT33FE", },
                {"INT3515", },
+               /* Non-conforming _HID for Cirrus Logic already released */
+               {"CLSA0100", },
+       /*
+        * Some ACPI devs contain SerialBus resources even though they are not
+        * attached to a serial bus at all.
+        */
+               {"MSHW0028", },
        /*
         * HIDs of device with an UartSerialBusV2 resource for which userspace
         * expects a regular tty cdev to be created (instead of the in kernel