From 62431a72246977a3f95257d6e791aedd020523a9 Mon Sep 17 00:00:00 2001
From: Philipp Deppenwiese <zaolin@das-labor.org>
Date: Wed, 1 Aug 2018 05:29:01 +0200
Subject: [PATCH] southbridge/intel: Remove leftover TPM ACPI code

Remove ACPI code which isn't necessary anymore due
to the LPC TPM ACPI generator.

Change-Id: I2fae286d61ec7c1036d1a8fa800dc8d9603252e9
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/27767
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/southbridge/intel/i82801gx/acpi/lpc.asl  | 23 --------------------
 src/southbridge/intel/lynxpoint/acpi/lpc.asl | 23 --------------------
 2 files changed, 46 deletions(-)

diff --git a/src/southbridge/intel/i82801gx/acpi/lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl
index 2bcd06f03a..87eab07288 100644
--- a/src/southbridge/intel/i82801gx/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl
@@ -199,29 +199,6 @@ Device (LPCB)
 
 	#include "acpi/superio.asl"
 
-#if IS_ENABLED(CONFIG_LPC_TPM)
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-		})
-	}
-#endif
-
 	Device (PS2K)		// Keyboard
 	{
 		Name(_HID, EISAID("PNP0303"))
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
index 1df49e3697..b677e6a543 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
@@ -223,27 +223,4 @@ Device (LPCB)
 	}
 
 	#include "acpi/superio.asl"
-
-#if IS_ENABLED(CONFIG_LPC_TPM)
-	Device (TPM)		// Trusted Platform Module
-	{
-		Name(_HID, EISAID("IFX0102"))
-		Name(_CID, 0x310cd041)
-		Name(_UID, 1)
-
-		Method(_STA, 0)
-		{
-			If (TPMP) {
-				Return (0xf)
-			}
-			Return (0x0)
-		}
-
-		Name(_CRS, ResourceTemplate() {
-			IO (Decode16, 0x2e, 0x2e, 0x01, 0x02)
-			IO (Decode16, 0x6f0, 0x6f0, 0x01, 0x10)
-			Memory32Fixed (ReadWrite, 0xfed40000, 0x5000)
-		})
-	}
-#endif
 }