C and other Super I/O cosmetic fixes.

[coreboot.git] / src / superio / ite / it8712f / superio.c

diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index a2e4ff048a04deab7ad7523458f35d67e4524697..67bbac4403d81d9756dc44be37279342689c64c2 100644 (file)
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -1,5 +1,8 @@
 /*
+ * This file is part of the coreboot project.
+ *
  * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2007 Philipp Degler <pdegler@rumms.uni-mannheim.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
@@ -16,23 +19,39 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <device/device.h>
+#include <device/pnp.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
+#include <arch/io.h>
+#include <stdlib.h>
 #include "chip.h"
 #include "it8712f.h"
 
-static void init(device_t dev)
+static void pnp_enter_ext_func_mode(device_t dev)
 {
-       struct superio_ite_it8712f_config *conf;
-       struct resource *res0, *res1;
+       u16 port = dev->path.pnp.port;
 
-       if (!dev->enabled) {
-               return;
-       }
+       outb(0x87, port);
+       outb(0x01, port);
+       outb(0x55, port);
+       outb((port == 0x4e) ? 0xaa : 0x55, port);
+}
 
-       conf = dev->chip_info;
+static void pnp_exit_ext_func_mode(device_t dev)
+{
+       pnp_write_config(dev, 0x02, 0x02);
+}
 
-       switch (dev->path.u.pnp.device) {
+static void it8712f_init(device_t dev)
+{
+       struct superio_ite_it8712f_config *conf = dev->chip_info;
+       struct resource *res0;
+
+       if (!dev->enabled)
+               return;
+
+       switch (dev->path.pnp.device) {
        case IT8712F_FDC: /* TODO. */
                break;
        case IT8712F_SP1:
@@ -48,9 +67,8 @@ static void init(device_t dev)
        case IT8712F_EC: /* TODO. */
                break;
        case IT8712F_KBCK:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
-               init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+               set_kbc_ps2_mode();
+               pc_keyboard_init(&conf->keyboard);
                break;
        case IT8712F_KBCM: /* TODO. */
                break;
@@ -63,29 +81,57 @@ static void init(device_t dev)
        }
 }
 
+static void it8712f_pnp_set_resources(device_t dev)
+{
+       pnp_enter_ext_func_mode(dev);
+       pnp_set_resources(dev);
+       pnp_exit_ext_func_mode(dev);
+}
+
+static void it8712f_pnp_enable_resources(device_t dev)
+{
+       pnp_enter_ext_func_mode(dev);
+       pnp_enable_resources(dev);
+       pnp_exit_ext_func_mode(dev);
+}
+
+static void it8712f_pnp_enable(device_t dev)
+{
+       pnp_enter_ext_func_mode(dev);
+       pnp_set_logical_device(dev);
+       pnp_set_enable(dev, dev->enabled);
+       pnp_exit_ext_func_mode(dev);
+}
+
 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,
+       .read_resources         = pnp_read_resources,
+       .set_resources          = it8712f_pnp_set_resources,
+       .enable_resources       = it8712f_pnp_enable_resources,
+       .enable                 = it8712f_pnp_enable,
+       .init                   = it8712f_init,
 };
 
-/* TODO: FDC, PP, EC, KBCM, MIDI, GAME, IR. */
 static struct pnp_info pnp_dev_info[] = {
- { &ops, IT8712F_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
- { &ops, IT8712F_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
- { &ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, },
+       { &ops, IT8712F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x0ff8, 0}, },
+       { &ops, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+       { &ops, IT8712F_SP2, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+       { &ops, IT8712F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x0ffc, 0}, },
+       { &ops, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0ff8, 0}, {0x0ff8, 4}, },
+       { &ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0fff, 0}, {0x0fff, 4}, },
+       { &ops, IT8712F_KBCM, PNP_IRQ0, },
+       { &ops, IT8712F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, {0x0fff, 0}, {0x0ff8, 0}, {0x0ff8, 0}, },
+       { &ops, IT8712F_MIDI, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
+       { &ops, IT8712F_GAME, PNP_IO0, {0x0fff, 0}, },
+       { &ops, IT8712F_IR, PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
 };
 
 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);
+               ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_ite_it8712f_ops = {
-       CHIP_NAME("ITE it8712f")
+       CHIP_NAME("ITE IT8712F Super I/O")
        .enable_dev = enable_dev,
 };
-