This patch adds support for watchdog kill and adds it to Asus M2V-MX SE.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Marc Jones <marc.jones@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3595 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

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 87248cb833bbc09e5db3cc0a737b818bca4babb2..7d30c0dcf68664e51413a7aa74a4b5b635572e85 100644 (file)
--- 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 dd84245dc4a3c3f10e58fd6a5791e6ef375b3c06..9758e868fd30e6ce2986de1c6f4fc70c5d2570d9 100644 (file)
--- 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)
 {