diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 3cd9ccdcbd8f..7bf83ddf82e0 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -242,6 +242,8 @@ struct acpi_device_perf { | |||
242 | struct acpi_device_wakeup_flags { | 242 | struct acpi_device_wakeup_flags { |
243 | u8 valid:1; /* Can successfully enable wakeup? */ | 243 | u8 valid:1; /* Can successfully enable wakeup? */ |
244 | u8 run_wake:1; /* Run-Wake GPE devices */ | 244 | u8 run_wake:1; /* Run-Wake GPE devices */ |
245 | u8 always_enabled:1; /* Run-wake devices that are always enabled */ | ||
246 | u8 notifier_present:1; /* Wake-up notify handler has been installed */ | ||
245 | }; | 247 | }; |
246 | 248 | ||
247 | struct acpi_device_wakeup_state { | 249 | struct acpi_device_wakeup_state { |
@@ -250,12 +252,13 @@ struct acpi_device_wakeup_state { | |||
250 | 252 | ||
251 | struct acpi_device_wakeup { | 253 | struct acpi_device_wakeup { |
252 | acpi_handle gpe_device; | 254 | acpi_handle gpe_device; |
253 | acpi_integer gpe_number; | 255 | u64 gpe_number; |
254 | acpi_integer sleep_state; | 256 | u64 sleep_state; |
255 | struct acpi_handle_list resources; | 257 | struct acpi_handle_list resources; |
256 | struct acpi_device_wakeup_state state; | 258 | struct acpi_device_wakeup_state state; |
257 | struct acpi_device_wakeup_flags flags; | 259 | struct acpi_device_wakeup_flags flags; |
258 | int prepare_count; | 260 | int prepare_count; |
261 | int run_wake_count; | ||
259 | }; | 262 | }; |
260 | 263 | ||
261 | /* Device */ | 264 | /* Device */ |
@@ -380,12 +383,15 @@ struct acpi_pci_root { | |||
380 | }; | 383 | }; |
381 | 384 | ||
382 | /* helper */ | 385 | /* helper */ |
383 | acpi_handle acpi_get_child(acpi_handle, acpi_integer); | 386 | acpi_handle acpi_get_child(acpi_handle, u64); |
384 | int acpi_is_root_bridge(acpi_handle); | 387 | int acpi_is_root_bridge(acpi_handle); |
385 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); | 388 | acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int); |
386 | struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); | 389 | struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle); |
387 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) | 390 | #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle)) |
388 | 391 | ||
392 | int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); | ||
393 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); | ||
394 | |||
389 | #ifdef CONFIG_PM_SLEEP | 395 | #ifdef CONFIG_PM_SLEEP |
390 | int acpi_pm_device_sleep_state(struct device *, int *); | 396 | int acpi_pm_device_sleep_state(struct device *, int *); |
391 | int acpi_pm_device_sleep_wake(struct device *, bool); | 397 | int acpi_pm_device_sleep_wake(struct device *, bool); |