ia64/linux-2.6.18-xen.hg

changeset 741:f236d7def994

Support I2C bus,and SATA IDE/AHCI modes for new Intel PCH chipset.

Signed-off-by: Scott Parker <james.s.parker@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Nov 25 11:22:04 2008 +0000 (2008-11-25)
parents bf8b1ee634e2
children 6591b4869889 5012c470f875
files arch/i386/pci/irq.c drivers/i2c/busses/Kconfig drivers/i2c/busses/i2c-i801.c drivers/scsi/ahci.c drivers/scsi/ata_piix.c include/linux/pci_ids.h sound/pci/hda/hda_intel.c
line diff
     1.1 --- a/arch/i386/pci/irq.c	Tue Nov 25 11:19:41 2008 +0000
     1.2 +++ b/arch/i386/pci/irq.c	Tue Nov 25 11:22:04 2008 +0000
     1.3 @@ -558,6 +558,15 @@ static __init int intel_router_probe(str
     1.4  			r->set = pirq_piix_set;
     1.5  			return 1;
     1.6  	}
     1.7 +
     1.8 +	if ((device >= PCI_DEVICE_ID_INTEL_PCH_LPC_MIN) && 
     1.9 +		(device <= PCI_DEVICE_ID_INTEL_PCH_LPC_MAX)) {
    1.10 +		r->name = "PIIX/ICH";
    1.11 +		r->get = pirq_piix_get;
    1.12 +		r->set = pirq_piix_set;
    1.13 +		return 1;
    1.14 +	}
    1.15 +
    1.16  	return 0;
    1.17  }
    1.18  
     2.1 --- a/drivers/i2c/busses/Kconfig	Tue Nov 25 11:19:41 2008 +0000
     2.2 +++ b/drivers/i2c/busses/Kconfig	Tue Nov 25 11:22:04 2008 +0000
     2.3 @@ -127,6 +127,7 @@ config I2C_I801
     2.4  	    ICH8
     2.5  	    ICH9
     2.6  	    ICH10
     2.7 +            PCH
     2.8  
     2.9  	  This driver can also be built as a module.  If so, the module
    2.10  	  will be called i2c-i801.
     3.1 --- a/drivers/i2c/busses/i2c-i801.c	Tue Nov 25 11:19:41 2008 +0000
     3.2 +++ b/drivers/i2c/busses/i2c-i801.c	Tue Nov 25 11:22:04 2008 +0000
     3.3 @@ -36,6 +36,7 @@
     3.4      ICH9		2930
     3.5      ICH10		3A30
     3.6      ICH10		3A60
     3.7 +    PCH			3B30
     3.8      This driver supports several versions of Intel's I/O Controller Hubs (ICH).
     3.9      For SMBus support, they are similar to the PIIX4 and are part
    3.10      of Intel's '810' and other chipsets.
    3.11 @@ -463,6 +464,7 @@ static struct pci_device_id i801_ids[] =
    3.12  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
    3.13  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
    3.14  	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
    3.15 +	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
    3.16  	{ 0, }
    3.17  };
    3.18  
     4.1 --- a/drivers/scsi/ahci.c	Tue Nov 25 11:19:41 2008 +0000
     4.2 +++ b/drivers/scsi/ahci.c	Tue Nov 25 11:22:04 2008 +0000
     4.3 @@ -370,6 +370,31 @@ static const struct pci_device_id ahci_p
     4.4  	  board_ahci }, /* ICH10 */
     4.5  	{ PCI_VENDOR_ID_INTEL, 0x3a25, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
     4.6  	  board_ahci }, /* ICH10 */
     4.7 +	/* SATA Controller AHCI (PCH) */
     4.8 +	{ PCI_VENDOR_ID_INTEL, 0x3b22, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
     4.9 +	 board_ahci },
    4.10 +	/* SATA Controller AHCI (PCH) */
    4.11 +	{ PCI_VENDOR_ID_INTEL, 0x3b23, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.12 +	 board_ahci },
    4.13 +	/* SATA Controller RAID (PCH) */
    4.14 +	{ PCI_VENDOR_ID_INTEL, 0x3b24, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.15 +	 board_ahci },
    4.16 +	/* SATA Controller RAID (PCH) */
    4.17 +	{ PCI_VENDOR_ID_INTEL, 0x3b25, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.18 +	 board_ahci },
    4.19 +	/* SATA Controller Mobile AHCI (PCH) */
    4.20 +	{ PCI_VENDOR_ID_INTEL, 0x3b29, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.21 +	 board_ahci },
    4.22 +	/* SATA Controller Mobile AHCI (PCH) */
    4.23 +	{ PCI_VENDOR_ID_INTEL, 0x3b2f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.24 +	 board_ahci },
    4.25 +	/* SATA Controller Mobile RAID (PCH) */
    4.26 +	{ PCI_VENDOR_ID_INTEL, 0x3b2b, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.27 +	 board_ahci },
    4.28 +	/* SATA Controller Mobile RAID (PCH) */
    4.29 +	{ PCI_VENDOR_ID_INTEL, 0x3b2c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    4.30 +	 board_ahci },
    4.31 +
    4.32  
    4.33  	/* JMicron */
    4.34  	{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
     5.1 --- a/drivers/scsi/ata_piix.c	Tue Nov 25 11:19:41 2008 +0000
     5.2 +++ b/drivers/scsi/ata_piix.c	Tue Nov 25 11:22:04 2008 +0000
     5.3 @@ -220,6 +220,18 @@ static const struct pci_device_id piix_p
     5.4  	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
     5.5  	/* SATA Controller IDE (ICH10) */
     5.6  	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
     5.7 +	/* SATA Controller IDE (PCH) */
     5.8 +	{ 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
     5.9 +	/* SATA Controller IDE (PCH) */
    5.10 +	{ 0x8086, 0x3b21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
    5.11 +	/* SATA Controller IDE (PCH) */
    5.12 +	{ 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
    5.13 +	/* SATA Controller IDE (PCH) */
    5.14 +	{ 0x8086, 0x3b28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
    5.15 +	/* SATA Controller IDE (PCH) */
    5.16 +	{ 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
    5.17 +	/* SATA Controller IDE (PCH) */
    5.18 +	{ 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
    5.19  
    5.20  	{ }	/* terminate list */
    5.21  };
     6.1 --- a/include/linux/pci_ids.h	Tue Nov 25 11:19:41 2008 +0000
     6.2 +++ b/include/linux/pci_ids.h	Tue Nov 25 11:22:04 2008 +0000
     6.3 @@ -2219,6 +2219,9 @@
     6.4  #define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
     6.5  #define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
     6.6  #define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
     6.7 +#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN	0x3b00
     6.8 +#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX	0x3b1f
     6.9 +#define PCI_DEVICE_ID_INTEL_PCH_SMBUS	0x3b30
    6.10  #define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
    6.11  #define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
    6.12  #define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
     7.1 --- a/sound/pci/hda/hda_intel.c	Tue Nov 25 11:19:41 2008 +0000
     7.2 +++ b/sound/pci/hda/hda_intel.c	Tue Nov 25 11:22:04 2008 +0000
     7.3 @@ -82,6 +82,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},
     7.4  			 "{Intel, ICH8},"
     7.5  			 "{Intel, ICH9},"
     7.6  			 "{Intel, ICH10},"
     7.7 +			 "{Intel, PCH},"
     7.8  			 "{ATI, SB450},"
     7.9  			 "{ATI, SB600},"
    7.10  			 "{ATI, RS600},"
    7.11 @@ -1640,6 +1641,7 @@ static struct pci_device_id azx_ids[] = 
    7.12  	{ 0x8086, 0x293f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */
    7.13  	{ 0x8086, 0x3a3e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
    7.14  	{ 0x8086, 0x3a6e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
    7.15 +	{ 0x8086, 0x3b56, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* PCH */
    7.16  	{ 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
    7.17  	{ 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */
    7.18  	{ 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */