Merge branch 'power-resource' into release

1 files changed, 23 insertions, 4 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ce6741ee1965..148e7492d736 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -847,6 +847,8 @@ end:
         return 0;
 }
 
+static void acpi_bus_add_power_resource(acpi_handle handle);
+
 static int acpi_bus_get_power_flags(struct acpi_device *device)
 {
         acpi_status status = 0;
@@ -875,8 +877,12 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                 acpi_evaluate_reference(device->handle, object_name, NULL,
                                         &ps->resources);
                 if (ps->resources.count) {
+                        int j;
+
                         device->power.flags.power_resources = 1;
                         ps->flags.valid = 1;
+                        for (j = 0; j < ps->resources.count; j++)
+                                acpi_bus_add_power_resource(ps->resources.handles[j]);
                 }
 
                 /* Evaluate "_PSx" to see if we can do explicit sets */
@@ -901,10 +907,7 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         device->power.states[ACPI_STATE_D3].flags.valid = 1;
         device->power.states[ACPI_STATE_D3].power = 0;
 
-        /* TBD: System wake support and resource requirements. */
-
-        device->power.state = ACPI_STATE_UNKNOWN;
-        acpi_bus_get_power(device->handle, &(device->power.state));
+        acpi_bus_init_power(device);
 
         return 0;
 }
@@ -1326,6 +1329,20 @@ end:
 #define ACPI_STA_DEFAULT (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | \
                           ACPI_STA_DEVICE_UI      | ACPI_STA_DEVICE_FUNCTIONING)
 
+static void acpi_bus_add_power_resource(acpi_handle handle)
+{
+        struct acpi_bus_ops ops = {
+                .acpi_op_add = 1,
+                .acpi_op_start = 1,
+        };
+        struct acpi_device *device = NULL;
+
+        acpi_bus_get_device(handle, &device);
+        if (!device)
+                acpi_add_single_object(&device, handle, ACPI_BUS_TYPE_POWER,
+                                        ACPI_STA_DEFAULT, &ops);
+}
+
 static int acpi_bus_type_and_status(acpi_handle handle, int *type,
                                     unsigned long long *sta)
 {
@@ -1573,6 +1590,8 @@ int __init acpi_scan_init(void)
                 printk(KERN_ERR PREFIX "Could not register bus type\n");
         }
 
+        acpi_power_init();
+
         /*
          * Enumerate devices in the ACPI namespace.
          */