summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYinghai Lu <yinghailu@gmail.com>2004-05-05 18:03:42 +0000
committerYinghai Lu <yinghailu@gmail.com>2004-05-05 18:03:42 +0000
commit7ccff4ea0c1773e57b380cf7477febd64b58afea (patch)
tree8eb413540a69e0e9cf8bc7359879e10be85f2651 /src
parent52f851dd1da8cefb3fb6e4795dc419d76d2b50b1 (diff)
Disable AMD8111 USB2 and remove hard code addr in amd8111 IDE
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1546 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/tyan/s2850/Config.lb2
-rw-r--r--src/mainboard/tyan/s2875/Config.lb2
-rw-r--r--src/mainboard/tyan/s2880/Config.lb2
-rw-r--r--src/mainboard/tyan/s2881/Config.lb2
-rw-r--r--src/mainboard/tyan/s2882/Config.lb2
-rw-r--r--src/mainboard/tyan/s2885/Config.lb2
-rw-r--r--src/mainboard/tyan/s4880/Config.lb2
-rw-r--r--src/mainboard/tyan/s4882/Config.lb2
-rw-r--r--src/southbridge/amd/amd8111/amd8111.c14
-rw-r--r--src/southbridge/amd/amd8111/amd8111_ide.c18
10 files changed, 27 insertions, 21 deletions
diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb
index 7784192c4f..36742d2e31 100644
--- a/src/mainboard/tyan/s2850/Config.lb
+++ b/src/mainboard/tyan/s2850/Config.lb
@@ -170,7 +170,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 on # Floppy
diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb
index 595685287e..4efabb0fa4 100644
--- a/src/mainboard/tyan/s2875/Config.lb
+++ b/src/mainboard/tyan/s2875/Config.lb
@@ -169,7 +169,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 on # Floppy
diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index ef948091b7..d95a5551b3 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -159,7 +159,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 off # Floppy
diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index 733e897470..4a7b606573 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -169,7 +169,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 on # Floppy
diff --git a/src/mainboard/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb
index 6fa3653083..8c108561e9 100644
--- a/src/mainboard/tyan/s2882/Config.lb
+++ b/src/mainboard/tyan/s2882/Config.lb
@@ -174,7 +174,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 on # Floppy
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index 649259f1f2..2d11aaffe3 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -172,7 +172,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 on # Floppy
diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb
index 8de50f59b2..f3c522a02f 100644
--- a/src/mainboard/tyan/s4880/Config.lb
+++ b/src/mainboard/tyan/s4880/Config.lb
@@ -165,7 +165,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 off # Floppy
diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb
index 7f6190751d..c1b22d558c 100644
--- a/src/mainboard/tyan/s4882/Config.lb
+++ b/src/mainboard/tyan/s4882/Config.lb
@@ -169,7 +169,7 @@ northbridge amd/amdk8 "mc0"
pci 0:1.6 off
pci 1:0.0 on
pci 1:0.1 on
- pci 1:0.2 on
+ pci 1:0.2 off
pci 1:1.0 off
superio winbond/w83627hf link 1
pnp 2e.0 off # Floppy
diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index e576ea8f0c..2c5d1e80fe 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -11,6 +11,7 @@ void amd8111_enable(device_t dev)
device_t bus_dev;
unsigned index;
uint16_t reg_old, reg;
+ uint8_t byte;
/* See if we are on the behind the amd8111 pci bridge */
bus_dev = dev->bus->dev;
@@ -38,6 +39,18 @@ void amd8111_enable(device_t dev)
return;
}
}
+
+ if ((dev->vendor == PCI_VENDOR_ID_AMD) &&
+ (dev->device == PCI_DEVICE_ID_AMD_8111_USB2)) {
+ if(!dev->enabled) {
+ byte = pci_read_config8(lpc_dev, 0x47);
+ byte |= (1<<7);
+ pci_write_config8(lpc_dev, 0x47, byte);
+ return;
+ }
+
+ }
+
reg = reg_old = pci_read_config16(lpc_dev, 0x48);
reg &= ~(1 << index);
if (dev->enabled) {
@@ -46,6 +59,7 @@ void amd8111_enable(device_t dev)
if (reg != reg_old) {
pci_write_config16(lpc_dev, 0x48, reg);
}
+
}
struct chip_control southbridge_amd_amd8111_control = {
diff --git a/src/southbridge/amd/amd8111/amd8111_ide.c b/src/southbridge/amd/amd8111/amd8111_ide.c
index 6f8e018fe6..a92274695d 100644
--- a/src/southbridge/amd/amd8111/amd8111_ide.c
+++ b/src/southbridge/amd/amd8111/amd8111_ide.c
@@ -10,6 +10,7 @@ static void ide_init(struct device *dev)
/* Enable ide devices so the linux ide driver will work */
uint16_t word;
+ uint8_t byte;
int enable_a=1, enable_b=1;
word = pci_read_config16(dev, 0x40);
@@ -31,21 +32,12 @@ static void ide_init(struct device *dev)
pci_write_config16(dev, 0x40, word);
- word = 0x0f;
- pci_write_config16(dev, 0x42, word);
- /* The AMD768 has a bug where the BM DMA address must be
- * 256 byte aligned while it is only 16 bytes long.
- * Hard code this to a valid address below 0x1000
- * where automatic port address assignment starts.
- * FIXME: I assume the 8111 does the same thing. We should
- * clarify. stepan@suse.de
- */
- pci_write_config32(dev, 0x20, 0xf01);
+ byte = 0x20 ; // Latency: 64-->32
+ pci_write_config8(dev, 0xd, byte);
- pci_write_config32(dev, 0x48, 0x205e5e5e);
- word = 0x06a;
- pci_write_config16(dev, 0x4c, word);
+ word = 0x0f;
+ pci_write_config16(dev, 0x42, word);
}
static struct device_operations ide_ops = {