Fix various issues on MSI MS-7135 board.

 - W83627THF is strapped to 0x4e, not 0x2e
 - there's no device 9 on PCI-E x1 bus, it should be device 0
 - add mptable entries for AGR slot, based on info in user manual
 - enable floppy drive controller so that some legacy VGA ROMs will work

Signed-off-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3279 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/msi/ms7135/Config.lb b/src/mainboard/msi/ms7135/Config.lb
index 8bfd4c5226f19026a85d844ce56ffd368420c1b7..811ebdfe78ff27564dd4f95d3e4302ff177592dc 100644 (file)
--- a/src/mainboard/msi/ms7135/Config.lb
+++ b/src/mainboard/msi/ms7135/Config.lb
@@ -242,35 +242,34 @@ chip northbridge/amd/amdk8/root_complex           # Root complex
           device pci 0.0 on end                        # HT
           device pci 1.0 on                    # LPC
             chip superio/winbond/w83627thf     # Super I/O
-              device pnp 2e.0 off              # Floppy
+              device pnp 4e.0 on               # Floppy
                 io 0x60 = 0x3f0
                 irq 0x70 = 6
                 drq 0x74 = 2
               end
-              device pnp 2e.1 on               # Parallel port
+              device pnp 4e.1 on               # Parallel port
                 io 0x60 = 0x378
-                irq 0x70 = 0
+                irq 0x70 = 7
               end
-              device pnp 2e.2 on               # Com1
+              device pnp 4e.2 on               # Com1
                 io 0x60 = 0x3f8
                 irq 0x70 = 4
               end
-              device pnp 2e.3 on               # Com2
+              device pnp 4e.3 on               # Com2
                 io 0x60 = 0x2f8
                 irq 0x70 = 3
               end
-              device pnp 2e.5 on               # PS/2 keyboard
+              device pnp 4e.5 on               # PS/2 keyboard
                 io 0x60 = 0x60
                 io 0x62 = 0x64
                 irq 0x70 = 1
                 irq 0x72 = 12
               end
-             device pnp 2e.6 off end           # non-existant or undocumented
-             device pnp 2e.7 off end           # Game, MIDI, GPIO 1, GPIO 5
-             device pnp 2e.8 off end           # GPIO 2
-             device pnp 2e.9 off end           # GPIO 3, GPIO 4
-             device pnp 2e.a off end           # ACPI
-              device pnp 2e.b on               # env monitor
+              device pnp 4e.7 off end          # Game, MIDI, GPIO 1, GPIO 5
+              device pnp 4e.8 off end          # GPIO 2
+              device pnp 4e.9 off end          # GPIO 3, GPIO 4
+              device pnp 4e.a off end          # ACPI
+              device pnp 4e.b on               # Hardware monitor
                 io 0x60 = 0x290
                 irq 0x70 = 0
               end

diff --git a/src/mainboard/msi/ms7135/cache_as_ram_auto.c b/src/mainboard/msi/ms7135/cache_as_ram_auto.c
index d0f74882c6994dc1d5423d35ba5a0f847b3ecd3e..74c5ccc014513975a8786352a3c3eb997f670e6a 100644 (file)
--- a/src/mainboard/msi/ms7135/cache_as_ram_auto.c
+++ b/src/mainboard/msi/ms7135/cache_as_ram_auto.c
@@ -25,7 +25,7 @@
 #define ASSEMBLY 1
 #define __ROMCC__
 
-#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
+#define SERIAL_DEV PNP_DEV(0x4e, W83627HF_SP1)
 
 /* Used by raminit. */
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/msi/ms7135/mptable.c b/src/mainboard/msi/ms7135/mptable.c
index 97b3db1efd3eec4813a79365bd51247d3b9fc9fd..1182a286af5f4cd1df960cdb3576fb9f70b67520 100644 (file)
--- a/src/mainboard/msi/ms7135/mptable.c
+++ b/src/mainboard/msi/ms7135/mptable.c
@@ -163,6 +163,10 @@ void *smp_write_config_table(void *v)
        PCI_INT(0, sbdn+10, 0, 22);
 
 
+       /* "AGR" slot */
+       PCI_INT(1, 0, 0, 16);
+       PCI_INT(1, 0, 1, 17);
+
        /* legacy PCI */
        PCI_INT(1, 7, 0, 17);
        PCI_INT(1, 7, 1, 18);
@@ -184,8 +188,8 @@ void *smp_write_config_table(void *v)
        PCI_INT(2, 0, 0, 19);
        /* XXX guesses */
        PCI_INT(2, 0, 1, 16);
-       PCI_INT(2, 9, 2, 17);
-       PCI_INT(2, 9, 3, 18);
+       PCI_INT(2, 0, 2, 17);
+       PCI_INT(2, 0, 3, 18);
 
        /* PCI-E x16 port */  /* XXX fix me ? */
        PCI_INT(3, 0, 0, 18);