2 files changed, 49 insertions, 37 deletions

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 3bb89def2292..2bf9082f7523 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,25 +22,11 @@
 
 ACPI_MODULE_NAME("platform");
 
-/*
- * The following ACPI IDs are known to be suitable for representing as
- * platform devices.
- */
-static const struct acpi_device_id acpi_platform_device_ids[] = {
-
-        { "PNP0D40" },
-        { "VPC2004" },
-        { "BCM4752" },
-        { "LNV4752" },
-        { "BCM2E1A" },
-        { "BCM2E39" },
-        { "BCM2E3D" },
-
-        /* Intel Smart Sound Technology */
-        { "INT33C8" },
-        { "80860F28" },
-
-        { }
+static const struct acpi_device_id forbidden_id_list[] = {
+        {"PNP0000", 0}, /* PIC */
+        {"PNP0100", 0}, /* Timer */
+        {"PNP0200", 0}, /* AT DMA Controller */
+        {"", 0},
 };
 
 /**
@@ -67,6 +53,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         if (adev->physical_node_count)
                 return NULL;
 
+        if (!acpi_match_device_ids(adev, forbidden_id_list))
+                return ERR_PTR(-EINVAL);
+
         INIT_LIST_HEAD(&resource_list);
         count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
         if (count < 0) {
@@ -124,20 +113,3 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
         kfree(resources);
         return pdev;
 }
-
-static int acpi_platform_attach(struct acpi_device *adev,
-                                const struct acpi_device_id *id)
-{
-        acpi_create_platform_device(adev);
-        return 1;
-}
-
-static struct acpi_scan_handler platform_handler = {
-        .ids = acpi_platform_device_ids,
-        .attach = acpi_platform_attach,
-};
-
-void __init acpi_platform_init(void)
-{
-        acpi_scan_add_handler(&platform_handler);
-}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 611bb5db7e57..df49fc8276b9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2070,6 +2070,44 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
         return AE_OK;
 }
 
+static int acpi_check_spi_i2c_slave(struct acpi_resource *ares, void *data)
+{
+        bool *is_spi_i2c_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;
+
+         /* no need to do more checking */
+        return -1;
+}
+
+static void acpi_default_enumeration(struct acpi_device *device)
+{
+        struct list_head resource_list;
+        bool is_spi_i2c_slave = false;
+
+        if (!device->pnp.type.platform_id || device->handler)
+                return;
+
+        /*
+         * Do not enemerate SPI/I2C slaves as they will be enuerated by their
+         * respective parents.
+         */
+        INIT_LIST_HEAD(&resource_list);
+        acpi_dev_get_resources(device, &resource_list, acpi_check_spi_i2c_slave,
+                               &is_spi_i2c_slave);
+        acpi_dev_free_resource_list(&resource_list);
+        if (!is_spi_i2c_slave)
+                acpi_create_platform_device(device);
+}
+
 static int acpi_scan_attach_handler(struct acpi_device *device)
 {
         struct acpi_hardware_id *hwid;
@@ -2095,6 +2133,9 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
                                 break;
                 }
         }
+        if (!ret)
+                acpi_default_enumeration(device);
+
         return ret;
 }
 
@@ -2254,7 +2295,6 @@ int __init acpi_scan_init(void)
         acpi_pci_root_init();
         acpi_pci_link_init();
         acpi_processor_init();
-        acpi_platform_init();
         acpi_lpss_init();
         acpi_cmos_rtc_init();
         acpi_container_init();