summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c2
-rw-r--r--src/superio/ite/it8712f/it8712f_early_serial.c11
2 files changed, 13 insertions, 0 deletions
diff --git a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c
index 87248cb833..7d30c0dcf6 100644
--- a/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c
+++ b/src/mainboard/asus/m2v-mx_se/cache_as_ram_auto.c
@@ -157,6 +157,7 @@ void failover_process(unsigned long bist, unsigned long cpu_init_detectedx)
sio_init();
it8712f_enable_serial(SERIAL_DEV, TTYS0_BASE);
+ it8712f_kill_watchdog();
uart_init();
console_init();
enable_rom_decode();
@@ -226,6 +227,7 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx)
sio_init();
it8712f_enable_serial(SERIAL_DEV, TTYS0_BASE);
+ it8712f_kill_watchdog();
uart_init();
console_init();
enable_rom_decode();
diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c
index dd84245dc4..9758e868fd 100644
--- a/src/superio/ite/it8712f/it8712f_early_serial.c
+++ b/src/superio/ite/it8712f/it8712f_early_serial.c
@@ -32,6 +32,7 @@
#define IT8712F_CONFIG_REG_CONFIGSEL 0x22 /* Configuration Select. */
#define IT8712F_CONFIG_REG_CLOCKSEL 0x23 /* Clock Selection. */
#define IT8712F_CONFIG_REG_SWSUSP 0x24 /* Software Suspend, Flash I/F. */
+#define IT8712F_CONFIG_REG_WATCHDOG 0x72 /* Watchdog control. */
#define IT8712F_CONFIGURATION_PORT 0x2e /* Write-only. */
@@ -77,6 +78,16 @@ static void it8712f_24mhz_clkin(void)
}
+static void it8712f_kill_watchdog(void)
+{
+ it8712f_enter_conf();
+
+ /* Kill the Watchdog */
+ it8712f_sio_write(0x07, IT8712F_CONFIG_REG_WATCHDOG, 0x00);
+
+ it8712f_exit_conf();
+}
+
/* Enable the peripheral devices on the IT8712F Super I/O chip. */
static void it8712f_enable_serial(device_t dev, unsigned iobase)
{