merge latest code from Uwe Hermann

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

diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index ca2811ab814df380f859ba1a9d865d7f6ec1ff0e..cc9f65e32eeb13c20435dea87058556194eccc57 100644 (file)
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -33,8 +33,7 @@ static void init(device_t dev)
        conf = dev->chip_info;
 
        switch (dev->path.u.pnp.device) {
-       case IT8671F_FDC:
-               /* TODO. */
+       case IT8671F_FDC: /* TODO. */
                break;
        case IT8671F_SP1:
                res0 = find_resource(dev, PNP_IDX_IO0);
@@ -44,11 +43,15 @@ static void init(device_t dev)
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com2);
                break;
+       case IT8671F_PP: /* TODO. */
+               break;
        case IT8671F_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 IT8671F_KBCM: /* TODO. */
+               break;
        }
 }
 
@@ -60,12 +63,10 @@ static struct device_operations ops = {
        .init             = init,
 };
 
-/* TODO: Find and check datasheet. */
+/* TODO: FDC, PP, KBCM. */
 static struct pnp_info pnp_dev_info[] = {
- { &ops, IT8671F_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07fa, 0}, },
- /* { &ops, IT8671F_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x04f8, 0}, }, */
- { &ops, IT8671F_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
  { &ops, IT8671F_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
+ { &ops, IT8671F_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, },
  { &ops, IT8671F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, },
 };