From 556e6fb2e34ac1e6757d0bf0a7ccf7401686ec37 Mon Sep 17 00:00:00 2001 From: Michael Gold Date: Fri, 26 Jun 2009 15:25:04 +0000 Subject: This adds register definitions for all logical devices on the SMSC LPC47U33x, allowing 'superiotool -d' to work. Also, some consistency string fixes. Signed-off-by: Michael Gold Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4373 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/superiotool/nsc.c | 2 +- util/superiotool/smsc.c | 45 ++++++++++++++++++++++++++++++++++++++------- util/superiotool/winbond.c | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c index d8df194029..c5d5b5203b 100644 --- a/util/superiotool/nsc.c +++ b/util/superiotool/nsc.c @@ -498,7 +498,7 @@ static const struct superio_registers reg_table[] = { 0xf1,0xf2,0xf3,0xf6,0xf7,EOT}, {0x00,0x00,0x70,0x00,0x72,0x08,0x00,0x04,0x04,0x00, 0x00,0x00,0x00,MISC,0x00,EOT}}, - {0x14, "Health Monitoring and Control (HMC)", + {0x14, "Health monitoring and control (HMC)", {0x30,0x50,0x60,0x61,0x62,0x63,0x70,0x71,0x74,0x75, 0xf0,EOT}, {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x04,0x04, diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c index 2defb3e880..b952410365 100644 --- a/util/superiotool/smsc.c +++ b/util/superiotool/smsc.c @@ -43,7 +43,7 @@ static const struct superio_registers reg_table[] = { 0xf5,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,RSVD,0x00, 0x00,EOT}}, - {0x1, "Power Management (PM1)", + {0x1, "Power management (PM1)", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x00,EOT}}, {0x3, "Parallel port", @@ -63,7 +63,7 @@ static const struct superio_registers reg_table[] = { {0x7, "Keyboard", {0x30,0x60,0x61,0x70,0x72,0xf0,EOT}, {0x00,0x00,0x00,0x00,0x00,0x00,EOT}}, - {0x8, "Embedded Controller (EC)", + {0x8, "Embedded controller (EC)", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x62,EOT}}, {0x9, "Mailbox", @@ -81,7 +81,7 @@ static const struct superio_registers reg_table[] = { 0xf5,EOT}, {0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,RSVD,0x00, 0x00,EOT}}, - {0x1, "Power Management (PM1)", + {0x1, "Power management (PM1)", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x00,EOT}}, {0x3, "Parallel port", @@ -101,7 +101,7 @@ static const struct superio_registers reg_table[] = { {0x7, "Keyboard", {0x30,0x60,0x61,0x70,0x72,0xf0,EOT}, {0x00,0x00,0x00,0x00,0x00,0x00,EOT}}, - {0x8, "Embedded Controller (EC)", + {0x8, "Embedded controller (EC)", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x62,EOT}}, {0x9, "Mailbox", @@ -347,6 +347,37 @@ static const struct superio_registers reg_table[] = { {0x52, "LPC47B37x", { {EOT}}}, {0x54, "LPC47U33x", { + {NOLDN, NULL, + {0x03,0x20,0x21,0x22,0x23,0x24,0x26,0x27,0x2a,0x2b, + 0x2c,0x2d,0x2e,0x2f,EOT}, + {RSVD,0x54,NANA,0x00,0x00,0x04,MISC,MISC,NANA,NANA, + NANA,NANA,NANA,NANA,EOT}}, + {0x0, "Floppy", + {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,0xf2,0xf4,0xf5, + EOT}, + {0x00,0x03,0xf0,0x06,0x02,0x0e,0x00,0xff,0x00,0x00, + EOT}}, + {0x3, "Parallel port", + {0x30,0x60,0x61,0x70,0x74,0xf0,0xf1,EOT}, + {0x00,0x00,0x00,0x00,0x04,0x3c,0x00,EOT}}, + {0x4, "COM1", + {0x30,0x60,0x61,0x70,0xf0,EOT}, + {0x00,0x00,0x00,0x00,0x00,EOT}}, + {0x5, "MIDI port (MPU-401)", + {0x30,0x60,0x61,0x70,EOT}, + {0x00,0x03,0x30,0x05,EOT}}, + {0x7, "Keyboard", + {0x30,0x70,0x72,0xf0,EOT}, + {0x00,0x00,0x00,0x00,EOT}}, + {0x9, "Game port", + {0x30,0x60,0x61,EOT}, + {0x00,0x00,0x00,EOT}}, + {0xa, "Runtime registers", + {0x30,0x60,0x61,0xf0,0xf1,EOT}, + {0x00,0x00,0x00,NANA,NANA,EOT}}, + {0xb, "SMBus", + {0x30,0x60,0x61,0x70,EOT}, + {0x00,0x00,0x00,0x00,EOT}}, {EOT}}}, {0x56, "LPC47B34x", { {EOT}}}, @@ -380,7 +411,7 @@ static const struct superio_registers reg_table[] = { {0x9, "Game port", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x00,EOT}}, - {0xa, "Power Management Events (PME)", + {0xa, "Power management events (PME)", {0x30,0x60,0x61,0xf0,0xf1,EOT}, {0x00,0x00,0x00,NANA,RSVD,EOT}}, {0xb, "MPU-401", @@ -417,7 +448,7 @@ static const struct superio_registers reg_table[] = { {0x9, "Game port", {0x30,0x60,0x61,EOT}, {0x00,0x00,0x00,EOT}}, - {0xa, "Power Management Events (PME)", + {0xa, "Power management events (PME)", {0x30,0x60,0x61,0xf0,EOT}, {0x00,0x00,0x00,NANA,EOT}}, {0xb, "MPU-401", @@ -457,7 +488,7 @@ static const struct superio_registers reg_table[] = { {0x3, "COM1", {0x30,0x60,0x61,0x70,0xf0,EOT}, {0x00,0x00,0x00,0x00,0x00,EOT}}, - {0x4, "Power Control", + {0x4, "Power control", {0x30,0x60,0x61,0x70,0xf0,0xf1,EOT}, {0x00,0x00,0x00,0x00,NANA,0x00,EOT}}, {0x5, "Mouse", diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c index 53cad6c737..aaeb551d55 100644 --- a/util/superiotool/winbond.c +++ b/util/superiotool/winbond.c @@ -324,7 +324,7 @@ static const struct superio_registers reg_table[] = { {0x7, "Game port, MIDI port, GPIO 1", {0x30,0x60,0x61,0x62,0x63,0x70,0xf0,0xf1,0xf2,EOT}, {0x00,0x02,0x01,0x03,0x30,0x09,0xff,0x00,0x00,EOT}}, - {0x8, "GPIO 2, Watchdog timer", + {0x8, "GPIO 2, watchdog timer", {0x30,0xf0,0xf1,0xf2,0xf3,0xf5,0xf6,0xf6,0xf7,EOT}, {0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,EOT}}, {0x9, "GPIO 3", -- cgit v1.2.3