[coreboot] [v2] r4724 - trunk/coreboot-v2/src/superio/winbond/w83627dhg

[svn at coreboot.org]

Author: stepan
Date: 2009-10-05 14:08:37 +0200 (Mon, 05 Oct 2009)
New Revision: 4724

Modified:
   trunk/coreboot-v2/src/superio/winbond/w83627dhg/superio.c
   trunk/coreboot-v2/src/superio/winbond/w83627dhg/w83627dhg.h
Log:
Without these fixes the w83627dhg driver (which is currently not used by any
mainboard in the tree) does neither compile nor work.

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>



Modified: trunk/coreboot-v2/src/superio/winbond/w83627dhg/superio.c
===================================================================
--- trunk/coreboot-v2/src/superio/winbond/w83627dhg/superio.c	2009-10-05 10:23:36 UTC (rev 4723)
+++ trunk/coreboot-v2/src/superio/winbond/w83627dhg/superio.c	2009-10-05 12:08:37 UTC (rev 4724)
@@ -103,7 +103,8 @@
 	{ &ops, W83627DHG_SP1, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, },
 	{ &ops, W83627DHG_SP2, PNP_IO0 | PNP_IRQ0, { 0xff8, 0 }, },
 	{ &ops, W83627DHG_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0xfff, 0 }, { 0xfff, 0x4}, },
-	{ &ops, W83627DHG_SPI, PNP_IO1, { 0xff8, 0 }, },
+	// the next line makes coreboot hang in pnp_enable_devices()
+	// { &ops, W83627DHG_SPI, PNP_IO1, { 0xff8, 0 }, },
 	{ &ops, W83627DHG_GPIO6, },
 	{ &ops, W83627DHG_WDTO_PLED, },
 	{ &ops, W83627DHG_GPIO2345, },

Modified: trunk/coreboot-v2/src/superio/winbond/w83627dhg/w83627dhg.h
===================================================================
--- trunk/coreboot-v2/src/superio/winbond/w83627dhg/w83627dhg.h	2009-10-05 10:23:36 UTC (rev 4723)
+++ trunk/coreboot-v2/src/superio/winbond/w83627dhg/w83627dhg.h	2009-10-05 12:08:37 UTC (rev 4724)
@@ -26,7 +26,7 @@
 #define W83627DHG_SPI              6   /* Serial peripheral interface */
 #define W83627DHG_GPIO6            7   /* GPIO6 */
 #define W83627DHG_WDTO_PLED        8   /* WDTO#, PLED */
-#define W83627DHG_GPIO_SUSLED      9   /* GPIO2, GPIO3, GPIO4, GPIO5 */
+#define W83627DHG_GPIO2345         9   /* GPIO2, GPIO3, GPIO4, GPIO5 */
 #define W83627DHG_ACPI            10   /* ACPI */
 #define W83627DHG_HWM             11   /* Hardware monitor */
 #define W83627DHG_PECI_SST        12   /* PECI, SST */