From 4446343adbf191dfa28e2e14adfcfc49424f2f90 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Wed, 16 Jun 2021 16:43:26 +0200
Subject: [PATCH] nb/intel/ironlake: Factor out common uncore ASL

Tested with BUILD_TIMELESS=1, Packard Bell MS2290 remains identical.

Change-Id: I7e37d32251fa3dcc64aec62dd2d814463c4a9999
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55580
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/lenovo/t410/dsdt.asl            | 34 +-----------------
 src/mainboard/lenovo/x201/dsdt.asl            | 34 +-----------------
 src/mainboard/packardbell/ms2290/dsdt.asl     | 34 +-----------------
 .../intel/ironlake/acpi/uncore.asl            | 35 +++++++++++++++++++
 4 files changed, 38 insertions(+), 99 deletions(-)
 create mode 100644 src/northbridge/intel/ironlake/acpi/uncore.asl

diff --git a/src/mainboard/lenovo/t410/dsdt.asl b/src/mainboard/lenovo/t410/dsdt.asl
index 43c7b628b1..42a10e605c 100644
--- a/src/mainboard/lenovo/t410/dsdt.asl
+++ b/src/mainboard/lenovo/t410/dsdt.asl
@@ -36,39 +36,7 @@ DefinitionBlock(
 
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 		}
-		Device (UNCR)
-		{
-			Name (_BBN, 0xFF)
-			Name (RID, 0x00)
-			Name (_HID, EisaId ("PNP0A03"))
-			Name (_CRS, ResourceTemplate ()
-				{
-				WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-						0x0000,	     /* Granularity */
-						0x00FF,	     /* Range Minimum */
-						0x00FF,	     /* Range Maximum */
-						0x0000,	     /* Translation Offset */
-						0x0001,	     /* Length */
-						,, )
-				})
-			Device (SAD)
-			{
-				Name (_ADR, 0x01)
-				Name (RID, 0x00)
-				OperationRegion (SADC, PCI_Config, 0x00, 0x0100)
-				Field (SADC, DWordAcc, NoLock, Preserve)
-				{
-					Offset (0x40),
-					PAM0,   8,
-					PAM1,   8,
-					PAM2,   8,
-					PAM3,   8,
-					PAM4,   8,
-					PAM5,   8,
-					PAM6,   8
-				}
-			}
-		}
+		#include <northbridge/intel/ironlake/acpi/uncore.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index 43c7b628b1..42a10e605c 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -36,39 +36,7 @@ DefinitionBlock(
 
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 		}
-		Device (UNCR)
-		{
-			Name (_BBN, 0xFF)
-			Name (RID, 0x00)
-			Name (_HID, EisaId ("PNP0A03"))
-			Name (_CRS, ResourceTemplate ()
-				{
-				WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-						0x0000,	     /* Granularity */
-						0x00FF,	     /* Range Minimum */
-						0x00FF,	     /* Range Maximum */
-						0x0000,	     /* Translation Offset */
-						0x0001,	     /* Length */
-						,, )
-				})
-			Device (SAD)
-			{
-				Name (_ADR, 0x01)
-				Name (RID, 0x00)
-				OperationRegion (SADC, PCI_Config, 0x00, 0x0100)
-				Field (SADC, DWordAcc, NoLock, Preserve)
-				{
-					Offset (0x40),
-					PAM0,   8,
-					PAM1,   8,
-					PAM2,   8,
-					PAM3,   8,
-					PAM4,   8,
-					PAM5,   8,
-					PAM6,   8
-				}
-			}
-		}
+		#include <northbridge/intel/ironlake/acpi/uncore.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl
index 0fa2cc09c5..187c55a628 100644
--- a/src/mainboard/packardbell/ms2290/dsdt.asl
+++ b/src/mainboard/packardbell/ms2290/dsdt.asl
@@ -31,39 +31,7 @@ DefinitionBlock(
 
 			#include <drivers/intel/gma/acpi/default_brightness_levels.asl>
 		}
-		Device (UNCR)
-		{
-			Name (_BBN, 0xFF)
-			Name (RID, 0x00)
-			Name (_HID, EisaId ("PNP0A03"))
-			Name (_CRS, ResourceTemplate ()
-				{
-				WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-						0x0000,	     /* Granularity */
-						0x00FF,	     /* Range Minimum */
-						0x00FF,	     /* Range Maximum */
-						0x0000,	     /* Translation Offset */
-						0x0001,	     /* Length */
-						,, )
-				})
-			Device (SAD)
-			{
-				Name (_ADR, 0x01)
-				Name (RID, 0x00)
-				OperationRegion (SADC, PCI_Config, 0x00, 0x0100)
-				Field (SADC, DWordAcc, NoLock, Preserve)
-				{
-					Offset (0x40),
-					PAM0,   8,
-					PAM1,   8,
-					PAM2,   8,
-					PAM3,   8,
-					PAM4,   8,
-					PAM5,   8,
-					PAM6,   8
-				}
-			}
-		}
+		#include <northbridge/intel/ironlake/acpi/uncore.asl>
 	}
 
 	#include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/northbridge/intel/ironlake/acpi/uncore.asl b/src/northbridge/intel/ironlake/acpi/uncore.asl
new file mode 100644
index 0000000000..042ab8467a
--- /dev/null
+++ b/src/northbridge/intel/ironlake/acpi/uncore.asl
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+Device (UNCR)
+{
+	Name (_BBN, 0xFF)
+	Name (RID, 0x00)
+	Name (_HID, EisaId ("PNP0A03"))
+	Name (_CRS, ResourceTemplate ()
+		{
+		WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+				0x0000,	     /* Granularity */
+				0x00FF,	     /* Range Minimum */
+				0x00FF,	     /* Range Maximum */
+				0x0000,	     /* Translation Offset */
+				0x0001,	     /* Length */
+				,, )
+		})
+	Device (SAD)
+	{
+		Name (_ADR, 0x01)
+		Name (RID, 0x00)
+		OperationRegion (SADC, PCI_Config, 0x00, 0x0100)
+		Field (SADC, DWordAcc, NoLock, Preserve)
+		{
+			Offset (0x40),
+			PAM0,   8,
+			PAM1,   8,
+			PAM2,   8,
+			PAM3,   8,
+			PAM4,   8,
+			PAM5,   8,
+			PAM6,   8
+		}
+	}
+}