Change in coreboot[master]: soc/amd/stoneyridge: Fix guarded code in ACPI ASL

[John E. Kabat Jr. (Code Review)]

John E. Kabat Jr. has uploaded this change for review. ( https://review.coreboot.org/22634

Change subject: soc/amd/stoneyridge: Fix guarded code in ACPI ASL
......................................................................

soc/amd/stoneyridge: Fix guarded code in ACPI ASL

Remove #if statements in sb_pci0_fch as Stoneyridge does not support IMC.
Change sleepstates.asl to remove #if and change to:
If (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME))

Change-Id: I71c6acb235df9aa8642dca4c85d2bf604e244bf4
Signed-off-by: John E. Kabat Jr 
---
M src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
M src/soc/amd/stoneyridge/acpi/sleepstates.asl
2 files changed, 5 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/22634/1

diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
index 216b57c..4aba2f9 100644
--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl
@@ -155,13 +155,6 @@
    /* Determine the OS we're running on */
    OSFL()

-#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){
diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl
index 2f36738..9bcf15f 100644
--- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl
+++ b/src/soc/amd/stoneyridge/acpi/sleepstates.asl
@@ -15,11 +15,11 @@
  */

/* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
-Name (SSFG, 0x0D)
-#else
-Name (SSFG, 0x09)
-#endif
+Name(SSFG, 0x09)
+if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) {
+	Store(0x0D, SSFG)
+}
+

/* Supported sleep states: */
 Name(_S0, Package () {0x00, 0x00, 0x00, 0x00} )	/* (S0) - working state */