From 33d7b6aa89c83dc02464b1b6e7e816a14743be48 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 22 May 2010 07:27:16 +0000 Subject: Disable probing for one variant of MCP55 to enable Tyan S2915 Fix Tyan S2915 OEM board by commenting out MCP55 LPC bridge PCI ID 10de:0361 which is the secondary LPC bridge. The same effect could be achieved by refusing to run enable_flash_mcp55 if the device class is not ISA bridge [0601]. Thanks to Alessandro Polverini, Joel Robertson, Nicolas Aveline, Phil LoCascio and Nils-Helge Garli Hegvik for testing flashrom on hardware and Michael Karcher for analyzing the factory BIOS for clues. In the end, no board enable was needed and it was a pure chipset issue. Corresponding to flashrom svn r1007. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Michael Karcher --- chipset_enable.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'chipset_enable.c') diff --git a/chipset_enable.c b/chipset_enable.c index 69f1623..bad0596 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1354,7 +1354,15 @@ const struct penable chipset_enables[] = { {0x10de, 0x0262, NT, "NVIDIA", "MCP51", enable_flash_ck804}, {0x10de, 0x0263, NT, "NVIDIA", "MCP51", enable_flash_ck804}, {0x10de, 0x0360, OK, "NVIDIA", "MCP55", enable_flash_mcp55}, /* M57SLI*/ - {0x10de, 0x0361, OK, "NVIDIA", "MCP55", enable_flash_mcp55}, /* LPC */ + /* 10de:0361 is present in Tyan S2915 OEM systems, but not connected to + * the flash chip. Instead, 10de:0364 is connected to the flash chip. + * Until we have PCI device class matching or some fallback mechanism, + * this is needed to get flashrom working on Tyan S2915 and maybe other + * dual-MCP55 boards. + */ +#if 0 + {0x10de, 0x0361, NT, "NVIDIA", "MCP55", enable_flash_mcp55}, /* LPC */ +#endif {0x10de, 0x0362, OK, "NVIDIA", "MCP55", enable_flash_mcp55}, /* LPC */ {0x10de, 0x0363, OK, "NVIDIA", "MCP55", enable_flash_mcp55}, /* LPC */ {0x10de, 0x0364, OK, "NVIDIA", "MCP55", enable_flash_mcp55}, /* LPC */ -- cgit v1.1