Add support for the LPC47M182 to superiotool
[coreboot.git] / util / superiotool / ite.c
index 6b201d9404ef3493afc72033fb085bcbcf225fee..c78431881a404721c65ff850b3880c404382089e 100644 (file)
@@ -2,7 +2,7 @@
  * This file is part of the superiotool project.
  *
  * Copyright (C) 2007 Carl-Daniel Hailfinger
- * 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
 
 #define CHIP_ID_BYTE1_REG      0x20
 #define CHIP_ID_BYTE2_REG      0x21
-
 #define CHIP_VERSION_REG       0x22
+#define ISA_PNP_ADDR           0x279
 
-const static struct superio_registers reg_table[] = {
-       {0x8661, "IT8661F", {
-               /* TODO: Needs different init sequence. */
+static const struct superio_registers reg_table[] = {
+       {0x8228, "IT8228E", {
+               {EOT}}},
+       {0x8661, "IT8661F/IT8770F", {
                {NOLDN, NULL,
-                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x20,0x21,
-                        0x22,0x23,0x24,EOT},
-                       {NANA,NANA,NANA,NANA,NANA,NANA,0x00,NANA,0x86,0x61,
-                        0x00,0x00,0x00,EOT}},
+                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x20,0x21,0x22,
+                        0x23,0x24,EOT},
+                       {NANA,NANA,NANA,NANA,NANA,NANA,0x00,0x86,0x61,0x00,
+                        0x00,0x00,EOT}},
                {0x0, "Floppy",
                        {0x30,0x31,0x60,0x61,0x70,0x71,0x74,0xf0,EOT},
                        {0x00,0x00,0x03,0xf0,0x06,0x02,0x02,0x00,EOT}},
@@ -61,12 +62,16 @@ const static struct superio_registers reg_table[] = {
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,EOT}},
                {EOT}}},
+       {0x8673, "IT8673F", {
+               {EOT}}},
+       {0x8681, "IT8671F/IT8687R", {
+               {EOT}}},
        {0x8702, "IT8702F", {
                {EOT}}},
        {0x8705, "IT8705F/AF / IT8700F", {
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,EOT},
-                       {NANA,0x87,0x05,0x00,0x00,NANA,EOT}},
+                       {0x20,0x21,0x22,0x23,0x24,EOT},
+                       {0x87,0x05,0x00,0x00,NANA,EOT}},
                {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -116,10 +121,10 @@ const static struct superio_registers reg_table[] = {
                {EOT}}},
        {0x8708, "IT8708F", {
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
-                        0x29,0x2a,0x2e,0x2f,EOT},
-                       {NANA,0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,
-                        0xff,0xff,0x00,0x00,EOT}},
+                       {0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+                        0x2a,0x2e,0x2f,EOT},
+                       {0x87,0x08,0x00,0x00,NANA,0x3f,0x00,0xff,0xff,0xff,
+                        0xff,0x00,0x00,EOT}},
                {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -171,10 +176,12 @@ const static struct superio_registers reg_table[] = {
                {EOT}}},
        {0x8710, "IT8710F", {   /* TODO: Not yet in sensors-detect */
                {EOT}}},
