Patch from Uwe Hermann:

* support for it8716f. 
* minor fixes for it8712f, it8671f, it8673f



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2396 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

10 files changed, 258 insertions, 5 deletions

diff --git a/src/superio/ite/it8671f/it8671f.h b/src/superio/ite/it8671f/it8671f.h
index 98ef0f75ab..ac3733dbc5 100644
--- a/src/superio/ite/it8671f/it8671f.h
+++ b/src/superio/ite/it8671f/it8671f.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* Datasheet: Not available online, got it from ITE per request. */
+/* Status: Com1 is tested and works. */
+
 #define IT8671F_FDC  0x00 /* Floppy */
 #define IT8671F_SP1  0x01 /* Com1 */
 #define IT8671F_SP2  0x02 /* Com2 */
diff --git a/src/superio/ite/it8671f/it8671f_early_serial.c b/src/superio/ite/it8671f/it8671f_early_serial.c
index 31ea97f506..26feee27cd 100644
--- a/src/superio/ite/it8671f/it8671f_early_serial.c
+++ b/src/superio/ite/it8671f/it8671f_early_serial.c
@@ -20,9 +20,9 @@
 #include "it8671f.h"
 
 /* The base address is 0x3f0, 0x3bd, or 0x370, depending on config bytes. */
-#define SIO_BASE                    0x3f0
-#define SIO_INDEX                   SIO_BASE
-#define SIO_DATA                    SIO_BASE+1
+#define SIO_BASE                   0x3f0
+#define SIO_INDEX                  SIO_BASE
+#define SIO_DATA                   SIO_BASE+1
 
 /* Global Configuration Registers. */
 #define IT8671F_CONFIG_REG_CC      0x02   /* Configure Control (write-only). */
@@ -31,7 +31,6 @@
 #define IT8671F_CONFIG_REG_SWSUSP  0x24   /* Software Suspend. */
 
 #define IT8671F_CONFIGURATION_PORT 0x0279 /* Write-only. */
-#define IT8671F_WRITE_DATA_PORT    0x0A79 /* Write-only. */
 
 /* Special values used for entering MB PnP mode. The first four bytes of
  * each line determine the address port, the last four are data. */
diff --git a/src/superio/ite/it8673f/it8673f.h b/src/superio/ite/it8673f/it8673f.h
index 38ca7017bc..88e2ea0555 100644
--- a/src/superio/ite/it8673f/it8673f.h
+++ b/src/superio/ite/it8673f/it8673f.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* Datasheet: http://www.datasheet4u.com/html/I/T/8/IT8673F_ITE.pdf.html */
+/* Status: untested on real hardware, but it compiles. */
+
 #define IT8673F_FDC  0x00 /* Floppy */
 #define IT8673F_SP1  0x01 /* Com1 */
 #define IT8673F_SP2  0x02 /* Com2 */
diff --git a/src/superio/ite/it8712f/it8712f.h b/src/superio/ite/it8712f/it8712f.h
index 27df272061..dd60293f1d 100644
--- a/src/superio/ite/it8712f/it8712f.h
+++ b/src/superio/ite/it8712f/it8712f.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8712_2.asp */
+/* Status: untested on real hardware, but it compiles. */
+
 #define IT8712F_FDC  0x00 /* Floppy */
 #define IT8712F_SP1  0x01 /* Com1 */
 #define IT8712F_SP2  0x02 /* Com2 */
diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c
index 74b0f21f18..33e020ea40 100644
--- a/src/superio/ite/it8712f/it8712f_early_serial.c
+++ b/src/superio/ite/it8712f/it8712f_early_serial.c
@@ -31,7 +31,7 @@
 #define IT8712F_CONFIG_REG_CLOCKSEL  0x23 /* Clock Selection. */
 #define IT8712F_CONFIG_REG_SWSUSP    0x24 /* Software Suspend, Flash I/F. */
 
-#define IT8712F_CONFIGURATION_PORT   0x2E /* Write-only. */
+#define IT8712F_CONFIGURATION_PORT   0x2e /* Write-only. */
 
 /* The content of IT8712F_CONFIG_REG_LDN (index 0x07) must be set to the
  * LDN the register belongs to, before you can access the register. */
