| Submitter | Michael Karcher |
|---|---|
| Date | 2009-12-16 17:52:18 |
| Message ID | <1260985938.4856.394.camel@aquila> |
| Download | mbox | patch |
| Permalink | /patch/659/ |
| State | Accepted |
| Commit | r925 |
| Headers | show |
Comments
On Wed, Dec 16, 2009 at 06:52:18PM +0100, Michael Karcher wrote: > Am Mittwoch, den 16.12.2009, 18:27 +0100 schrieb Michael Karcher: > > Am Montag, den 14.12.2009, 14:02 -0800 schrieb Spronk Enstein: > > > Board Name Ms7207 Ver. 1.0 > > > > Please try the patch below. Maybe wait for carldani to have a short look > > at it. > > Luc Verhaegen did take a look, and rightfully suggested to reuse the > existing nvidia_mcp_gpio_set function. So a second iteration (hopefully > functional equivalent): > > > Board Enable for MS-7207 (K8N GM2-L) > > I used two PCI IDs as it is convention. MSI uses the 4-digit mainboard > ID as subsystem device ID, so even one ID would be safe. > > Signed-Off-By: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> > > Index: board_enable.c > =================================================================== > --- board_enable.c (Revision 803) > +++ board_enable.c (Arbeitskopie) > @@ -450,6 +450,7 @@ > case 0x0030: /* CK804 */ > case 0x0050: /* MCP04 */ > case 0x0060: /* MCP2 */ > + case 0x0264: /* MCP51 */ > break; > default: > fprintf(stderr, "\nERROR: no nVidia SMBus controller found.\n"); > @@ -470,6 +471,14 @@ > } > > /** > + * Suited for MSI K8N GM2-L: nVidia MCP51. > + */ > +static int nvidia_mcp_gpio2_raise(const char *name) > +{ > + return nvidia_mcp_gpio_set(0x02, 1); > +} > + > +/** > * Suited for ASUS P5ND2-SLI Deluxe: LGA775 + nForce4 SLI + MCP04. > */ > static int nvidia_mcp_gpio10_raise(const char *name) > @@ -1256,6 +1265,7 @@ > {0x1106, 0x0571, 0x1462, 0x7120, 0x1106, 0x3065, 0x1462, 0x7120, NULL, NULL, "MSI", "MS-6712 (KT4V)", board_msi_kt4v}, > {0x8086, 0x2658, 0x1462, 0x7046, 0x1106, 0x3044, 0x1462, 0x046d, NULL, NULL, "MSI", "MS-7046", intel_ich_gpio19_raise}, > {0x10DE, 0x005E, 0x1462, 0x7135, 0x10DE, 0x0050, 0x1462, 0x7135, "msi", "k8n-neo3", "MSI", "MS-7135 (K8N Neo3)", w83627thf_gpio4_4_raise_4e}, > + {0x10DE, 0x0270, 0x1462, 0x7207, 0x10DE, 0x0264, 0x1462, 0x7207, NULL, NULL, "MSI", "MS-7207 (K8N GM2-L)",nvidia_mcp_gpio2_raise}, > {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, "shuttle", "ak31", "Shuttle", "AK31", w836xx_memw_enable_2e}, > {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, "Shuttle", "AK38N", it8705f_write_enable_2e}, > {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, "Shuttle", "FN25", board_shuttle_fn25}, > Acked-by: Luc Verhaegen <libv@skynet.be> Still needs to be tested though. Luc Verhaegen.
On 16.12.2009 19:00, Luc Verhaegen wrote: > On Wed, Dec 16, 2009 at 06:52:18PM +0100, Michael Karcher wrote: > >> Am Mittwoch, den 16.12.2009, 18:27 +0100 schrieb Michael Karcher: >> >>> Am Montag, den 14.12.2009, 14:02 -0800 schrieb Spronk Enstein: >>> >>>> Board Name Ms7207 Ver. 1.0 >>>> >> >> Board Enable for MS-7207 (K8N GM2-L) >> >> I used two PCI IDs as it is convention. MSI uses the 4-digit mainboard >> ID as subsystem device ID, so even one ID would be safe. >> >> Signed-Off-By: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> >> >> > Acked-by: Luc Verhaegen <libv@skynet.be> > > Still needs to be tested though. > Committed in r925. Regards, Carl-Daniel
Patch
Index: board_enable.c =================================================================== --- board_enable.c (Revision 803) +++ board_enable.c (Arbeitskopie) @@ -450,6 +450,7 @@ case 0x0030: /* CK804 */ case 0x0050: /* MCP04 */ case 0x0060: /* MCP2 */ + case 0x0264: /* MCP51 */ break; default: fprintf(stderr, "\nERROR: no nVidia SMBus controller found.\n"); @@ -470,6 +471,14 @@ } /** + * Suited for MSI K8N GM2-L: nVidia MCP51. + */ +static int nvidia_mcp_gpio2_raise(const char *name) +{ + return nvidia_mcp_gpio_set(0x02, 1); +} + +/** * Suited for ASUS P5ND2-SLI Deluxe: LGA775 + nForce4 SLI + MCP04. */ static int nvidia_mcp_gpio10_raise(const char *name) @@ -1256,6 +1265,7 @@ {0x1106, 0x0571, 0x1462, 0x7120, 0x1106, 0x3065, 0x1462, 0x7120, NULL, NULL, "MSI", "MS-6712 (KT4V)", board_msi_kt4v}, {0x8086, 0x2658, 0x1462, 0x7046, 0x1106, 0x3044, 0x1462, 0x046d, NULL, NULL, "MSI", "MS-7046", intel_ich_gpio19_raise}, {0x10DE, 0x005E, 0x1462, 0x7135, 0x10DE, 0x0050, 0x1462, 0x7135, "msi", "k8n-neo3", "MSI", "MS-7135 (K8N Neo3)", w83627thf_gpio4_4_raise_4e}, + {0x10DE, 0x0270, 0x1462, 0x7207, 0x10DE, 0x0264, 0x1462, 0x7207, NULL, NULL, "MSI", "MS-7207 (K8N GM2-L)",nvidia_mcp_gpio2_raise}, {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, "shuttle", "ak31", "Shuttle", "AK31", w836xx_memw_enable_2e}, {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, "Shuttle", "AK38N", it8705f_write_enable_2e}, {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, "Shuttle", "FN25", board_shuttle_fn25},