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

Commit 9e50ab91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
  ACPI / ACPICA: Simplify acpi_ev_initialize_gpe_block()
  ACPI / ACPICA: Fail acpi_gpe_wakeup() if ACPI_GPE_CAN_WAKE is unset
  ACPI / ACPICA: Do not execute _PRW methods during initialization
  ACPI: Fix bogus GPE test in acpi_bus_set_run_wake_flags()
  ACPICA: Update version to 20100702
  ACPICA: Fix for Alias references within Package objects
  ACPICA: Fix lint warning for 64-bit constant
  ACPICA: Remove obsolete GPE function
  ACPICA: Update debug output components
  ACPICA: Add support for WDDT - Watchdog Descriptor Table
  ACPICA: Drop acpi_set_gpe
  ACPICA: Use low-level GPE enable during GPE block initialization
  ACPI / EC: Do not use acpi_set_gpe
  ACPI / EC: Drop suspend and resume routines
  ACPICA: Remove wakeup GPE reference counting which is not used
  ACPICA: Introduce acpi_gpe_wakeup()
  ACPICA: Rename acpi_hw_gpe_register_bit
  ACPICA: Update version to 20100528
  ACPICA: Add signatures for undefined tables: ATKG, GSCI, IEIT
  ACPICA: Optimization: Reduce the number of namespace walks
  ...
parents 3cc08fc3 a0d46871

drivers/acpi/acpica/acevents.h

+3 −1
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node, 
u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info *gpe_xrupt_list);



acpi_status

acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info);

acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info);



acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);



struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,

						       u32 gpe_number);

drivers/acpi/acpica/acglobal.h

+0 −7
Original line number Diff line number Diff line
@@ -99,13 +99,6 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);



/*

 * Disable wakeup GPEs during runtime? Default is TRUE because WAKE and

 * RUNTIME GPEs should never be shared, and WAKE GPEs should typically only

 * be enabled just before going to sleep.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE);



/*

 * Optionally use default values for the ACPI register widths. Set this to

 * TRUE to use the defaults, if an FADT contains incorrect widths/lengths.

drivers/acpi/acpica/achware.h

+1 −4
Original line number Diff line number Diff line
@@ -90,15 +90,12 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width); 
/*

 * hwgpe - GPE support

 */

u32 acpi_hw_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info,

			     struct acpi_gpe_register_info *gpe_register_info);



acpi_status

acpi_hw_low_set_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 action);



acpi_status

acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info *gpe_event_info);



acpi_status

acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

			  struct acpi_gpe_block_info *gpe_block, void *context);

drivers/acpi/acpica/aclocal.h

+3 −3
Original line number Diff line number Diff line
@@ -184,8 +184,9 @@ struct acpi_namespace_node { 
	u8 flags;		/* Miscellaneous flags */

	acpi_owner_id owner_id;	/* Node creator */

	union acpi_name_union name;	/* ACPI Name, always 4 chars per ACPI spec */

	struct acpi_namespace_node *parent;	/* Parent node */

	struct acpi_namespace_node *child;	/* First child */

	struct acpi_namespace_node *peer;	/* Peer. Parent if ANOBJ_END_OF_PEER_LIST set */

	struct acpi_namespace_node *peer;	/* First peer */



	/*

	 * The following fields are used by the ASL compiler and disassembler only
@@ -199,7 +200,7 @@ struct acpi_namespace_node { 


/* Namespace Node flags */



#define ANOBJ_END_OF_PEER_LIST          0x01	/* End-of-list, Peer field points to parent */

#define ANOBJ_RESERVED                  0x01	/* Available for use */

#define ANOBJ_TEMPORARY                 0x02	/* Node is create by a method and is temporary */

#define ANOBJ_METHOD_ARG                0x04	/* Node is a method argument */

#define ANOBJ_METHOD_LOCAL              0x08	/* Node is a method local */
@@ -428,7 +429,6 @@ struct acpi_gpe_event_info { 
	u8 flags;		/* Misc info about this GPE */

	u8 gpe_number;		/* This GPE */

	u8 runtime_count;	/* References to a run GPE */

	u8 wakeup_count;	/* References to a wake GPE */

};



/* Information about a GPE register pair, one per each status/enable pair in an array */

drivers/acpi/acpica/acnamesp.h

+0 −7
Original line number Diff line number Diff line
@@ -369,11 +369,4 @@ struct acpi_namespace_node *acpi_ns_validate_handle(acpi_handle handle); 


void acpi_ns_terminate(void);



struct acpi_namespace_node *acpi_ns_get_parent_node(struct acpi_namespace_node

						    *node);



struct acpi_namespace_node *acpi_ns_get_next_valid_node(struct

							acpi_namespace_node

							*node);



#endif				/* __ACNAMESP_H__ */