diff --git a/src/superio/ite/it8716f/Config.lb b/src/superio/ite/it8716f/Config.lb
new file mode 100644
index 0000000000..f62a567d61
--- /dev/null
+++ b/src/superio/ite/it8716f/Config.lb
@@ -0,0 +1,2 @@
+config chip.h
+object superio.o
diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h
new file mode 100644
index 0000000000..33e732fc55
--- /dev/null
+++ b/src/superio/ite/it8716f/chip.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef _SUPERIO_ITE_IT8716F
+#define _SUPERIO_ITE_IT8716F
+
+#include <pc80/keyboard.h>
+#include <uart8250.h>
+
+extern struct chip_operations superio_ITE_it8716f_ops;
+
+struct superio_ITE_it8716f_config {
+	struct uart8250 com1, com2;
+	struct pc_keyboard keyboard;
+};
+
+#endif /* _SUPERIO_ITE_IT8716F */
+
diff --git a/src/superio/ite/it8716f/it8716f.h b/src/superio/ite/it8716f/it8716f.h
new file mode 100644
index 0000000000..81cb095a41
--- /dev/null
+++ b/src/superio/ite/it8716f/it8716f.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+/* Datasheet: http://www.ite.com.tw/product_info/PC/Brief-IT8716_2.asp */
+/* Status: untested on real hardware, but it compiles. */
+
+#define IT8716F_FDC  0x00 /* Floppy */
+#define IT8716F_SP1  0x01 /* Com1 */
+#define IT8716F_SP2  0x02 /* Com2 */
+#define IT8716F_PP   0x03 /* Parallel port */
+#define IT8716F_EC   0x04 /* Environment controller */
+#define IT8716F_KBCK 0x05 /* Keyboard */
+#define IT8716F_KBCM 0x06 /* Mouse */
+#define IT8716F_MIDI 0x08 /* MIDI port */
+#define IT8716F_GAME 0x09 /* GAME port */
+#define IT8716F_IR   0x0a /* Consumer IR */
+
diff --git a/src/superio/ite/it8716f/it8716f_early_serial.c b/src/superio/ite/it8716f/it8716f_early_serial.c
new file mode 100644
index 0000000000..65a220f0f9
--- /dev/null
+++ b/src/superio/ite/it8716f/it8716f_early_serial.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <arch/romcc_io.h>
+#include "it8716f.h"
+
+/* The base address is 0x2e or 0x4e, depending on config bytes. */
+#define SIO_BASE                     0x2e
+#define SIO_INDEX                    SIO_BASE
+#define SIO_DATA                     SIO_BASE+1
+
+/* Global Configuration Registers. */
+#define IT8716F_CONFIG_REG_CC        0x02 /* Configure Control (write-only). */
+#define IT8716F_CONFIG_REG_LDN       0x07 /* Logical Device Number. */
+#define IT8716F_CONFIG_REG_CONFIGSEL 0x22 /* Configuration Select. */
+#define IT8716F_CONFIG_REG_CLOCKSEL  0x23 /* Clock Selection. */
+#define IT8716F_CONFIG_REG_SWSUSP    0x24 /* Software Suspend, Flash I/F. */
+
+#define IT8716F_CONFIGURATION_PORT   0x2e /* Write-only. */
+
+/* The content of IT8716F_CONFIG_REG_LDN (index 0x07) must be set to the
+ * LDN the register belongs to, before you can access the register. */
+static void it8716f_sio_write(uint8_t ldn, uint8_t index, uint8_t value)
+{
+	outb(IT8716F_CONFIG_REG_LDN, SIO_BASE);
+	outb(ldn, SIO_DATA);
+	outb(index, SIO_BASE);
+	outb(value, SIO_DATA);
+}
+
+/* Enable the peripheral devices on the IT8716F Super IO chip. */
+static void it8716f_enable_serial(device_t dev, unsigned iobase)
+{
+	/* (1) Enter the configuration state (MB PnP mode). */
+
+	/* Perform MB PnP setup to put the SIO chip at 0x2e. */
+	/* Base address 0x2e: 0x87 0x01 0x55 0x55. */
+	/* Base address 0x4e: 0x87 0x01 0x55 0xaa. */
+	outb(0x87, IT8716F_CONFIGURATION_PORT);
+	outb(0x01, IT8716F_CONFIGURATION_PORT);
+	outb(0x55, IT8716F_CONFIGURATION_PORT);
+	outb(0x55, IT8716F_CONFIGURATION_PORT);
+
+	/* (2) Modify the data of configuration registers. */
+
+	/* Select the chip to configure (if there's more than one).
+         * Set bit 7 to select JP3=1, clear bit 7 to select JP3=0.
+         * If this register is not written, both chips are configured. */
+	/* it8716f_sio_write(0x00, IT8716F_CONFIG_REG_CONFIGSEL, 0x00); */
+
+	/* Enable all devices. */
+	it8716f_sio_write(IT8716F_FDC,  0x30, 0x1); /* Floppy */
+	it8716f_sio_write(IT8716F_SP1,  0x30, 0x1); /* Serial port 1 */
+	it8716f_sio_write(IT8716F_SP2,  0x30, 0x1); /* Serial port 2 */
+	it8716f_sio_write(IT8716F_PP,   0x30, 0x1); /* Parallel port */
+	it8716f_sio_write(IT8716F_EC,   0x30, 0x1); /* Environment controller */
+	it8716f_sio_write(IT8716F_KBCK, 0x30, 0x1); /* Keyboard */
+	it8716f_sio_write(IT8716F_KBCM, 0x30, 0x1); /* Mouse */
+	it8716f_sio_write(IT8716F_MIDI, 0x30, 0x1); /* MIDI port */
+	it8716f_sio_write(IT8716F_GAME, 0x30, 0x1); /* GAME port */
+	it8716f_sio_write(IT8716F_IR,   0x30, 0x1); /* Consumer IR */
+
+	/* Select 24MHz/48MHz CLKIN (set/clear bit 0). TODO: Needed? */
+	/* it8716f_sio_write(0x00, IT8716F_CONFIG_REG_CLOCKSEL, 0x00); */
+
+	/* Clear software suspend mode (clear bit 0). TODO: Needed? */
+	/* it8716f_sio_write(0x00, IT8716F_CONFIG_REG_SWSUSP, 0x00); */
+
+	/* (3) Exit the configuration state (MB PnP mode). */
+	it8716f_sio_write(0x00, IT8716F_CONFIG_REG_CC, 0x02); 
+}
+
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
new file mode 100644
index 0000000000..f0d6d5f95b
--- /dev/null
+++ b/src/superio/ite/it8716f/superio.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <uart8250.h>
+#include <pc80/keyboard.h>
+#include "chip.h"
+#include "it8716f.h"
+
+static void init(device_t dev)
+{
+	struct superio_ITE_it8716f_config *conf;
+	struct resource *res0, *res1;
+
+	if (!dev->enabled) {
+		return;
+	}
+
+	conf = dev->chip_info;
+
+	switch (dev->path.u.pnp.device) {
+	case IT8716F_FDC: /* TODO. */
+		break;
+	case IT8716F_SP1:
+		res0 = find_resource(dev, PNP_IDX_IO0);
+		init_uart8250(res0->base, &conf->com1);
+		break;
+	case IT8716F_SP2:
+		res0 = find_resource(dev, PNP_IDX_IO0);
+		init_uart8250(res0->base, &conf->com2);
+		break;
+	case IT8716F_PP: /* TODO. */
+		break;
+	case IT8716F_EC: /* TODO. */
+		break;
+	case IT8716F_KBCK:
+		res0 = find_resource(dev, PNP_IDX_IO0);
+		res1 = find_resource(dev, PNP_IDX_IO1);
+		init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+		break;
+	case IT8716F_KBCM: /* TODO. */
+		break;
+	case IT8716F_MIDI: /* TODO. */
+		break;
+	case IT8716F_GAME: /* TODO. */
+		break;
+	case IT8716F_IR: /* TODO. */
+		break;
+	}
+}
+
+static struct device_operations ops = {
+	.read_resources   = pnp_read_resources,
+	.set_resources    = pnp_set_resources,
+	.enable_resources = pnp_enable_resources,
+	.enable           = pnp_enable,
+	.init             = init,
+};
+
+/* TODO: FDC, PP, EC, KBCM, MIDI, GAME, IR. */
+static struct pnp_info pnp_dev_info[] = {
+ { &ops, IT8716F_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, IT8716F_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
+ { &ops, IT8716F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, },
+};
+
+static void enable_dev(struct device *dev)
+{
+	pnp_enable_devices(dev, &pnp_ops,
+		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
+}
+
+struct chip_operations superio_ITE_it8716f_ops = {
+	CHIP_NAME("ITE it8716f")
+	.enable_dev = enable_dev,
+};
+