diff options
| -rw-r--r-- | src/include/device/pci_ids.h | 11 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/Config.lb | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm.h | 15 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_ac97.c | 4 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_early_smbus.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_lpc.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_nic.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_pci.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801dbm/i82801dbm_usb2.c | 5 |
10 files changed, 32 insertions, 16 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index eeab66cc16..df27c83d83 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -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 diff --git a/src/southbridge/intel/i82801dbm/Config.lb b/src/southbridge/intel/i82801dbm/Config.lb index e7024bd058..75fccaa8e1 100644 --- a/src/southbridge/intel/i82801dbm/Config.lb +++ b/src/southbridge/intel/i82801dbm/Config.lb @@ -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 diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.c b/src/southbridge/intel/i82801dbm/i82801dbm.c index d89a309981..328d0eec07 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm.c @@ -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; } } diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.h b/src/southbridge/intel/i82801dbm/i82801dbm.h index f3b06e28ce..5b65e1489b 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm.h +++ b/src/southbridge/intel/i82801dbm/i82801dbm.h @@ -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 diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c b/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c index 091f4d69e8..a1bbc54767 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c @@ -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, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_early_smbus.c b/src/southbridge/intel/i82801dbm/i82801dbm_early_smbus.c index ed014f1a86..de721a1e83 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_early_smbus.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_early_smbus.c @@ -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"); } diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c index 7256610765..1f43ff7532 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c @@ -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, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_nic.c b/src/southbridge/intel/i82801dbm/i82801dbm_nic.c index 5b9c9763a8..1c1837c186 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_nic.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_nic.c @@ -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, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_pci.c b/src/southbridge/intel/i82801dbm/i82801dbm_pci.c index 20fb1d2ce5..6dbc83c7ca 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_pci.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_pci.c @@ -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, }; diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c index 95dedc7e77..52958e3a39 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c @@ -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, |