hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'acpi-pm' and 'acpi-docs' 

* acpi-pm:
  Revert "ACPI: scan: Turn off unused power resources during initialization"

* acpi-docs:
  Documentation: firmware-guide: gpio-properties: Add note to SPI CS case
This commit is contained in:
Rafael J. Wysocki 2021-05-06 17:21:42 +02:00
parent 1cfd895643 5db91e9cb5 ec3576eac1
commit 3da53c7545
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/firmware-guide/acpi/gpio-properties.rst
View File

@ -99,6 +99,12 @@ native::
} }
} }
Note, that historically ACPI has no means of the GPIO polarity and thus
the SPISerialBus() resource defines it on the per-chip basis. In order
to avoid a chain of negations, the GPIO polarity is considered being
Active High. Even for the cases when _DSD() is involved (see the example
above) the GPIO CS polarity must be defined Active High to avoid ambiguity.
Other supported properties Other supported properties
========================== ==========================

1
drivers/acpi/internal.h
View File

@ -142,7 +142,6 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
int acpi_power_get_inferred_state(struct acpi_device *device, int *state); int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
int acpi_power_on_resources(struct acpi_device *device, int state); int acpi_power_on_resources(struct acpi_device *device, int state);
int acpi_power_transition(struct acpi_device *device, int state); int acpi_power_transition(struct acpi_device *device, int state);
void acpi_turn_off_unused_power_resources(void);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Device Power Management Device Power Management

2
drivers/acpi/power.c
View File

@ -995,7 +995,6 @@ void acpi_resume_power_resources(void)
mutex_unlock(&power_resource_list_lock); mutex_unlock(&power_resource_list_lock);
} }
#endif
void acpi_turn_off_unused_power_resources(void) void acpi_turn_off_unused_power_resources(void)
{ {
@ -1016,3 +1015,4 @@ void acpi_turn_off_unused_power_resources(void)
mutex_unlock(&power_resource_list_lock); mutex_unlock(&power_resource_list_lock);
} }
#endif

2
drivers/acpi/scan.c
View File

@ -2359,8 +2359,6 @@ int __init acpi_scan_init(void)
} }
} }
acpi_turn_off_unused_power_resources();
acpi_scan_initialized = true; acpi_scan_initialized = true;
out: out:

1
drivers/acpi/sleep.h
View File

@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;
extern struct mutex acpi_device_lock; extern struct mutex acpi_device_lock;
extern void acpi_resume_power_resources(void); extern void acpi_resume_power_resources(void);
extern void acpi_turn_off_unused_power_resources(void);
static inline acpi_status acpi_set_waking_vector(u32 wakeup_address) static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
{ {