summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-10 17:27:28 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-06-10 17:27:28 +0200
commitede439be684c54f01147e1f65cc565c6baaca1a4 (patch)
tree5c7275a678f53e1f0d4ddc2fd41f6326477adbf7 /include/acpi
parent118d6e98293b30aee378a6b08d27a35320a3e34f (diff)
parent34a09bffd9982fdced603643068c39de867ec778 (diff)
downloadlinux-ede439be684c54f01147e1f65cc565c6baaca1a4.tar.bz2
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20200528 ACPICA: iASL: add new OperationRegion subtype keyword PlatformRtMechanism ACPICA: acpidump: Removed dead code from oslinuxtbl.c
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpixf.h2
-rw-r--r--include/acpi/actypes.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 1dc8d262035b..459d6981ca96 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20200430
+#define ACPI_CA_VERSION 0x20200528
#include <acpi/acconfig.h>
#include <acpi/actypes.h>
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 4defed58ea33..aa236b9e6f24 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -815,8 +815,9 @@ typedef u8 acpi_adr_space_type;
#define ACPI_ADR_SPACE_GPIO (acpi_adr_space_type) 8
#define ACPI_ADR_SPACE_GSBUS (acpi_adr_space_type) 9
#define ACPI_ADR_SPACE_PLATFORM_COMM (acpi_adr_space_type) 10
+#define ACPI_ADR_SPACE_PLATFORM_RT (acpi_adr_space_type) 11
-#define ACPI_NUM_PREDEFINED_REGIONS 11
+#define ACPI_NUM_PREDEFINED_REGIONS 12
/*
* Special Address Spaces