[coreboot] [commit] r5824 - trunk/src/southbridge/intel/i82801ax

repository service svn at coreboot.org
Wed Sep 22 01:53:48 CEST 2010


Author: uwe
Date: Wed Sep 22 01:53:47 2010
New Revision: 5824
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5824

Log:
First round of i82801ax clean-ups (trivial).

After we splitted up the old i82801xx driver which was supposed to support
multiple generations of ICH* chipsets, some of the generified code
is now obsolete in i82801ax which should only cover ICH/ICH0 and none of
the later ICH* generations.

Hence:
 
 - Drop "struct pci_driver" entries for chipsets other than ICH/ICH0.

 - Drop drivers for hardware that is not present on ICH/ICH0: NIC, SATA, EHCI.

 - Drop PIRQE-PIRQH #defines and code, not available on this chipset.

 - Simplify some parts of the code (more will follow).

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

Deleted:
   trunk/src/southbridge/intel/i82801ax/i82801ax_nic.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_sata.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_usb_ehci.c
Modified:
   trunk/src/southbridge/intel/i82801ax/Makefile.inc
   trunk/src/southbridge/intel/i82801ax/chip.h
   trunk/src/southbridge/intel/i82801ax/i82801ax_ac97.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_ide.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_pci.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_smbus.c
   trunk/src/southbridge/intel/i82801ax/i82801ax_usb.c

Modified: trunk/src/southbridge/intel/i82801ax/Makefile.inc
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/Makefile.inc	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/Makefile.inc	Wed Sep 22 01:53:47 2010	(r5824)
@@ -22,12 +22,9 @@
 driver-y += i82801ax_ac97.o
 driver-y += i82801ax_ide.o
 driver-y += i82801ax_lpc.o
-driver-y += i82801ax_nic.o
 driver-y += i82801ax_pci.o
-driver-y += i82801ax_sata.o
 # driver-y += i82801ax_smbus.o
 driver-y += i82801ax_usb.o
-driver-y += i82801ax_usb_ehci.o
 
 obj-y += i82801ax_reset.o
 obj-y += i82801ax_watchdog.o

Modified: trunk/src/southbridge/intel/i82801ax/chip.h
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/chip.h	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/chip.h	Wed Sep 22 01:53:47 2010	(r5824)
@@ -19,17 +19,7 @@
  */
 
 /*
- * The i82801ax code currently supports:
- *  - 82801AA
- *  - 82801AB
- *  - 82801BA
- *  - 82801CA
- *  - 82801DB
- *  - 82801DBM
- *  - 82801EB
- *  - 82801ER
- *
- * This code should NOT be used for ICH6 and later versions.
+ * The i82801ax code supports: 82801AA/82801AB (ICH/ICH0).
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801AX_CHIP_H

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_ac97.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_ac97.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_ac97.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -62,67 +62,3 @@
 	.device	= PCI_DEVICE_ID_INTEL_82801AB_AC97_MODEM,
 };
 
-/* 82801BA/BAM (ICH2/ICH2-M) */
-static const struct pci_driver i82801ba_ac97_audio __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801BA_AC97_AUDIO,
-};
-
-static const struct pci_driver i82801ba_ac97_modem __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801BA_AC97_MODEM,
-};
-
-/* 82801CA/CAM (ICH3-S/ICH3-M) */
-static const struct pci_driver i82801ca_ac97_audio __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_AC97_AUDIO,
-};
-
-static const struct pci_driver i82801ca_ac97_modem __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_AC97_MODEM,
-};
-
-/* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */
-static const struct pci_driver i82801db_ac97_audio __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO,
-};
-
-static const struct pci_driver i82801db_ac97_modem __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM,
-};
-
-/* 82801EB/ER (ICH5/ICH5R) */
-static const struct pci_driver i82801eb_ac97_audio __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_AC97_AUDIO,
-};
-
-static const struct pci_driver i82801eb_ac97_modem __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_AC97_MODEM,
-};
-
-/* 82801FB/FR/FW/FRW/FBM (ICH6/ICH6R/ICH6W/ICH6RW/ICH6-M) */
-static const struct pci_driver i82801fb_ac97_audio __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_AC97_AUDIO,
-};
-
-static const struct pci_driver i82801fb_ac97_modem __pci_driver = {
-	.ops	= &ac97_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_AC97_MODEM,
-};

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_ide.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_ide.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_ide.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -34,7 +34,6 @@
 	/* Get the chip configuration */
 	config_t *config = dev->chip_info;
 
-	/* TODO: Needs to be tested for compatibility with ICH5(R). */
 	/* Enable IDE devices so the Linux IDE driver will work. */
 	uint16_t ideTimingConfig;
 