+       {0x8711, "IT8711F", {   /* 0x8711 is a guess, not found in datasheet. */
+               {EOT}}},
        {0x8712, "IT8712F", {
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
-                       {NANA,0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
+                       {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {0x87,0x12,0x08,0x00,0x00,0x00,EOT}},
                {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -224,32 +231,32 @@ const static struct superio_registers reg_table[] = {
                {EOT}}},
        {0x8716, "IT8716F", {
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
-                       {NANA,0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
-               {0x0, NULL,
+                       {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {0x87,0x16,0x01,0x00,0x00,0x00,EOT}},
+               {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
-               {0x1, NULL,
+               {0x1, "COM1",
                        {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
                        {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
-               {0x2, NULL,
+               {0x2, "COM2",
                        {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
                        {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
-               {0x3, NULL,
+               {0x3, "Parallel port",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
                        {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
-               {0x4, NULL,
+               {0x4, "Environment controller",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
                         0xf4,0xf5,0xf6,EOT},
                        {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
                         0x00,NANA,NANA,EOT}},
-               {0x5, NULL,
+               {0x5, "Keyboard",
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
                        {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
-               {0x6, NULL,
+               {0x6, "Mouse",
                        {0x30,0x70,0x71,0xf0,EOT},
                        {0x00,0x0c,0x02,0x00,EOT}},
-               {0x7, NULL,
+               {0x7, "GPIO",
                        {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
                         0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
                         0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
@@ -262,20 +269,20 @@ const static struct superio_registers reg_table[] = {
                         0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,NANA,0x00,EOT}},
-               {0x8, NULL,
+               {0x8, "MIDI port",
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x00,0x0a,0x00,EOT}},
-               {0x9, NULL,
+               {0x9, "Game port",
                        {0x30,0x60,0x61,EOT},
                        {0x00,0x02,0x01,EOT}},
-               {0xa, NULL,
+               {0xa, "Consumer IR",
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x10,0x0b,0x00,EOT}},
                {EOT}}},
        {0x8718, "IT8718F", {
                {NOLDN, NULL,
-                       {0x07,0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
-                       {NANA,0x87,0x18,0x01,0x00,0x00,0x00,EOT}},
+                       {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {0x87,0x18,0x01,0x00,0x00,0x00,EOT}},
                {0x0, "Floppy",
                        {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
                        {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
@@ -294,52 +301,212 @@ const static struct superio_registers reg_table[] = {
                        {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
                         0x00,NANA,NANA,EOT}},
                {0x5, "Keyboard",
+                       /* 0xf0: Datasheet page 33: 0x00; page 56: 0x08. */
                        {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
                        {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x00,EOT}},
                {0x6, "Mouse",
                        {0x30,0x70,0x71,0xf0,EOT},
                        {0x00,0x0c,0x02,0x00,EOT}},
                {0x7, "GPIO",
+                       /* 0x2c: Datasheet page 30: 0x00; page 43: 0x1f. */
                        {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
                         0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
                         0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
-                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
-                        0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xf0,0xf1,
-                        0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,
-                        0xfc,0xfd,0xfe,0xff,EOT},
+                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc8,0xc9,0xca,0xcb,
+                        0xcc,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xf0,
+                        0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,
+                        0xfb,0xfc,0xfd,0xfe,0xff,EOT},
                        {0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x20,0x38,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
+                        0x01,0x00,0x00,0x40,0x00,0x00,0x01,0x00,0x00,0x40,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
                         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-                        NANA,0x00,0x00,0x00,EOT}},
+                        0x00,NANA,0x00,0x00,0x00,EOT}},
                {0xa, "Consumer IR",
                        {0x30,0x60,0x61,0x70,0xf0,EOT},
                        {0x00,0x03,0x10,0x0b,0x00,EOT}},
                {EOT}}},
+       {0x8720, "IT8720F", {   /* From sensors-detect */
+               {EOT}}},
+       {0x8722, "IT8722F", {
+               {EOT}}},
        {0x8726, "IT8726F", {
                /* Datasheet wrongly says that the ID is 0x8716. */
+               {NOLDN, NULL,
+                       {0x20,0x21,0x22,0x23,0x24,0x2b,EOT},
+                       {0x87,0x26,0x01,0x00,MISC,0x00,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT},
+                       {0x00,0x03,0xf0,0x06,0x02,0x00,0x00,EOT}},
+               {0x1, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x03,0xf8,0x04,0x00,0x50,0x00,0x7f,EOT}},
+               {0x2, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,0xf3,EOT},
+                       {0x00,0x02,0xf8,0x03,0x00,0x50,0x00,0x7f,EOT}},
+               {0x3, "Parallel port",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x74,0xf0,EOT},
+                       {0x00,0x03,0x78,0x07,0x78,0x07,0x03,0x03,EOT}},
+               {0x4, "Environment controller",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,0xf3,
+                        0xf4,0xf5,0xf6,EOT},
+                       {0x00,0x02,0x90,0x02,0x30,0x09,0x00,0x00,0x00,0x00,
+                        0x00,MISC,MISC,EOT}},
+               {0x5, "Keyboard",
+                       /* 0xf0: Datasheet page 35: 0x00; page 59: 0x08. */
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x71,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x02,0x08,EOT}},
+               {0x6, "Mouse",
+                       {0x30,0x70,0x71,0xf0,EOT},
+                       {0x00,0x0c,0x02,0x00,EOT}},
+               {0x7, "GPIO",
+                       /* 0x2c: Datasheet page 33: 0x00; page 45: 0x1f. */
+                       {0x25,0x26,0x27,0x28,0x29,0x2a,0x2c,0x60,0x61,0x62,
+                        0x63,0x64,0x65,0x70,0x71,0x72,0x73,0x74,0xb0,0xb1,
+                        0xb2,0xb3,0xb4,0xb5,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,
+                        0xc0,0xc1,0xc2,0xc3,0xc4,0xc8,0xc9,0xca,0xcb,0xcc,
+                        0xe0,0xe1,0xe2,0xe3,0xe4,0xf0,0xf1,0xf2,0xf3,0xf4,
+                        0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,EOT},
+                       {0x01,0x00,0x00,0x40,0x00,0x00,0x1f,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,MISC,0x38,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x01,0x00,0x00,0x40,0x00,0x01,0x00,0x00,0x40,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x00,MISC,0x00,EOT}},
+               {0x8, "MIDI port",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x00,0x0a,0x00,EOT}},
+               {0x9, "Game port",
+                       {0x30,0x60,0x61,EOT},
+                       {0x00,0x02,0x01,EOT}},
+               {0xa, "Consumer IR",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x00,0x03,0x10,0x0b,0x00,EOT}},
+               {EOT}}},
+       {0x8761, "IT8761E", {
+               {EOT}}},
+       {0x8780, "IT8780F", {
                {EOT}}},
        {EOT}
 };
 
-/**
- * IT871[01]F and IT8708F use 0x87, 0x87
- * IT8761F uses 0x87, 0x61, 0x55, 0x55/0xaa
- * IT86xxF series uses different ports
- * IT8661F uses 0x86, 0x61, 0x55/0xaa, 0x55/0xaa and 32 more writes
- * IT8673F uses 0x86, 0x80, 0x55/0xaa, 0x55/0xaa and 32 more writes
- */
+static const struct superio_registers ec_table[] = {
+       {0x8716, "IT8716F", {
+               {NOLDN, NULL,
+                       {0x00,0x04,0x05,0x06,0x07,0x08,0x09,0x0b,0x0c,0x10,
+                        0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x1b,0x1c,0x1d,
+                        0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,
+                        0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,0x42,0x43,
+                        0x44,0x45,0x48,0x50,0x51,0x52,0x53,0x54,0x56,0x57,
+                        0x59,0x5c,
+                        0x5d,0x5e,0x5f,0x60,0x61,0x62,0x63,0x64,0x65,0x68,
+                        0x69,0x6a,0x6b,0x6c,0x6d,0x70,0x71,0x72,0x73,0x74,
+                        0x75,0x84,0x85,0x86,0x87,0x88,0x89,0x8c,0x8d,0x8e,
+                        0x8f,0x90,0x91,0x92,0x93,0x94,0x95,0x98,0x99,0x9a,
+                        0x9b,0x9c,0x9d,EOT},
+                       {0x18,0x00,0x00,0x00,0x00,0x00,0x80,0x09,0x00,NANA,
+                        NANA,NANA,0x07,0x50,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,RSVD,0x00,0x00,0x7f,0x7f,0x7f,0x00,0x00,
+                        0x00,0x00,
+                        0x00,0x00,0x00,0x7f,0x7f,0x7f,0x00,0x00,0x7f,0x7f,
+                        0x7f,0x7f,0x00,0x00,0x7f,0x7f,0x7f,0x7f,0x00,0x00,
+                        0x7f,NANA,NANA,NANA,NANA,0x00,0x00,0x02,0x00,0x99,
+                        0x99,0x7f,0x7f,0x7f,0x00,0x00,0x7f,0x7f,0x7f,0x7f,
+                        0x00,0x00,0x7f,EOT}},
+               {EOT}}},
+       {0x8718, "IT8718F", {
+               {NOLDN, NULL,
+                       {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,
+                        0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,
+                        0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,
+                        0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,
+                        0x2a,0x2b,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
+                        0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x41,
+                        0x42,0x43,0x44,0x45,0x50,0x51,0x52,0x53,0x54,0x56,
+                        0x57,0x58,0x59,0x5b,0x5c,0x5d,0x5e,0x5f,0x60,0x61,
+                        0x62,0x63,0x64,0x65,0x68,0x69,0x6a,0x6b,0x6c,0x6d,
+                        0x70,0x71,0x72,0x73,0x74,0x75,0x80,0x81,0x82,0x83,
+                        0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,
+                        0x92,0x94,0x95,0x96,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,
+                        0xa6,EOT},
+                       {0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,
+                        0x40,0x09,0x00,NANA,NANA,NANA,NANA,NANA,NANA,0x07,
+                        0x50,MISC,MISC,MISC,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,NANA,
+                        NANA,NANA,NANA,NANA,0x00,0x00,0x7f,0x7f,0x7f,0x00,
+                        0x00,0x90,0x00,0x12,0x00,0x00,0x00,0x00,0x7f,0x7f,
+                        0x7f,0x00,0x00,0x7f,0x7f,0x7f,0x7f,0x00,0x00,0x7f,
+                        0x7f,0x7f,0x7f,0x00,0x00,0x7f,NANA,NANA,NANA,NANA,
+                        0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0xff,0x00,
+                        0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                        0x00,EOT}},
+               {EOT}}},
+       {EOT}
+};
+
+/* Works for: IT8661F/IT8770F */
+static const uint8_t initkey_it8661f[][4] = {
+       {0x86, 0x61, 0x55, 0x55},       /* 0x3f0 */
+       {0x86, 0x61, 0x55, 0xaa},       /* 0x3bd */
+       {0x86, 0x61, 0xaa, 0x55},       /* 0x370 */
+};
+
+/* Works for: IT8671F/IT8687R, IT8673F */
+static const uint8_t initkey_it8671f[][4] = {
+       {0x86, 0x80, 0x55, 0x55},       /* 0x3f0 */
+       {0x86, 0x80, 0x55, 0xaa},       /* 0x3bd */
+       {0x86, 0x80, 0xaa, 0x55},       /* 0x370 */
+};
+
+/* Works for: IT8661F/IT8770F, IT8671F/IT8687R, IT8673F. */
+static const uint8_t initkey_mbpnp[] = {
+       0x6a, 0xb5, 0xda, 0xed, 0xf6, 0xfb, 0x7d, 0xbe, 0xdf, 0x6f, 0x37,
+       0x1b, 0x0d, 0x86, 0xc3, 0x61, 0xb0, 0x58, 0x2c, 0x16, 0x8b, 0x45,
+       0xa2, 0xd1, 0xe8, 0x74, 0x3a, 0x9d, 0xce, 0xe7, 0x73, 0x39,
+};
+
+/* Works for: IT8661F/IT8770F, IT8671F/IT8687R, IT8673F. */
+static void enter_conf_mode_ite_legacy(uint16_t port, const uint8_t init[][4])
+{
+       int i, idx;
+
+       /* Determine Super I/O config port. */
+       idx = (port == 0x3f0) ? 0 : ((port == 0x3bd) ? 1 : 2);
+       for (i = 0; i < 4; i++)
+               OUTB(init[idx][i], ISA_PNP_ADDR);
+
+       /* Sequentially write the 32 MB PnP init values. */
+       for (i = 0; i < 32; i++)
+               OUTB(initkey_mbpnp[i], port);
+}
+
 static void enter_conf_mode_ite(uint16_t port)
 {
-       outb(0x87, port);
-       outb(0x01, port);
-       outb(0x55, port);
-       if (port == 0x2e)
-               outb(0x55, port);
-       else
-               outb(0xaa, port);
+       OUTB(0x87, port);
+       OUTB(0x01, port);
+       OUTB(0x55, port);
+       OUTB((port == 0x2e) ? 0x55 : 0xaa, port);
+}
+
+static void enter_conf_mode_ite_it8761e(uint16_t port)
+{
+       OUTB(0x87, port);
+       OUTB(0x61, port);
+       OUTB(0x55, port);
+       OUTB((port == 0x2e) ? 0x55 : 0xaa, port);
+}
+
+static void enter_conf_mode_ite_it8228e(uint16_t port)
+{
+       OUTB(0x82, port);
+       OUTB(0x28, port);
+       OUTB(0x55, port);
+       OUTB((port == 0x2e) ? 0x55 : 0xaa, port);
 }
 
 static void exit_conf_mode_ite(uint16_t port)
@@ -349,7 +516,7 @@ static void exit_conf_mode_ite(uint16_t port)
 
 static void probe_idregs_ite_helper(const char *init, uint16_t port)
 {
-       uint16_t id, chipver;
+       uint16_t id, chipver, ecport;
 
        probing_for("ITE", init, port);
 
@@ -360,7 +527,6 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port)
        if (superio_unknown(reg_table, id)) {
                if (verbose)
                        printf(NOTFOUND "id=0x%04x, rev=0x%01x\n", id, chipver);
-               exit_conf_mode_ite(port);
                return;
        }
 
@@ -368,18 +534,54 @@ static void probe_idregs_ite_helper(const char *init, uint16_t port)
               get_superio_name(reg_table, id), id, chipver, port);
        chip_found = 1;
 
-       dump_superio("ITE", reg_table, port, id);
-       dump_superio_readable(port); /* TODO */
+       dump_superio("ITE", reg_table, port, id, LDN_SEL);
+
+       if (extra_dump) {
+               regwrite(port, LDN_SEL, 0x04); /* Select LDN 4 (EC). */
+
+               /* Get EC base address (stored in LDN 4, index 0x60/0x61). */
+               ecport = regval(port, 0x60) << 8;
+               ecport |= regval(port, 0x61);
+
+               /* EC address register = EC base address + 5. */
+               ecport += 5;
+
+               printf("Environment controller (0x%04x)\n", ecport);
+               dump_superio("ITE-EC", ec_table, ecport, id, LDN_SEL);
+       }
 }
 
 void probe_idregs_ite(uint16_t port)
 {
-       enter_conf_mode_ite(port);
-       probe_idregs_ite_helper("(init=0x87,0x01,0x55,0x55/0xaa) ", port);
-       exit_conf_mode_ite(port);
+       if (port == 0x3f0 || port == 0x3bd || port == 0x370) {
+               enter_conf_mode_ite_legacy(port, initkey_it8661f);
+               probe_idregs_ite_helper("(init=legacy/it8661f) ", port);
+               exit_conf_mode_ite(port);
 
-       enter_conf_mode_winbond_fintek_ite_8787(port);
-       probe_idregs_ite_helper("(init=0x87,0x87) ", port);
-       exit_conf_mode_winbond_fintek_ite_8787(port);
+               enter_conf_mode_ite_legacy(port, initkey_it8671f);
+               probe_idregs_ite_helper("(init=legacy/it8671f) ", port);
+               exit_conf_mode_ite(port);
+       } else {
+               enter_conf_mode_ite(port);
+               probe_idregs_ite_helper("(init=standard) ", port);
+               exit_conf_mode_ite(port);
+
+               enter_conf_mode_ite_it8761e(port);
+               probe_idregs_ite_helper("(init=it8761e) ", port);
+               exit_conf_mode_ite(port);
+
+               enter_conf_mode_ite_it8228e(port);
+               probe_idregs_ite_helper("(init=it8228e) ", port);
+               exit_conf_mode_ite(port);
+
+               enter_conf_mode_winbond_fintek_ite_8787(port);
+               probe_idregs_ite_helper("(init=0x87,0x87) ", port);
+               exit_conf_mode_winbond_fintek_ite_8787(port);
+       }
 }
 
+void print_ite_chips(void)
+{
+       print_vendor_chips("ITE", reg_table);
+       print_vendor_chips("ITE-EC", ec_table);
+}