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

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

Merge branch 'acpica' into acpi-sysfs

parents 18864cc4 86ec64bc

drivers/acpi/acpica/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ acpi-y += \ 
	utresrc.o	\

	utstate.o	\

	utstring.o	\

	utstrtoul64.o	\

	utxface.o	\

	utxfinit.o	\

	utxferror.o	\

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ acpi_status acpi_db_disassemble_method(char *name); 


void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);



void acpi_db_batch_execute(char *count_arg);

void acpi_db_evaluate_predefined_names(void);



/*

 * dbnames - namespace commands

drivers/acpi/acpica/acnamesp.h

+8 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ struct acpi_namespace_node *acpi_ns_get_next_node_typed(acpi_object_type type, 
acpi_status

acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node);



acpi_status

acpi_ns_execute_table(u32 table_index, struct acpi_namespace_node *start_node);



acpi_status

acpi_ns_one_complete_parse(u32 pass_number,

			   u32 table_index,
@@ -295,6 +298,11 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle, 
u8

acpi_ns_pattern_match(struct acpi_namespace_node *obj_node, char *search_for);



acpi_status

acpi_ns_get_node_unlocked(struct acpi_namespace_node *prefix_node,

			  const char *external_pathname,

			  u32 flags, struct acpi_namespace_node **out_node);



acpi_status

acpi_ns_get_node(struct acpi_namespace_node *prefix_node,

		 const char *external_pathname,

drivers/acpi/acpica/acparser.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ extern const u8 acpi_gbl_long_op_index[]; 
 */

acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info);



acpi_status acpi_ps_execute_table(struct acpi_evaluate_info *info);



/*

 * psargs - Parse AML opcode arguments

 */

drivers/acpi/acpica/actables.h

+9 −6
Original line number Diff line number Diff line
@@ -123,6 +123,14 @@ acpi_tb_install_standard_table(acpi_physical_address address, 


void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc);



acpi_status

acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node);



acpi_status

acpi_tb_install_and_load_table(struct acpi_table_header *table,

			       acpi_physical_address address,

			       u8 flags, u8 override, u32 *table_index);



void acpi_tb_terminate(void);



acpi_status acpi_tb_delete_namespace_by_owner(u32 table_index);
@@ -155,12 +163,7 @@ void 
acpi_tb_install_table_with_override(struct acpi_table_desc *new_table_desc,

				    u8 override, u32 *table_index);



acpi_status

acpi_tb_install_fixed_table(acpi_physical_address address,

			    char *signature, u32 *table_index);



acpi_status ACPI_INIT_FUNCTION

acpi_tb_parse_root_table(acpi_physical_address rsdp_address);

acpi_status acpi_tb_parse_root_table(acpi_physical_address rsdp_address);



/*

 * tbxfload