1 files changed, 17 insertions, 20 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 81367edc8a10..e14e964bfe6d 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1505,41 +1505,38 @@ static void acpi_init_coherency(struct acpi_device *adev)
         adev->flags.coherent_dma = cca;
 }
 
-static int acpi_check_spi_i2c_slave(struct acpi_resource *ares, void *data)
+static int acpi_check_serial_bus_slave(struct acpi_resource *ares, void *data)
 {
-        bool *is_spi_i2c_slave_p = data;
+        bool *is_serial_bus_slave_p = data;
 
         if (ares->type != ACPI_RESOURCE_TYPE_SERIAL_BUS)
                 return 1;
 
-        /*
-         * devices that are connected to UART still need to be enumerated to
-         * platform bus
-         */
-        if (ares->data.common_serial_bus.type != ACPI_RESOURCE_SERIAL_TYPE_UART)
-                *is_spi_i2c_slave_p = true;
+        *is_serial_bus_slave_p = true;
 
          /* no need to do more checking */
         return -1;
 }
 
-static bool acpi_is_spi_i2c_slave(struct acpi_device *device)
+static bool acpi_is_serial_bus_slave(struct acpi_device *device)
 {
         struct list_head resource_list;
-        bool is_spi_i2c_slave = false;
+        bool is_serial_bus_slave = false;
 
         /* Macs use device properties in lieu of _CRS resources */
         if (x86_apple_machine &&
             (fwnode_property_present(&device->fwnode, "spiSclkPeriod") ||
-             fwnode_property_present(&device->fwnode, "i2cAddress")))
+             fwnode_property_present(&device->fwnode, "i2cAddress") ||
+             fwnode_property_present(&device->fwnode, "baud")))
                 return true;
 
         INIT_LIST_HEAD(&resource_list);
-        acpi_dev_get_resources(device, &resource_list, acpi_check_spi_i2c_slave,
-                               &is_spi_i2c_slave);
+        acpi_dev_get_resources(device, &resource_list,
+                               acpi_check_serial_bus_slave,
+                               &is_serial_bus_slave);
         acpi_dev_free_resource_list(&resource_list);
 
-        return is_spi_i2c_slave;
+        return is_serial_bus_slave;
 }
 
 void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
@@ -1557,7 +1554,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
         acpi_bus_get_flags(device);
         device->flags.match_driver = false;
         device->flags.initialized = true;
-        device->flags.spi_i2c_slave = acpi_is_spi_i2c_slave(device);
+        device->flags.serial_bus_slave = acpi_is_serial_bus_slave(device);
         acpi_device_clear_enumerated(device);
         device_initialize(&device->dev);
         dev_set_uevent_suppress(&device->dev, true);
@@ -1841,10 +1838,10 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
 static void acpi_default_enumeration(struct acpi_device *device)
 {
         /*
-         * Do not enumerate SPI/I2C slaves as they will be enumerated by their
-         * respective parents.
+         * Do not enumerate SPI/I2C/UART slaves as they will be enumerated by
+         * their respective parents.
          */
-        if (!device->flags.spi_i2c_slave) {
+        if (!device->flags.serial_bus_slave) {
                 acpi_create_platform_device(device, NULL);
                 acpi_device_set_enumerated(device);
         } else {
@@ -1941,7 +1938,7 @@ static void acpi_bus_attach(struct acpi_device *device)
                 return;
 
         device->flags.match_driver = true;
-        if (ret > 0 && !device->flags.spi_i2c_slave) {
+        if (ret > 0 && !device->flags.serial_bus_slave) {
                 acpi_device_set_enumerated(device);
                 goto ok;
         }
@@ -1950,7 +1947,7 @@ static void acpi_bus_attach(struct acpi_device *device)
         if (ret < 0)
                 return;
 
-        if (!device->pnp.type.platform_id && !device->flags.spi_i2c_slave)
+        if (!device->pnp.type.platform_id && !device->flags.serial_bus_slave)
                 acpi_device_set_enumerated(device);
         else
                 acpi_default_enumeration(device);