[coreboot-gerrit] Patch set updated for coreboot: soc/intel/apollolake: Remove hardcode for TCO watchdog timer

[Andrey Petrov (andrey.petrov@intel.com)]

Andrey Petrov (andrey.petrov at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14820

-gerrit

commit e3fafe844cdb41b0255f29951195301c76864b1b
Author: Andrey Petrov <andrey.petrov at intel.com>
Date:   Sun May 15 22:12:35 2016 -0700

    soc/intel/apollolake: Remove hardcode for TCO watchdog timer
    
    Change-Id: Ie528b0ee3d447dcb819ccb7c0f832885da0f4257
    Signed-off-by: Andrey Petrov <andrey.petrov at intel.com>
---
 src/soc/intel/apollolake/include/soc/pm.h | 1 +
 src/soc/intel/apollolake/romstage.c       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h
index fe7a423..6b12886 100644
--- a/src/soc/intel/apollolake/include/soc/pm.h
+++ b/src/soc/intel/apollolake/include/soc/pm.h
@@ -89,6 +89,7 @@
 #define TCO_STS			0x64
 #define   TCO_TIMEOUT		(1 << 3)
 #define TCO1_CNT		0x68
+#define   TCO_TMR_HLT		(1 << 11)
 
 #define GPE0_REG_MAX		4
 #define GPE0_REG_SIZE		32
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index da53799..cfef483 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -94,9 +94,9 @@ static void disable_watchdog(void)
 	uint32_t reg;
 
 	/* Stop TCO timer */
-	reg = inl(ACPI_PMIO_BASE + 0x68);
-	reg |= 1 << 11;
-	outl(reg, ACPI_PMIO_BASE + 0x68);
+	reg = inl(ACPI_PMIO_BASE + TCO1_CNT);
+	reg |= TCO_TMR_HLT;
+	outl(reg, ACPI_PMIO_BASE + TCO1_CNT);
 }
 
 static void migrate_power_state(int is_recovery)