Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'acpica' into acpi-pm

parents e4cb0c9e e0fa975d

drivers/acpi/acpica/evxfgpe.c

+32 −0
Original line number Diff line number Diff line
@@ -596,6 +596,38 @@ acpi_status acpi_enable_all_runtime_gpes(void) 


ACPI_EXPORT_SYMBOL(acpi_enable_all_runtime_gpes)



/******************************************************************************

 *

 * FUNCTION:    acpi_enable_all_wakeup_gpes

 *

 * PARAMETERS:  None

 *

 * RETURN:      Status

 *

 * DESCRIPTION: Enable all "wakeup" GPEs and disable all of the other GPEs, in

 *              all GPE blocks.

 *

 ******************************************************************************/



acpi_status acpi_enable_all_wakeup_gpes(void)

{

	acpi_status status;



	ACPI_FUNCTION_TRACE(acpi_enable_all_wakeup_gpes);



	status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);

	}



	status = acpi_hw_enable_all_wakeup_gpes();

	(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);



	return_ACPI_STATUS(status);

}



ACPI_EXPORT_SYMBOL(acpi_enable_all_wakeup_gpes)



/*******************************************************************************

 *

 * FUNCTION:    acpi_install_gpe_block

drivers/acpi/acpica/hwgpe.c

+4 −4
Original line number Diff line number Diff line
@@ -396,11 +396,11 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
	/* Examine each GPE Register within the block */



	for (i = 0; i < gpe_block->register_count; i++) {

		if (!gpe_block->register_info[i].enable_for_wake) {

			continue;

		}



		/* Enable all "wake" GPEs in this register */

		/*

		 * Enable all "wake" GPEs in this register and disable the

		 * remaining ones.

		 */



		status =

		    acpi_hw_write(gpe_block->register_info[i].enable_for_wake,

drivers/acpi/acpica/utresrc.c

+3 −1
Original line number Diff line number Diff line
@@ -87,7 +87,9 @@ const char *acpi_gbl_io_decode[] = { 


const char *acpi_gbl_ll_decode[] = {

	"ActiveHigh",

	"ActiveLow"

	"ActiveLow",

	"ActiveBoth",

	"Reserved"

};



const char *acpi_gbl_max_decode[] = {

include/acpi/acnames.h

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ 
#define METHOD_NAME__PRS        "_PRS"

#define METHOD_NAME__PRT        "_PRT"

#define METHOD_NAME__PRW        "_PRW"

#define METHOD_NAME__PS0        "_PS0"

#define METHOD_NAME__PS1        "_PS1"

#define METHOD_NAME__PS2        "_PS2"

#define METHOD_NAME__PS3        "_PS3"

#define METHOD_NAME__REG        "_REG"

#define METHOD_NAME__SB_        "_SB_"

#define METHOD_NAME__SEG        "_SEG"

include/acpi/acpixf.h

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 


/* Current ACPICA subsystem version in YYYYMMDD format */



#define ACPI_CA_VERSION                 0x20140724

#define ACPI_CA_VERSION                 0x20140828



#include <acpi/acconfig.h>

#include <acpi/actypes.h>
@@ -692,6 +692,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
						     *event_status))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_wakeup_gpes(void))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				acpi_get_gpe_device(u32 gpe_index,