~hc/RK356X_SDK_RELEASE.git

..	..	@@ -3,7 +3,7 @@
3	3	*
4	4	* Name: aclocal.h - Internal data types used across the ACPI subsystem
5	5	*
6		- * Copyright (C) 2000 - 2018, Intel Corp.
	6	+ * Copyright (C) 2000 - 2020, Intel Corp.
7	7	*
8	8	*****************************************************************************/
9	9
..	..	@@ -134,12 +134,12 @@
134	134	union acpi_operand_object object; / Interpreter object */
135	135	u8 descriptor_type; /* Differentiate object descriptor types */
136	136	u8 type; /* ACPI Type associated with this name */
137		- u8 flags; /* Miscellaneous flags */
138		- acpi_owner_id owner_id; /* Node creator */
	137	+ u16 flags; /* Miscellaneous flags */
139	138	union acpi_name_union name; /* ACPI Name, always 4 chars per ACPI spec */
140	139	struct acpi_namespace_node parent; / Parent node */
141	140	struct acpi_namespace_node child; / First child */
142	141	struct acpi_namespace_node peer; / First peer */
	142	+ acpi_owner_id owner_id; /* Node creator */
143	143
144	144	/*
145	145	* The following fields are used by the ASL compiler and disassembler only
..	..	@@ -293,7 +293,7 @@
293	293	* expected_return_btypes - Allowed type(s) for the return value
294	294	*/
295	295	struct acpi_name_info {
296		- char name[ACPI_NAME_SIZE];
	296	+ char name[ACPI_NAMESEG_SIZE];
297	297	u16 argument_list;
298	298	u8 expected_btypes;
299	299	};
..	..	@@ -370,7 +370,7 @@
370	370	converted_object);
371	371
372	372	struct acpi_simple_repair_info {
373		- char name[ACPI_NAME_SIZE];
	373	+ char name[ACPI_NAMESEG_SIZE];
374	374	u32 unexpected_btypes;
375	375	u32 package_index;
376	376	acpi_object_converter object_converter;
..	..	@@ -454,11 +454,18 @@
454	454	u8 disable_for_dispatch; /* Masked during dispatching */
455	455	};
456	456
	457	+/* GPE register address */
	458	+
	459	+struct acpi_gpe_address {
	460	+ u8 space_id; /* Address space where the register exists */
	461	+ u64 address; /* 64-bit address of the register */
	462	+};
	463	+
457	464	/* Information about a GPE register pair, one per each status/enable pair in an array */
458	465
459	466	struct acpi_gpe_register_info {
460		- struct acpi_generic_address status_address; /* Address of status reg */
461		- struct acpi_generic_address enable_address; /* Address of enable reg */
	467	+ struct acpi_gpe_address status_address; /* Address of status reg */
	468	+ struct acpi_gpe_address enable_address; /* Address of enable reg */
462	469	u16 base_gpe_number; /* Base GPE number for this register */
463	470	u8 enable_for_wake; /* GPEs to keep enabled when sleeping */
464	471	u8 enable_for_run; /* GPEs to keep enabled when running */
..	..	@@ -802,7 +809,7 @@
802	809
803	810	/*
804	811	* File node - used for "Include" operator file stack and
805		- * depdendency tree for the -ca option
	812	+ * dependency tree for the -ca option
806	813	*/
807	814	struct acpi_file_node {
808	815	void *file;