Commit 3da53c75 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 1cfd8956 5db91e9c ec3576ea

Documentation/firmware-guide/acpi/gpio-properties.rst

+6 −0
Original line number Diff line number Diff line
@@ -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

==========================

drivers/acpi/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -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_on_resources(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

drivers/acpi/power.c

+1 −1
Original line number Diff line number Diff line
@@ -995,7 +995,6 @@ void acpi_resume_power_resources(void) 


	mutex_unlock(&power_resource_list_lock);

}

#endif



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);

}

#endif

drivers/acpi/scan.c

+0 −2
Original line number Diff line number Diff line
@@ -2359,8 +2359,6 @@ int __init acpi_scan_init(void) 
		}

	}



	acpi_turn_off_unused_power_resources();



	acpi_scan_initialized = true;



 out:

drivers/acpi/sleep.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list; 
extern struct mutex acpi_device_lock;



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)

{