summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-10 14:01:09 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-11-10 14:01:09 +0100
commit2c49dabad80d2177045554328da679f37b767ac9 (patch)
tree300e95bbb0cbefc524006dd287070b9d2f7b7137 /include/acpi
parentACPI: PM: Fix device wakeup power reference counting error (diff)
parentDocumentation: ACPI: Fix non-D0 probe _DSC object example (diff)
downloadlinux-2c49dabad80d2177045554328da679f37b767ac9.tar.xz
linux-2c49dabad80d2177045554328da679f37b767ac9.zip
Merge branch 'acpi-dsc'
Merge new ACPI device configuration object _DSC support for 5.16-rc1. * acpi-dsc: Documentation: ACPI: Fix non-D0 probe _DSC object example at24: Support probing while in non-zero ACPI D state media: i2c: imx319: Support device probe in non-zero ACPI D state ACPI: Add a convenience function to tell a device is in D0 state Documentation: ACPI: Document _DSC object usage for enum power state i2c: Allow an ACPI driver to manage the device's power state during probe ACPI: scan: Obtain device's desired enumeration power state
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 53b6e9f9de7b..480f9207a4c6 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -278,6 +278,7 @@ struct acpi_device_power {
int state; /* Current state */
struct acpi_device_power_flags flags;
struct acpi_device_power_state states[ACPI_D_STATE_COUNT]; /* Power states (D0-D3Cold) */
+ u8 state_for_enumeration; /* Deepest power state for enumeration */
};
struct acpi_dep_data {