From 7dfd5f707ad181df726c60c1c381c067706d0ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Wed, 12 Jul 2017 07:03:01 +0300
Subject: [PATCH] soc/amd/stoneyridge: Move IMC ASL source
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is not specific to a board but the binary IMC firmware
used on the platform. Also remove unused IMSP and IMWK methods.

Change-Id: I80026bca55f5ba236c080bcd882fc374559942e6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21191
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
---
 .../amd/stoneyridge}/acpi/AmdImc.asl          | 46 -------------------
 src/soc/amd/stoneyridge/acpi/fch.asl          |  4 +-
 2 files changed, 3 insertions(+), 47 deletions(-)
 rename src/{mainboard/amd/gardenia => soc/amd/stoneyridge}/acpi/AmdImc.asl (69%)

diff --git a/src/mainboard/amd/gardenia/acpi/AmdImc.asl b/src/soc/amd/stoneyridge/acpi/AmdImc.asl
similarity index 69%
rename from src/mainboard/amd/gardenia/acpi/AmdImc.asl
rename to src/soc/amd/stoneyridge/acpi/AmdImc.asl
index 970858d324..519b05cf37 100644
--- a/src/mainboard/amd/gardenia/acpi/AmdImc.asl
+++ b/src/soc/amd/stoneyridge/acpi/AmdImc.asl
@@ -62,49 +62,3 @@ Method (ITZE, 0)
 	Store(0x81, MSTI)
 	WACK()
 }
-
-//Sleep
-Method (IMSP, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(1, MRG1)
-	Store(0, MRG2)
-	Store(0x98, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0xB4, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-}
-
-//Wake
-Method (IMWK, 0)
-{
-	Store(0, MRG0)
-	Store(0xB5, MRG1)
-	Store(0, MRG2)
-	Store(0x96, MSTI)
-	WACK()
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(0, MRG2)
-	Store(0x80, MSTI)
-	WACK()
-
-	Or(MRG2, 0x01, Local0)
-
-	Store(0, MRG0)
-	Store(0, MRG1)
-	Store(Local0, MRG2)
-	Store(0x81, MSTI)
-	WACK()
-}
diff --git a/src/soc/amd/stoneyridge/acpi/fch.asl b/src/soc/amd/stoneyridge/acpi/fch.asl
index 6a815b33ff..6dcafe6faf 100644
--- a/src/soc/amd/stoneyridge/acpi/fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/fch.asl
@@ -155,11 +155,13 @@ Method(_INI, 0) {
 	/* Determine the OS we're running on */
 	OSFL()
 
-#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
+#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)
 	/* TODO: It is unstable. */
 	#include "acpi/AmdImc.asl"
+#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)
 	ITZE() /* enable IMC Fan Control*/
 #endif
+#endif
 } /* End Method(_SB._INI) */
 
 Method(OSFL, 0){