Random ITE Super I/O 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 41a3b1869a4c36ab516e31b8c2061c136b3abd9f..4d41ac34122575d28541364bd3640fb43c3b8f28 100644 (file)
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * 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>
@@ -24,22 +24,18 @@
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
+#include <stdlib.h>
 #include "chip.h"
 #include "it8712f.h"
 
-/* Base address 0x2e: 0x87 0x01 0x55 0x55. */
-/* Base address 0x4e: 0x87 0x01 0x55 0xaa. */
 static void pnp_enter_ext_func_mode(device_t dev)
 {
-       outb(0x87, dev->path.u.pnp.port);
-       outb(0x01, dev->path.u.pnp.port);
-       outb(0x55, dev->path.u.pnp.port);
+       u16 port = dev->path.pnp.port;
 
-       if (dev->path.u.pnp.port == 0x4e) {
-               outb(0xaa, dev->path.u.pnp.port);
-       } else {
-               outb(0x55, dev->path.u.pnp.port);
-       }
+       outb(0x87, port);
+       outb(0x01, port);
+       outb(0x55, port);
+       outb((port == 0x4e) ? 0xaa : 0x55, port);
 }
 
 static void pnp_exit_ext_func_mode(device_t dev)
@@ -49,16 +45,13 @@ static void pnp_exit_ext_func_mode(device_t dev)
 
 static void it8712f_init(device_t dev)
 {
-       struct superio_ite_it8712f_config *conf;
+       struct superio_ite_it8712f_config *conf = dev->chip_info;
        struct resource *res0, *res1;
 
-       if (!dev->enabled) {
+       if (!dev->enabled)
                return;
-       }
 
-       conf = dev->chip_info;
-
-       switch (dev->path.u.pnp.device) {
+       switch (dev->path.pnp.device) {
        case IT8712F_FDC: /* TODO. */
                break;
        case IT8712F_SP1:
@@ -76,7 +69,8 @@ static void it8712f_init(device_t dev)
        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;
@@ -119,25 +113,27 @@ static struct device_operations ops = {
        .init                   = it8712f_init,
 };
 
-/* TODO: FDC, 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_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0},},
-       {&ops, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4},},
-       {&ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4}, },
-       {&ops, IT8712F_KBCM, PNP_IRQ0, },
-       {&ops, IT8712F_GPIO, },
+       {&ops, IT8712F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0xff8, 0},},
+       {&ops, IT8712F_SP1, PNP_IO0 | PNP_IRQ0, {0xff8, 0},},
+       {&ops, IT8712F_SP2, PNP_IO0 | PNP_IRQ0, {0xff8, 0},},
+       {&ops, IT8712F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0xffc, 0},},
+       {&ops, IT8712F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0xff8, 0}, {0xff8, 4},},
+       {&ops, IT8712F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0xfff, 0}, {0xfff, 4},},
+       {&ops, IT8712F_KBCM, PNP_IRQ0,},
+       {&ops, IT8712F_GPIO, PNP_IO0 | PNP_IO1 | PNP_IO2 | PNP_IRQ0, {0xfff, 0}, {0xff8, 0}, {0xff8, 0},},
+       {&ops, IT8712F_MIDI, PNP_IO0 | PNP_IRQ0, {0xff8, 0},},
+       {&ops, IT8712F_GAME, PNP_IO0, {0xfff, 0},},
+       {&ops, IT8712F_IR, PNP_IO0 | PNP_IRQ0, {0xff8, 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 Super I/O")
        .enable_dev = enable_dev,
 };
-