@@ -84,37 +83,3 @@
 	.device	= 0x2421,
 };
 
-/* 82801BA */
-static const struct pci_driver i82801ba_ide __pci_driver = {
-	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x244b,
-};
-
-/* 82801CA */
-static const struct pci_driver i82801ca_ide __pci_driver = {
-	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x248b,
-};
-
-/* 82801DB */
-static const struct pci_driver i82801db_ide __pci_driver = {
-	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24cb,
-};
-
-/* 82801DBM */
-static const struct pci_driver i82801dbm_ide __pci_driver = {
-	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24ca,
-};
-
-/* 82801EB & 82801ER */
-static const struct pci_driver i82801ex_ide __pci_driver = {
-	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24db,
-};

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/* From 82801DBM, needs to be fixed to support everything the 82801ER does. */
-
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
@@ -63,10 +61,6 @@
 #define PIRQB 0x04
 #define PIRQC 0x05
 #define PIRQD 0x06
-#define PIRQE 0x07
-#define PIRQF 0x09
-#define PIRQG 0x0A
-#define PIRQH 0x0B
 
 /*
  * Use 0x0ef8 for a bitmap to cover all these IRQ's.
@@ -146,34 +140,6 @@
 	} else {
 		pci_write_config8(dev, PIRQD_ROUT, PIRQD);
 	}
-
-	/* Route PIRQE - PIRQH (for ICH2-ICH9). */
-	if (ich_model >= 0x2440) {
-
-		if (config->pirqe_routing) {
-			pci_write_config8(dev, PIRQE_ROUT, config->pirqe_routing);
-		} else {
-			pci_write_config8(dev, PIRQE_ROUT, PIRQE);
-		}
-
-		if (config->pirqf_routing) {
-			pci_write_config8(dev, PIRQF_ROUT, config->pirqf_routing);
-		} else {
-			pci_write_config8(dev, PIRQF_ROUT, PIRQF);
-		}
-
-		if (config->pirqg_routing) {
-			pci_write_config8(dev, PIRQG_ROUT, config->pirqg_routing);
-		} else {
-			pci_write_config8(dev, PIRQG_ROUT, PIRQG);
-		}
-
-		if (config->pirqh_routing) {
-			pci_write_config8(dev, PIRQH_ROUT, config->pirqh_routing);
-		} else {
-			pci_write_config8(dev, PIRQH_ROUT, PIRQH);
-		}
-	}
 }
 
 static void i82801ax_power_options(device_t dev)
@@ -208,16 +174,8 @@
 
 static void gpio_init(device_t dev, uint16_t ich_model)
 {
-	/* Set the value for GPIO base address register and enable GPIO.
-	 * Note: ICH-ICH5 registers differ from ICH6-ICH9.
-	 */
-	if (ich_model <= 0x24D0) {
-		pci_write_config32(dev, GPIO_BASE_ICH0_5, (GPIO_BASE_ADDR | 1));
-		pci_write_config8(dev, GPIO_CNTL_ICH0_5, 0x10);
-	} else if (ich_model >= 0x2640) {
-		pci_write_config32(dev, GPIO_BASE_ICH6_9, (GPIO_BASE_ADDR | 1));
-		pci_write_config8(dev, GPIO_CNTL_ICH6_9, 0x10);
-	}
+	pci_write_config32(dev, GPIO_BASE_ICH0_5, (GPIO_BASE_ADDR | 1));
+	pci_write_config8(dev, GPIO_CNTL_ICH0_5, 0x10);
 }
 
 static void i82801ax_rtc_init(struct device *dev)
@@ -261,15 +219,9 @@
 	 * LPT decode defaults to 0x378-0x37F and 0x778-0x77F.
 	 * Floppy decode defaults to 0x3F0-0x3F5, 0x3F7.
 	 * We also need to set the value for LPC I/F Enables Register.
-	 * Note: ICH-ICH5 registers differ from ICH6-ICH9.
 	 */
-	if (ich_model <= 0x24D0) {
-		pci_write_config8(dev, COM_DEC, 0x10);
-		pci_write_config16(dev, LPC_EN_ICH0_5, 0x300F);
-	} else if (ich_model >= 0x2640) {
-		pci_write_config8(dev, LPC_IO_DEC, 0x10);
-		pci_write_config16(dev, LPC_EN_ICH6_9, 0x300F);
-	}
+	pci_write_config8(dev, COM_DEC, 0x10);
+	pci_write_config16(dev, LPC_EN_ICH0_5, 0x300F);
 }
 
 static void lpc_init(struct device *dev)
@@ -353,33 +305,3 @@
 	.device	= 0x2420,
 };
 
