changes for the dbm part. Still need to remove the sata file ...

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1639 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Ronald G. Minnich 2004-08-25 15:40:47 +00:00
parent 3b0096313a
commit e6552bcf39
10 changed files with 32 additions and 16 deletions

View File

@ -1890,6 +1890,17 @@
#define PCI_DEVICE_ID_INTEL_82801CA_1F5 0x2485
#define PCI_DEVICE_ID_INTEL_82801CA_1D2 0x2487
#define PCI_DEVICE_ID_INTEL_82801DBM_1E0 0x2448
#define PCI_DEVICE_ID_INTEL_82801DBM_1F0 0x24cc
#define PCI_DEVICE_ID_INTEL_82801DBM_1F1 0x24ca
#define PCI_DEVICE_ID_INTEL_82801DBM_1F3 0x24c3
#define PCI_DEVICE_ID_INTEL_82801DBM_1F5 0x24c5
#define PCI_DEVICE_ID_INTEL_82801DBM_1F6 0x24c6
#define PCI_DEVICE_ID_INTEL_82801DBM_1D0 0x24c2
#define PCI_DEVICE_ID_INTEL_82801DBM_1D1 0x24c4
#define PCI_DEVICE_ID_INTEL_82801DBM_1D2 0x24c7
#define PCI_DEVICE_ID_INTEL_82801DBM_1D7 0x24cd
#define PCI_DEVICE_ID_INTEL_82801ER_1E0 0x244e
#define PCI_DEVICE_ID_INTEL_82801ER_1F0 0x24d0
#define PCI_DEVICE_ID_INTEL_82801ER_1F1 0x24db

View File

@ -3,7 +3,6 @@ driver i82801dbm.o
driver i82801dbm_usb.o
driver i82801dbm_lpc.o
driver i82801dbm_ide.o
driver i82801dbm_sata.o
driver i82801dbm_usb2.o
driver i82801dbm_ac97.o
#driver i82801dbm_nic.o

View File

@ -20,10 +20,10 @@ void i82801dbm_enable(device_t dev)
}
#if 0
if ((lpc_dev->vendor != PCI_VENDOR_ID_INTEL) ||
(lpc_dev->device != PCI_DEVICE_ID_INTEL_82801ER_1F0)) {
(lpc_dev->device != PCI_DEVICE_ID_INTEL_82801DBM_1F0)) {
uint32_t id;
id = pci_read_config32(lpc_dev, PCI_VENDOR_ID);
if (id != (PCI_VENDOR_ID_INTEL | (PCI_DEVICE_ID_INTEL_82801ER_1F0 << 16))) {
if (id != (PCI_VENDOR_ID_INTEL | (PCI_DEVICE_ID_INTEL_82801DBM_1F0 << 16))) {
return;
}
}

View File

@ -1,5 +1,13 @@
#ifndef I82801ER_H
#define I82801ER_H
/* the problem: we have 82801dbm support in fb1, and 82801er in fb2.
* fb1 code is what we want, fb2 structure is needed however.
* so we need to get fb1 code for 82801dbm into fb2 structure.
*/
/* What I did: took the 80801er stuff from fb2, verify it against the
* db stuff in fb1, and made sure it was right.
*/
#ifndef I82801DBM_H
#define I82801DBM_H
struct southbridge_intel_i82801dbm_config
{
@ -22,9 +30,6 @@ channel disabled.
111 = Combined. IDE is primary. P0 is secondary slave. P1 is secondary master.
*/
#define ICH5_SATA_ADDRESS_MAP 0
#define PCI_DMA_CFG 0x90
#define SERIRQ_CNTL 0x64
#define GEN_CNTL 0xd0

View File

@ -21,7 +21,7 @@ static struct device_operations ac97audio_ops = {
static struct pci_driver ac97audio_driver __pci_driver = {
.ops = &ac97audio_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801ER_1F5,
.device = PCI_DEVICE_ID_INTEL_82801DBM_1F5,
};
@ -37,5 +37,5 @@ static struct device_operations ac97modem_ops = {
static struct pci_driver ac97modem_driver __pci_driver = {
.ops = &ac97modem_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801ER_1F6,
.device = PCI_DEVICE_ID_INTEL_82801DBM_1F6,
};

View File

@ -22,7 +22,7 @@
static void enable_smbus(void)
{
device_t dev;
dev = pci_locate_device(PCI_ID(0x8086, 0x24d3), 0);
dev = pci_locate_device(PCI_ID(0x8086, 0x24c3), 0);
if (dev == PCI_DEV_INVALID) {
die("SMBUS controller not found\r\n");
}

View File

@ -215,5 +215,5 @@ static struct device_operations lpc_ops = {
static struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801ER_1F0,
.device = PCI_DEVICE_ID_INTEL_82801DBM_1F0,
};

View File

@ -17,5 +17,5 @@ static struct device_operations nic_ops = {
static struct pci_driver nic_driver __pci_driver = {
.ops = &nic_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = 0x1051,
.device = 0x103a,
};

View File

@ -28,6 +28,6 @@ static struct device_operations pci_ops = {
static struct pci_driver pci_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_82801ER_1E0,
.device = PCI_DEVICE_ID_INTEL_82801DBM_1E0,
};

View File

@ -9,9 +9,10 @@
static void usb2_init(struct device *dev)
{
uint32_t cmd;
#if 0
#if 0
uint32_t cmd;
printk_debug("USB: Setting up controller.. ");
cmd = pci_read_config32(dev, PCI_COMMAND);
pci_write_config32(dev, PCI_COMMAND,