Revert r6460, add full W83627DHG-P/-PT support instead.

Add support for detecting/dumping the registers of Nuvoton W83627DHG-P/-PT.
This is a different chip than the Winbond W83627DHG (different IDs).

Signed-off-by: Prakash Punnoor <prakash@punnoor.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6468 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 9fb3fb20661d5a1fb00800805afb0de2438b51e9..d29b87ff6e0866d92214df892a568cdf67e9a4e1 100644 (file)
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -214,11 +214,11 @@ static const struct superio_registers reg_table[] = {
                        {0x00,0x00,0x00,0x00,EOT}},
                {0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5",
                        {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,
-                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
-                        0xf9,0xfa,0xfe,EOT},
+                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xfe,
+                        EOT},
                        {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
                         0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
-                        0x00,0x00,0x00,EOT}},
+                        EOT}},
                {0xa, "ACPI",
                        {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
                         0xe8,0xe9,0xf2,0xf3,0xf4,0xf6,0xf7,0xfe,EOT},
@@ -228,16 +228,69 @@ static const struct superio_registers reg_table[] = {
                        {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
                        {0x00,0x00,0x00,0x00,0x81,0x00,0x00,EOT}},
                {0xc, "PECI, SST",
-                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xf1,0xf2,0xf3,
-                        0xfe,0xff,EOT},
-                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x48,0x50,0x10,
-                        0x00,0x00,EOT}},
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xf1,0xfe,0xff,
+                        EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,0x48,0x00,0x00,
+                        EOT}},
                {EOT}}},
        {0xa23, "W83627UHG", {/* TODO: Not yet in sensors-detect */
                {EOT}}},
        {0xa51, "W83667HG", {
                /* See also: http://lists.lm-sensors.org/pipermail/lm-sensors/2008-July/023683.html */
                {EOT}}},
+       {0xb07, "W83627DHG-P/-PT", {
+               {NOLDN, NULL,
+                       {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,
+                        0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,EOT},
+                       {0x00,0xb0,NANA,0xff,0x00,MISC,0x00,MISC,RSVD,0x50,
+                        0x00,0x00,RSVD,0xe2,0x21,0x00,0x00,EOT}},
+               {0x0, "Floppy",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5,
+                        EOT},
+                       {0x01,0x03,0xf0,0x06,0x02,0x8e,0x00,0xff,0x00,0x00,
+                        EOT}},
+               {0x1, "Parallel port",
+                       {0x30,0x60,0x61,0x70,0x74,0xf0,EOT},
+                       {0x01,0x03,0x78,0x07,0x04,0x3f,EOT}},
+               {0x2, "COM1",
+                       {0x30,0x60,0x61,0x70,0xf0,EOT},
+                       {0x01,0x03,0xf8,0x04,0x00,EOT}},
+               {0x3, "COM2",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT},
+                       {0x01,0x02,0xf8,0x03,0x00,0x00,EOT}},
+               {0x5, "Keyboard",
+                       {0x30,0x60,0x61,0x62,0x63,0x70,0x72,0xf0,EOT},
+                       {0x01,0x00,0x60,0x00,0x64,0x01,0x0c,0x83,EOT}},
+               {0x6, "Serial peripheral interface",
+                       {0x30,0x62,0x63,EOT},
+                       {0x00,0x00,0x00,EOT}},
+               {0x7, "GPIO 6",
+                       {0x30,0xf4,0xf5,0xf6,0xf7,0xf8,EOT},
+                       {0x00,0xff,0x00,0x00,0x00,0x00,EOT}},
+               {0x8, "WDTO#, PLED",
+                       {0x30,0xf5,0xf6,0xf7,EOT},
+                       {0x00,0x00,0x00,0x00,EOT}},
+               {0x9, "GPIO 2, GPIO 3, GPIO 4, GPIO 5",
+                       {0x30,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,
+                        0xe9,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+                        0xf9,0xfa,0xfe,EOT},
+                       {0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,
+                        0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0x00,
+                        0x00,0x00,0x00,EOT}},
+               {0xa, "ACPI",
+                       {0x30,0x70,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
+                        0xe8,0xe9,0xf2,0xf3,0xf4,0xf6,0xf7,0xfe,EOT},
+                       {0x00,0x00,0x01,0x00,0xff,0x08,0x00,RSVD,0x1c,0x00,
+                        RSVD,RSVD,0x7c,0x00,0x00,0x00,0x00,0x00,EOT}},
+               {0xb, "Hardware monitor",
+                       {0x30,0x60,0x61,0x70,0xf0,0xf1,0xf2,EOT},
+                       {0x00,0x00,0x00,0x00,0x81,0x00,0x00,EOT}},
+               {0xc, "PECI, SST",
+                       {0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe8,0xe9,0xea,0xec,
+                        0xee,0xef,0xf1,0xf2,0xf3,0xfe,0xff,EOT},
+                       {0x00,0x48,0x48,0x48,0x48,0x00,0x00,RSVD,0x00,0x00,
+                        0x01,0x5a,0x48,0x50,0x10,0x00,0x00,EOT}},
+               {EOT}}},
        {0xb35, "Nuvoton NCT5571D", {
                {NOLDN, NULL,
                        {0x02,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,