[coreboot-gerrit] Patch set updated for coreboot: d750842 util/superiotool: Add initial support for Fintek F71869ED.

[W. Duijvenvoorde (w.a.n.duijvenvoorde@gmail.com)]

W. Duijvenvoorde (w.a.n.duijvenvoorde at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5380

-gerrit

commit d750842510c753642f71ba5436c212384d2ec553
Author: Wilbert Duijvenvoorde <w.a.n.duijvenvoorde at gmail.com>
Date:   Wed Mar 12 11:19:31 2014 +0100

    util/superiotool: Add initial support for Fintek F71869ED.
    
    Datasheet: http://www.fintek.com.tw/files/productfiles/F71869_V1.1.pdf
    Practically the same as F71869AD, just another ID (0x1408).
    Tested on actual hardware, Jetway NC9C-550-LF.
    
    Change-Id: I5da858565ca16ba4d73b47b42fadd31dabbc290b
    Signed-off-by: Wilbert Duijvenvoorde <w.a.n.duijvenvoorde at gmail.com>
---
 util/superiotool/README   |  1 +
 util/superiotool/fintek.c | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/util/superiotool/README b/util/superiotool/README
index a7eb3db..7ff6138 100644
--- a/util/superiotool/README
+++ b/util/superiotool/README
@@ -114,3 +114,4 @@ Ulf Jordan <jordan at chalmers.se>
 Urja Rannikko <urjaman at gmail.com>
 Uwe Hermann <uwe at hermann-uwe.de>
 Ward Vandewege <ward at gnu.org>
+Wilbert Duijvenvoorde <w.a.n.duijvenvoorde at gmail.com>
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index aba0353..f3a5616 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2006 coresystems GmbH <info at coresystems.de>
  * Copyright (C) 2007-2008 Uwe Hermann <uwe at hermann-uwe.de>
  * Copyright (C) 2014 Edward O'Callaghan <eocallaghan at alterapraxis.com>
+ * Copyright (C) 2014 Wilbert Duijvenvoorde <w.a.n.duijvenvoorde at gmail.com>
  *
  * 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
@@ -77,7 +78,7 @@ static const struct superio_registers reg_table[] = {
 			{0x30,0xf0,0xf1,0xf4,0xf5,0xf7,EOT},
 			{0x00,0x00,NANA,0x06,0x1c,0x01,EOT}},
 		{EOT}}},
-	{0x0710, "F71869AD", {
+	{0x0710, "F71869AD/ED", {
 		/* We assume reserved bits are read as 0. */
 		{NOLDN, NULL,
 			{0x02,0x07,0x20,0x21,0x25,0x26,0x27,0x28,0x29,0x2a,
@@ -375,7 +376,7 @@ static const struct superio_registers reg_table[] = {
 
 void probe_idregs_fintek(uint16_t port)
 {
-	uint16_t vid, did;
+	uint16_t vid, did, magic;
 
 	probing_for("Fintek", "", port);
 
@@ -387,7 +388,13 @@ void probe_idregs_fintek(uint16_t port)
 	vid = regval(port, VENDOR_ID_BYTE1_REG);
 	vid |= (regval(port, VENDOR_ID_BYTE2_REG) << 8);
 
-	if (vid != FINTEK_VENDOR_ID || superio_unknown(reg_table, did)) {
+	/* F71869AD/ED are the same but have a different ID. */
+	if (did == 0x1408)
+		magic = 0x0710;
+	else
+		magic = did;
+
+	if (vid != FINTEK_VENDOR_ID || superio_unknown(reg_table, magic)) {
 		if (verbose)
 			printf(NOTFOUND "vid=0x%04x, id=0x%04x\n", vid, did);
 		exit_conf_mode_winbond_fintek_ite_8787(port);
@@ -395,10 +402,10 @@ void probe_idregs_fintek(uint16_t port)
 	}
 
 	printf("Found Fintek %s (vid=0x%04x, id=0x%04x) at 0x%x\n",
-	       get_superio_name(reg_table, did), vid, did, port);
+		get_superio_name(reg_table, magic), vid, did, port);
 	chip_found = 1;
 
-	dump_superio("Fintek", reg_table, port, did, LDN_SEL);
+	dump_superio("Fintek", reg_table, port, magic, LDN_SEL);
 
 	exit_conf_mode_winbond_fintek_ite_8787(port);
 }
@@ -426,7 +433,7 @@ void probe_idregs_fintek_alternative(uint16_t port)
 	}
 
 	printf("Found Fintek %s (vid=0x%04x, id=0x%04x) at 0x%x\n",
-	       get_superio_name(reg_table, did), vid, did, port);
+		get_superio_name(reg_table, did), vid, did, port);
 	chip_found = 1;
 
 	dump_superio("Fintek", reg_table, port, did, LDN_SEL);