-static const struct pci_driver i82801ba_lpc __pci_driver = {
-	.ops	= &lpc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x2440,
-};
-
-static const struct pci_driver i82801ca_lpc __pci_driver = {
-	.ops	= &lpc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x2480,
-};
-
-static const struct pci_driver i82801db_lpc __pci_driver = {
-	.ops	= &lpc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24c0,
-};
-
-static const struct pci_driver i82801dbm_lpc __pci_driver = {
-	.ops	= &lpc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24cc,
-};
-
-/* 82801EB and 82801ER */
-static const struct pci_driver i82801ex_lpc __pci_driver = {
-	.ops	= &lpc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x24d0,
-};

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_pci.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_pci.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_pci.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -58,15 +58,3 @@
 	.device	= 0x2428,
 };
 
-/* 82801BA, 82801CA, 82801DB, 82801EB, and 82801ER */
-static const struct pci_driver i82801misc_pci __pci_driver = {
-	.ops	= &pci_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x244e,
-};
-
-static const struct pci_driver i82801dbm_pci __pci_driver = {
-	.ops	= &pci_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= 0x2448,
-};

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_smbus.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_smbus.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_smbus.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/* TODO: Check datasheets if this will work for all ICH* southbridges. */
-
 #include <stdint.h>
 #include <smbus.h>
 #include <pci.h>
@@ -66,44 +64,3 @@
 	.device	= PCI_DEVICE_ID_INTEL_82801AB_SMB,
 };
 
-/* 82801BA/BAM (ICH2/ICH2-M) */
-static const struct pci_driver i82801ba_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801BA_SMB,
-};
-
-/* 82801CA/CAM (ICH3-S/ICH3-M) */
-static const struct pci_driver i82801ca_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_SMB,
-};
-
-/* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */
-static const struct pci_driver i82801db_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_SMB,
-};
-
-/* 82801EB/ER (ICH5/ICH5R) */
-static const struct pci_driver i82801eb_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_SMB,
-};
-
-/* 82801FB/FR/FW/FRW/FBM (ICH6/ICH6R/ICH6W/ICH6RW/ICH6-M) */
-static const struct pci_driver i82801fb_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_SMB,
-};
-
-/* 82801E (C-ICH) */
-static const struct pci_driver i82801e_smb __pci_driver = {
-	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801E_SMB,
-};

Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_usb.c
==============================================================================
--- trunk/src/southbridge/intel/i82801ax/i82801ax_usb.c	Tue Sep 21 23:16:27 2010	(r5823)
+++ trunk/src/southbridge/intel/i82801ax/i82801ax_usb.c	Wed Sep 22 01:53:47 2010	(r5824)
@@ -54,110 +54,3 @@
 	.device	= PCI_DEVICE_ID_INTEL_82801AB_USB,
 };
 
-/* 82801BA/BAM (ICH2/ICH2-M) */
-static const struct pci_driver i82801ba_usb1 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801BA_USB1,
-};
-
-static const struct pci_driver i82801ba_usb2 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801BA_USB2,
-};
-
-/* 82801CA/CAM (ICH3-S/ICH3-M) */
-static const struct pci_driver i82801ca_usb1 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_USB1,
-};
-
-static const struct pci_driver i82801ca_usb2 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_USB2,
-};
-
-static const struct pci_driver i82801ca_usb3 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801CA_USB3,
-};
-
-/* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */
-static const struct pci_driver i82801db_usb1 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_USB1,
-};
-
-static const struct pci_driver i82801db_usb2 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_USB2,
-};
-
-static const struct pci_driver i82801db_usb3 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_USB3,
-};
-
-/* 82801EB/ER (ICH5/ICH5R) */
-static const struct pci_driver i82801eb_usb1 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_USB1,
-};
-
-static const struct pci_driver i82801eb_usb2 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_USB2,
-};
-
-static const struct pci_driver i82801eb_usb3 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_USB3,
-};
-
-static const struct pci_driver i82801eb_usb4 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801EB_USB4,
-};
-
-/* 82801FB/FR/FW/FRW/FBM (ICH6/ICH6R/ICH6W/ICH6RW/ICH6-M) */
-static const struct pci_driver i82801fb_usb1 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_USB1,
-};
-
-static const struct pci_driver i82801fb_usb2 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_USB2,
-};
-
-static const struct pci_driver i82801fb_usb3 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_USB3,
-};
-
-static const struct pci_driver i82801fb_usb4 __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801FB_USB4,
-};
-
-/* 82801E (C-ICH) */
-static const struct pci_driver i82801e_usb __pci_driver = {
-	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801E_USB,
-};




More information about the coreboot mailing list