Fix my last commit. I looked at the wrong dead laptop.

[coreboot.git] / util / superiotool / fintek.c

diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index ea3bdb157aa424bac0e541a8928360ff5b59b292..701bd4c6f6ba7d603075600aca4787d674e4c4cf 100644 (file)
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -2,7 +2,7 @@
  * This file is part of the superiotool project.
  *
  * Copyright (C) 2006 coresystems GmbH <info@coresystems.de>
- * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2007-2008 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
@@ -30,19 +30,59 @@
 #define FINTEK_VENDOR_ID       0x3419
 
 static const struct superio_registers reg_table[] = {
-       {0x0106, "F71862FG", {
+       {0x0106, "F71862FG / F71863FG", {       /* Same ID? Datasheet typo? */
                {EOT}}},
        {0x4103, "F71872F/FG / F71806F/FG", {   /* Same ID? Datasheet typo? */
                {EOT}}},
        {0x4105, "F71882FG/F71883FG", {         /* Same ID? Datasheet typo? */
+               /* We assume reserved bits are read as 0. */
+               {NOLDN, NULL,
+                       {0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,
+                        0x2b,0x2c,0x2d,EOT},
+                       {0x05,0x41,0x19,0x34,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x08,0x08,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf2,0xf4,EOT},
+                       {0x01,0x03,0xf0,0x06,0x02,0x0e,0x03,0x00,EOT}},
+               {0x1, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x01,0x03,0xf8,0x04,0x00,EOT}},
+               {0x2, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+                       {0x01,0x02,0xf8,0x03,0x00,0x04,EOT}},
+               {0x3, "Parallel port",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
+                       {0x01,0x03,0x78,0x07,0x03,0x42,EOT}},
+               {0x4, "Hardware monitor",
+                       {0x30,0x60,0x61,0x70,EOT},
+                       {0x01,0x02,0x95,0x00,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x70,0x72,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x00,0x83,EOT}},
+               {0x6, "GPIO",
+                       {0x70,0xe0,0xe1,0xe2,0xe3,0xd0,0xd1,0xd2,0xd3,0xc0,
+                        0xc1,0xc2,0xc3,0xb0,0xb1,0xb2,0xb3,0xf0,0xf1,0xf2,
+                        0xf3,EOT},
+                       {0x00,0x00,0xff,NANA,0x00,0x00,0xff,NANA,0x00,0x00,
+                        0x0f,NANA,0x00,0x00,0x0f,NANA,0x00,0x00,0xff,NANA,
+                        0x00,EOT}},
+               {0x7, "VID",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x7, "SPI",
+                       {0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xfa,
+                        0xfb,0xfc,0xfd,0xfe,0xff,EOT},
+                       {0x10,0x04,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,EOT}},
+               {0xa, "PME, ACPI",
+                       {0x30,0xf0,0xf1,0xf4,0xf5,EOT},
+                       {0x00,0x00,0x01,0x06,0x1c,EOT}},
                {EOT}}},
        {0x0604, "F71805F/FG", {
                /* We assume reserved bits are read as 0. */
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,
-                        0x29,EOT},
-                       {NANA,0x04,0x06,0x19,0x34,0x00,0x00,0x3f,0x08,
-                        0x00,EOT}},
+                       {0x20,0x21,0x23,0x24,0x25,0x26,0x27,0x28,0x29,EOT},
+                       {0x04,0x06,0x19,0x34,0x00,0x00,0x3f,0x08,0x00,EOT}},
                {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf2,0xf4,EOT},
                        {0x01,0x03,0xf0,0x06,0x02,0x0e,0x03,0x00,EOT}},
@@ -97,7 +137,7 @@ void probe_idregs_fintek(uint16_t port)
               get_superio_name(reg_table, did), vid, did, port);
        chip_found = 1;
 
-       dump_superio("Fintek", reg_table, port, did);
+       dump_superio("Fintek", reg_table, port, did, LDN_SEL);
 
        exit_conf_mode_winbond_fintek_ite_8787(port);
 }