From 4d23b9f18b020aa266ee9b4eac5898803cd4f2fd Mon Sep 17 00:00:00 2001
From: Jamie Ryu <jamie.m.ryu@intel.com>
Date: Fri, 22 Jul 2022 12:03:53 -0700
Subject: [PATCH] mb/intel/mtlrvp: Enable ACPI and add ACPI table

This enables ACPI configuration and add ACPI table.

BUG=b:224325352
TEST=util/abuild/abuild -p none -t intel/mtlrvp -a -c max

Signed-off-by: Jamie Ryu <jamie.m.ryu@intel.com>
Change-Id: I8264197fd0acdd7e19b9a36fb22822447b013202
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66100
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Usha P <usha.p@intel.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
---
 src/mainboard/intel/mtlrvp/Kconfig                 |  1 +
 src/mainboard/intel/mtlrvp/Makefile.inc            |  5 +++++
 src/mainboard/intel/mtlrvp/dsdt.asl                | 14 ++++++++++++++
 .../intel/mtlrvp/include/baseboard/gpio.h          |  9 +++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 src/mainboard/intel/mtlrvp/Makefile.inc
 create mode 100644 src/mainboard/intel/mtlrvp/include/baseboard/gpio.h

diff --git a/src/mainboard/intel/mtlrvp/Kconfig b/src/mainboard/intel/mtlrvp/Kconfig
index 3c29d3ad69..e73d26adf2 100644
--- a/src/mainboard/intel/mtlrvp/Kconfig
+++ b/src/mainboard/intel/mtlrvp/Kconfig
@@ -1,6 +1,7 @@
 config BOARD_INTEL_MTLRVP_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select SOC_INTEL_METEORLAKE
 
diff --git a/src/mainboard/intel/mtlrvp/Makefile.inc b/src/mainboard/intel/mtlrvp/Makefile.inc
new file mode 100644
index 0000000000..830a6d31af
--- /dev/null
+++ b/src/mainboard/intel/mtlrvp/Makefile.inc
@@ -0,0 +1,5 @@
+## SPDX-License-Identifier: GPL-2.0-or-later
+
+CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
+
+subdirs-y += variants/$(VARIANT_DIR)
diff --git a/src/mainboard/intel/mtlrvp/dsdt.asl b/src/mainboard/intel/mtlrvp/dsdt.asl
index 82d11c67fb..f5728a66b7 100644
--- a/src/mainboard/intel/mtlrvp/dsdt.asl
+++ b/src/mainboard/intel/mtlrvp/dsdt.asl
@@ -11,4 +11,18 @@ DefinitionBlock(
 	0x20110725
 )
 {
+	#include <acpi/dsdt_top.asl>
+	#include <cpu/intel/common/acpi/cpu.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/platform.asl>
+
+	Scope (\_SB) {
+		Device (PCI0)
+		{
+			#include <soc/intel/common/block/acpi/acpi/northbridge.asl>
+			#include <soc/intel/meteorlake/acpi/southbridge.asl>
+		}
+	}
+
+	#include <southbridge/intel/common/acpi/sleepstates.asl>
 }
diff --git a/src/mainboard/intel/mtlrvp/include/baseboard/gpio.h b/src/mainboard/intel/mtlrvp/include/baseboard/gpio.h
new file mode 100644
index 0000000000..a708db11ad
--- /dev/null
+++ b/src/mainboard/intel/mtlrvp/include/baseboard/gpio.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __BASEBOARD_GPIO_H__
+#define __BASEBOARD_GPIO_H__
+
+#include <soc/gpe.h>
+#include <soc/gpio.h>
+
+#endif /* __BASEBOARD_GPIO_H__ */