summaryrefslogtreecommitdiff
path: root/src/southbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/southbridge')
-rw-r--r--src/southbridge/intel/i82801ca/i82801ca_usb.c2
-rw-r--r--src/southbridge/intel/i82801db/i82801db_lpc.c2
-rw-r--r--src/southbridge/intel/i82801db/i82801db_uhci.c8
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_ac97.c4
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_ide.c2
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_lpc.c2
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_pci.c2
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_sata.c2
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_usb.c12
-rw-r--r--src/southbridge/intel/i82801dbm/i82801dbm_usb2.c2
-rw-r--r--src/southbridge/intel/i82801er/i82801er.c4
-rw-r--r--src/southbridge/intel/i82801er/i82801er_lpc.c2
-rw-r--r--src/southbridge/intel/i82801er/i82801er_sata.c4
-rw-r--r--src/southbridge/intel/i82801er/i82801er_uhci.c2
14 files changed, 22 insertions, 28 deletions
diff --git a/src/southbridge/intel/i82801ca/i82801ca_usb.c b/src/southbridge/intel/i82801ca/i82801ca_usb.c
index 180d58504a..7e7c058b46 100644
--- a/src/southbridge/intel/i82801ca/i82801ca_usb.c
+++ b/src/southbridge/intel/i82801ca/i82801ca_usb.c
@@ -34,7 +34,7 @@ static struct device_operations usb_ops = {
static const struct pci_driver usb_driver_1 __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801CA_USB,
+ .device = PCI_DEVICE_ID_INTEL_82801CA_USB1,
};
static const struct pci_driver usb_driver_2 __pci_driver = {
.ops = &usb_ops,
diff --git a/src/southbridge/intel/i82801db/i82801db_lpc.c b/src/southbridge/intel/i82801db/i82801db_lpc.c
index fbc8805bd2..c7c203106f 100644
--- a/src/southbridge/intel/i82801db/i82801db_lpc.c
+++ b/src/southbridge/intel/i82801db/i82801db_lpc.c
@@ -412,5 +412,5 @@ static struct device_operations lpc_ops = {
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_ISA,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_LPC,
};
diff --git a/src/southbridge/intel/i82801db/i82801db_uhci.c b/src/southbridge/intel/i82801db/i82801db_uhci.c
index 6b214e846b..77172fd309 100644
--- a/src/southbridge/intel/i82801db/i82801db_uhci.c
+++ b/src/southbridge/intel/i82801db/i82801db_uhci.c
@@ -54,21 +54,21 @@ static struct device_operations uhci_ops = {
.ops_pci = &lops_pci,
};
-static const struct pci_driver uhci_driver __pci_driver = {
+static const struct pci_driver usb1_driver __pci_driver = {
.ops = &uhci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_USB0,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_USB1,
};
static const struct pci_driver usb2_driver __pci_driver = {
.ops = &uhci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_USB1,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_USB2,
};
static const struct pci_driver usb3_driver __pci_driver = {
.ops = &uhci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_USB2,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_USB3,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c b/src/southbridge/intel/i82801dbm/i82801dbm_ac97.c
index a524b95142..3b364017dd 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 const struct pci_driver ac97audio_driver __pci_driver = {
.ops = &ac97audio_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DBM_1F5,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_AC97_AUDIO,
};
@@ -37,5 +37,5 @@ static struct device_operations ac97modem_ops = {
static const struct pci_driver ac97modem_driver __pci_driver = {
.ops = &ac97modem_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DBM_1F6,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_AC97_MODEM,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_ide.c b/src/southbridge/intel/i82801dbm/i82801dbm_ide.c
index 4bb0d464e8..f7d799657b 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm_ide.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm_ide.c
@@ -48,6 +48,6 @@ static struct device_operations ide_ops = {
static const struct pci_driver ide_driver __pci_driver = {
.ops = &ide_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1F1,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_IDE,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c
index ba48718d6d..cec09192b7 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c
@@ -211,5 +211,5 @@ static struct device_operations lpc_ops = {
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DBM_1F0,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_LPC,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_pci.c b/src/southbridge/intel/i82801dbm/i82801dbm_pci.c
index ca3b34738b..b69cd601c4 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 const struct pci_driver pci_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DBM_1E0,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_PCI,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_sata.c b/src/southbridge/intel/i82801dbm/i82801dbm_sata.c
index 5b567c1507..405ee0e92f 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm_sata.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm_sata.c
@@ -70,6 +70,6 @@ static struct device_operations sata_ops = {
static const struct pci_driver stat_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1F2_R,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_SATA,
};
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_usb.c b/src/southbridge/intel/i82801dbm/i82801dbm_usb.c
index a14b6aa53e..3fd61673b2 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm_usb.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm_usb.c
@@ -35,21 +35,15 @@ static struct device_operations usb_ops = {
static const struct pci_driver usb_driver_1 __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1D0,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_USB1,
};
static const struct pci_driver usb_driver_2 __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1D1,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_USB2,
};
static const struct pci_driver usb_driver_3 __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1D2,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_USB3,
};
-static const struct pci_driver usb_driver_4 __pci_driver = {
- .ops = &usb_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1D3,
-};
-
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c
index 03ff797205..f05fbbb933 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm_usb2.c
@@ -36,5 +36,5 @@ static struct device_operations usb2_ops = {
static const struct pci_driver usb2_driver __pci_driver = {
.ops = &usb2_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1D7,
+ .device = PCI_DEVICE_ID_INTEL_82801DBM_EHCI,
};
diff --git a/src/southbridge/intel/i82801er/i82801er.c b/src/southbridge/intel/i82801er/i82801er.c
index 5e38ac3acb..6738a52104 100644
--- a/src/southbridge/intel/i82801er/i82801er.c
+++ b/src/southbridge/intel/i82801er/i82801er.c
@@ -22,11 +22,11 @@ void i82801er_enable(device_t dev)
return;
}
if ((lpc_dev->vendor != PCI_VENDOR_ID_INTEL) ||
- (lpc_dev->device != PCI_DEVICE_ID_INTEL_82801ER_ISA)) {
+ (lpc_dev->device != PCI_DEVICE_ID_INTEL_82801ER_LPC)) {
uint32_t id;
id = pci_read_config32(lpc_dev, PCI_VENDOR_ID);
if (id != (PCI_VENDOR_ID_INTEL |
- (PCI_DEVICE_ID_INTEL_82801ER_ISA << 16))) {
+ (PCI_DEVICE_ID_INTEL_82801ER_LPC << 16))) {
return;
}
}
diff --git a/src/southbridge/intel/i82801er/i82801er_lpc.c b/src/southbridge/intel/i82801er/i82801er_lpc.c
index eff7a8cdf4..02d474e8d5 100644
--- a/src/southbridge/intel/i82801er/i82801er_lpc.c
+++ b/src/southbridge/intel/i82801er/i82801er_lpc.c
@@ -388,5 +388,5 @@ static struct device_operations lpc_ops = {
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_ISA,
+ .device = PCI_DEVICE_ID_INTEL_82801ER_LPC,
};
diff --git a/src/southbridge/intel/i82801er/i82801er_sata.c b/src/southbridge/intel/i82801er/i82801er_sata.c
index 515f1c9cc8..c710d83364 100644
--- a/src/southbridge/intel/i82801er/i82801er_sata.c
+++ b/src/southbridge/intel/i82801er/i82801er_sata.c
@@ -52,12 +52,12 @@ static struct device_operations sata_ops = {
static const struct pci_driver sata_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1F2_R,
+ .device = PCI_DEVICE_ID_INTEL_82801ER_SATA,
};
static const struct pci_driver sata_driver_nr __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_1F2,
+ .device = PCI_DEVICE_ID_INTEL_82801EB_SATA,
};
diff --git a/src/southbridge/intel/i82801er/i82801er_uhci.c b/src/southbridge/intel/i82801er/i82801er_uhci.c
index bf19bcbcf7..c0f42314a5 100644
--- a/src/southbridge/intel/i82801er/i82801er_uhci.c
+++ b/src/southbridge/intel/i82801er/i82801er_uhci.c
@@ -39,7 +39,7 @@ static struct device_operations uhci_ops = {
static const struct pci_driver uhci_driver __pci_driver = {
.ops = &uhci_ops,
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801ER_USB,
+ .device = PCI_DEVICE_ID_INTEL_82801ER_USB1,
};
static const struct pci_driver usb2_driver __pci_driver = {