Restructure the PCI IDs list for the ICH* chipsets from ICH/ICH0 up to

ICH5/ICH5R (more to follow) in preparation of further 82801xx improvements.

Use human-readable names for the PCI ID #defines.
Rename *_ISA to *_LPC as per datasheet.
The 82801DBM only has 3 (not 4) USB devices, looks like a copy-paste error.

The fixes in southbridge code are only to keep the build working for now,
any real improvements will only go into the 82801xx code in future.

This is abuild-tested so it shouldn't break anything.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2938 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

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,

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,
 };

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 = {
-	.ops    = &uhci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_USB0,
-};
-
-static const struct pci_driver usb2_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_USB1,
 };
 
-static const struct pci_driver usb3_driver __pci_driver = {
+static const struct pci_driver usb2_driver __pci_driver = {
 	.ops    = &uhci_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
 	.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_USB3,
+};
+

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,
 };

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,
 };
 

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,
 };

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,
 };
 

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,
 };
 

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,
-};
-

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,
 };

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;
 		}
 	}

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,
 };

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,
 };
 

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 = {