[flashrom] [commit] r1422 - trunk

[repository service]

Author: uwe
Date: Fri Aug 26 23:11:41 2011
New Revision: 1422
URL: http://flashrom.org/trac/flashrom/changeset/1422

Log:
Add AMD Hudson chipset-enable.

AMD Hudson has different vendor/device IDs than AMD SBx00, handle
that properly.

Signed-off-by: Wang Qing Pei <wangqingpei at gmail.com>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>

Modified:
   trunk/chipset_enable.c
   trunk/sb600spi.c

Modified: trunk/chipset_enable.c
==============================================================================
--- trunk/chipset_enable.c	Fri Aug 26 00:54:23 2011	(r1421)
+++ trunk/chipset_enable.c	Fri Aug 26 23:11:41 2011	(r1422)
@@ -1058,6 +1058,7 @@
 	{0x1022, 0x3000, OK, "AMD", "Elan SC520",	get_flashbase_sc520},
 	{0x1022, 0x7440, OK, "AMD", "AMD-768",		enable_flash_amd8111},
 	{0x1022, 0x7468, OK, "AMD", "AMD8111",		enable_flash_amd8111},
+	{0x1022, 0x780e, OK, "AMD", "Hudson",		enable_flash_sb600},
 	{0x1039, 0x0406, NT, "SiS", "501/5101/5501",	enable_flash_sis501},
 	{0x1039, 0x0496, NT, "SiS", "85C496+497",	enable_flash_sis85c496},
 	{0x1039, 0x0530, NT, "SiS", "530",		enable_flash_sis530},

Modified: trunk/sb600spi.c
==============================================================================
--- trunk/sb600spi.c	Fri Aug 26 00:54:23 2011	(r1421)
+++ trunk/sb600spi.c	Fri Aug 26 23:11:41 2011	(r1422)
@@ -259,8 +259,11 @@
 	smbus_dev = pci_dev_find(0x1002, 0x4385);
 
 	if (!smbus_dev) {
-		msg_perr("ERROR: SMBus device not found. Not enabling SPI.\n");
-		return ERROR_NONFATAL;
+		smbus_dev = pci_dev_find(0x1022, 0x780b); /* AMD Hudson */
+		if (!smbus_dev) {
+			msg_perr("ERROR: SMBus device not found. Not enabling SPI.\n");
+			return ERROR_NONFATAL;
+		}
 	}
 
 	/* Note about the bit tests below: If a bit is zero, the GPIO is SPI. */