From e7ff9d8839b0f7718f208f31bb7e7e504a97c657 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 10 Oct 2014 09:38:44 +0200
Subject: fsp_sandybridge: Move to per-device ACPI.

Just took combined sandybridge per-device ACPI patch and applied it
on FSP flavour to avoid need of separate tests.

Change-Id: I09838cc01ede504416078edcb1c267a11539e714
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/7044
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 src/northbridge/intel/fsp_sandybridge/Kconfig       |  2 ++
 src/northbridge/intel/fsp_sandybridge/acpi.c        | 15 +++++++++++++++
 src/northbridge/intel/fsp_sandybridge/northbridge.c |  1 +
 3 files changed, 18 insertions(+)

(limited to 'src/northbridge/intel/fsp_sandybridge')

diff --git a/src/northbridge/intel/fsp_sandybridge/Kconfig b/src/northbridge/intel/fsp_sandybridge/Kconfig
index 94fd3304f0..4eb5b8efa0 100644
--- a/src/northbridge/intel/fsp_sandybridge/Kconfig
+++ b/src/northbridge/intel/fsp_sandybridge/Kconfig
@@ -21,10 +21,12 @@
 config NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE
 	bool
 	select CPU_INTEL_FSP_MODEL_206AX
+	select PER_DEVICE_ACPI_TABLES
 
 config NORTHBRIDGE_INTEL_FSP_IVYBRIDGE
 	bool
 	select CPU_INTEL_FSP_MODEL_306AX
+	select PER_DEVICE_ACPI_TABLES
 
 if NORTHBRIDGE_INTEL_FSP_IVYBRIDGE || NORTHBRIDGE_INTEL_FSP_SANDYBRIDGE
 
diff --git a/src/northbridge/intel/fsp_sandybridge/acpi.c b/src/northbridge/intel/fsp_sandybridge/acpi.c
index faef4d71f9..d820139db4 100644
--- a/src/northbridge/intel/fsp_sandybridge/acpi.c
+++ b/src/northbridge/intel/fsp_sandybridge/acpi.c
@@ -29,7 +29,10 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <build.h>
+#include <drivers/intel/gma/i915.h>
+#include <arch/acpigen.h>
 #include "northbridge.h"
+#include <cbmem.h>
 
 unsigned long acpi_fill_mcfg(unsigned long current)
 {
@@ -198,3 +201,15 @@ int init_igd_opregion(igd_opregion_t *opregion)
 
 	return 0;
 }
+
+void *igd_make_opregion(void)
+{
+	igd_opregion_t *opregion;
+
+	printk(BIOS_DEBUG, "ACPI:    * IGD OpRegion\n");
+	opregion = cbmem_add(CBMEM_ID_IGD_OPREGION, sizeof (*opregion));
+	if (opregion)
+		init_igd_opregion(opregion);
+	return opregion;
+}
+
diff --git a/src/northbridge/intel/fsp_sandybridge/northbridge.c b/src/northbridge/intel/fsp_sandybridge/northbridge.c
index 182252d00b..a16453638e 100644
--- a/src/northbridge/intel/fsp_sandybridge/northbridge.c
+++ b/src/northbridge/intel/fsp_sandybridge/northbridge.c
@@ -354,6 +354,7 @@ static struct device_operations mc_ops = {
 	.enable           = northbridge_enable,
 	.scan_bus         = 0,
 	.ops_pci          = &intel_pci_ops,
+	.acpi_fill_ssdt_generator = generate_cpu_entries,
 };
 
 static const struct pci_driver mc_driver_0100 __pci_driver = {
-- 
cgit v1.2.3