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

rafaeljw · rafaeljw · commit 3da53c754502 · 2021-05-06T17:21:42.000+02:00
* 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
diff --git a/Documentation/firmware-guide/acpi/gpio-properties.rst b/Documentation/firmware-guide/acpi/gpio-properties.rst
@@ -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
 ==========================
 
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
@@ -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
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
@@ -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
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
@@ -2359,8 +2359,6 @@ int __init acpi_scan_init(void)
 		}
 	}
 
-	acpi_turn_off_unused_power_resources();
-
 	acpi_scan_initialized = true;
 
  out:
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,12 @@ native::`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
	`102`	`+Note, that historically ACPI has no means of the GPIO polarity and thus`
	`103`	`+the SPISerialBus() resource defines it on the per-chip basis. In order`
	`104`	`+to avoid a chain of negations, the GPIO polarity is considered being`
	`105`	`+Active High. Even for the cases when _DSD() is involved (see the example`
	`106`	`+above) the GPIO CS polarity must be defined Active High to avoid ambiguity.`
	`107`	`+`
`102`	`108`	`Other supported properties`
`103`	`109`	`==========================`
`104`	`110`
Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,6 @@ void acpi_resume_power_resources(void)`
`995`	`995`
`996`	`996`	`mutex_unlock(&power_resource_list_lock);`
`997`	`997`	`}`
`998`		`-#endif`
`999`	`998`
`1000`	`999`	`void acpi_turn_off_unused_power_resources(void)`
`1001`	`1000`	`{`
`@@ -1016,3 +1015,4 @@ void acpi_turn_off_unused_power_resources(void)`
`1016`	`1015`
`1017`	`1016`	`mutex_unlock(&power_resource_list_lock);`
`1018`	`1017`	`}`
	`1018`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -2359,8 +2359,6 @@ int __init acpi_scan_init(void)`
`2359`	`2359`	`}`
`2360`	`2360`	`}`
`2361`	`2361`
`2362`		`- acpi_turn_off_unused_power_resources();`
`2363`		`-`
`2364`	`2362`	`acpi_scan_initialized = true;`
`2365`	`2363`
`2366`	`2364`	`out:`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;`
`8`	`8`	`extern struct mutex acpi_device_lock;`
`9`	`9`
`10`	`10`	`extern void acpi_resume_power_resources(void);`
	`11`	`+extern void acpi_turn_off_unused_power_resources(void);`
`11`	`12`
`12`	`13`	`static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)`
`13`	`14`	`{`