Untitled

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>

Index: src/mainboard/bcom/winnet100/Config.lb
===================================================================
--- src/mainboard/bcom/winnet100/Config.lb	(Revision 2864)
+++ src/mainboard/bcom/winnet100/Config.lb	(Arbeitskopie)
@@ -84,47 +84,50 @@
     device pci 0.0 on end
       chip southbridge/amd/cs5530
         device pci 12.0 on
-          chip superio/nsc/pc97317
-            device pnp 2e.0 on		# PS/2 keyboard
-              io 0x60 = 0x60
-              io 0x62 = 0x64
-              irq 0x70 = 1
+          chip superio/winbond/w83977f
+            device pnp 3f0.0 on		# Floppy
+              io 0x60 = 0x3f0
+              irq 0x70 = 6
+              drq 0x74 = 2
             end
-            device pnp 2e.1 on		# PS/2 mouse
-              irq 0x70 = 12
-            end
-            device pnp 2e.2 on		# RTC
-              io 0x60 = 0x70
-              irq 0x70 = 8
-            end
-            device pnp 2e.3 off		# Floppy
-            end
-            device pnp 2e.4 on		# Parallel port
+            device pnp 3f0.1 on		# Parallel port
               io 0x60 = 0x378
               irq 0x70 = 7
             end
-            device pnp 2e.5 off		# COM2
+            device pnp 3f0.2 on		# COM1
+              io 0x60 = 0x3f8
+              irq 0x70 = 4
+            end
+            device pnp 3f0.3 on		# COM2
               io 0x60 = 0x2f8
               irq 0x70 = 3
             end
-            device pnp 2e.6 on		# COM1
-              io 0x60 = 0x3f8
-              irq 0x70 = 4
+            device pnp 3f0.4 on		# RTC
+              io 0x60 = 0x70
+              irq 0x70 = 8
             end
-            device pnp 2e.7 on		# GPIO
-              io 0x60 = 0xe0
+            device pnp 3f0.5 on		# PS/2 keyboard
+              io 0x60 = 0x60
+              io 0x62 = 0x64
+              irq 0x70 = 1		# PS/2 keyboard interrupt
+              # irq 0x72 = 12		# PS/2 mouse interrupt (?)
             end
-            device pnp 2e.8 on		# Power management
-               io 0x60 = 0xe800
+            device pnp 3f0.6 on		# IR (TODO: needed?)
+              # TODO?
             end
-            register "com1" = "{115200}"
-            register "com2" = "{38400}"
+            device pnp 3f0.7 on		# GPIO 1
+              # TODO?
+            end
+            device pnp 3f0.8 on		# GPIO 2
+              # TODO?
+            end
           end
+        end
         device pci 12.1 off end		# SMI
-        device pci 12.2 off end		# IDE
+        device pci 12.2 on end		# IDE
         device pci 12.3 on end		# Audio
         device pci 12.4 on end		# VGA
-        # device pci 13.0 on end	# USB
+        device pci 13.0 on end		# USB
       end
     end
   end
Index: src/mainboard/bcom/winnet100/auto.c
===================================================================
--- src/mainboard/bcom/winnet100/auto.c	(Revision 2864)
+++ src/mainboard/bcom/winnet100/auto.c	(Arbeitskopie)
@@ -30,15 +30,15 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 #include "northbridge/amd/gx1/raminit.c"
-#include "superio/nsc/pc97317/pc97317_early_serial.c"
+#include "superio/winbond/w83977f/w83977f_early_serial.c"
 #include "cpu/x86/bist.h"
 
-#define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1)
+#define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1)
 
 static void main(unsigned long bist)
 {
 	/* Initialize the serial console. */
-	pc97317_enable_serial(SERIAL_DEV, TTYS0_BASE);
+	w83977f_enable_serial(SERIAL_DEV, TTYS0_BASE);
 	uart_init();
 	console_init();