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

Merge branch 'acpi-pm' 

* acpi-pm:
  ACPI: PM: Add ACPI ID of Alder Lake Fan
  Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
parents 0c8bd174 2404b874

drivers/acpi/device_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -1313,6 +1313,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) 
		{"PNP0C0B", }, /* Generic ACPI fan */

		{"INT3404", }, /* Fan */

		{"INTC1044", }, /* Fan for Tiger Lake generation */

		{"INTC1048", }, /* Fan for Alder Lake generation */

		{}

	};

	struct acpi_device *adev = ACPI_COMPANION(dev);

drivers/acpi/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 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,6 +995,7 @@ void acpi_resume_power_resources(void) 


	mutex_unlock(&power_resource_list_lock);

}

#endif



void acpi_turn_off_unused_power_resources(void)

{
@@ -1015,4 +1016,3 @@ void acpi_turn_off_unused_power_resources(void) 


	mutex_unlock(&power_resource_list_lock);

}
 
#endif

drivers/acpi/scan.c

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

	}



	acpi_turn_off_unused_power_resources();



	acpi_scan_initialized = true;



 out:

drivers/acpi/sleep.h

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

{