summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index e14e964bfe6d..b0fe5272c76a 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1024,6 +1024,9 @@ static void acpi_device_get_busid(struct acpi_device *device)
1024 case ACPI_BUS_TYPE_SLEEP_BUTTON: 1024 case ACPI_BUS_TYPE_SLEEP_BUTTON:
1025 strcpy(device->pnp.bus_id, "SLPF"); 1025 strcpy(device->pnp.bus_id, "SLPF");
1026 break; 1026 break;
1027 case ACPI_BUS_TYPE_ECDT_EC:
1028 strcpy(device->pnp.bus_id, "ECDT");
1029 break;
1027 default: 1030 default:
1028 acpi_get_name(device->handle, ACPI_SINGLE_NAME, &buffer); 1031 acpi_get_name(device->handle, ACPI_SINGLE_NAME, &buffer);
1029 /* Clean up trailing underscores (if any) */ 1032 /* Clean up trailing underscores (if any) */
@@ -1304,6 +1307,9 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
1304 case ACPI_BUS_TYPE_SLEEP_BUTTON: 1307 case ACPI_BUS_TYPE_SLEEP_BUTTON:
1305 acpi_add_id(pnp, ACPI_BUTTON_HID_SLEEPF); 1308 acpi_add_id(pnp, ACPI_BUTTON_HID_SLEEPF);
1306 break; 1309 break;
1310 case ACPI_BUS_TYPE_ECDT_EC:
1311 acpi_add_id(pnp, ACPI_ECDT_HID);
1312 break;
1307 } 1313 }
1308} 1314}
1309 1315
@@ -2046,6 +2052,21 @@ void acpi_bus_trim(struct acpi_device *adev)
2046} 2052}
2047EXPORT_SYMBOL_GPL(acpi_bus_trim); 2053EXPORT_SYMBOL_GPL(acpi_bus_trim);
2048 2054
2055int acpi_bus_register_early_device(int type)
2056{
2057 struct acpi_device *device = NULL;
2058 int result;
2059
2060 result = acpi_add_single_object(&device, NULL,
2061 type, ACPI_STA_DEFAULT);
2062 if (result)
2063 return result;
2064
2065 device->flags.match_driver = true;
2066 return device_attach(&device->dev);
2067}
2068EXPORT_SYMBOL_GPL(acpi_bus_register_early_device);
2069
2049static int acpi_bus_scan_fixed(void) 2070static int acpi_bus_scan_fixed(void)
2050{ 2071{
2051 int result = 0; 2072 int result = 0;