[kernel] r11301 - in dists/etch/linux-2.6.24/debian: . patches/features patches/series

Dann Frazier dannf at alioth.debian.org
Tue May 6 05:16:47 UTC 2008


Author: dannf
Date: Tue May  6 05:16:44 2008
New Revision: 11301

Log:
Add pci ids for the ICH10 southbridge

Added:
   dists/etch/linux-2.6.24/debian/patches/features/ich10-alsa-hd-audio-ids.patch
   dists/etch/linux-2.6.24/debian/patches/features/ich10-i2c-i801-smbus-controller-ids.patch
   dists/etch/linux-2.6.24/debian/patches/features/ich10-ide-mode-sata-controller-ids.patch
   dists/etch/linux-2.6.24/debian/patches/features/ich10-irq-lpc-controller-ids.patch
   dists/etch/linux-2.6.24/debian/patches/features/ich10-lpc,smbus-pci-ids.patch
   dists/etch/linux-2.6.24/debian/patches/features/ich10-raid-mode-sata-controller-ids.patch
   dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.2
Modified:
   dists/etch/linux-2.6.24/debian/changelog

Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog	(original)
+++ dists/etch/linux-2.6.24/debian/changelog	Tue May  6 05:16:44 2008
@@ -1,3 +1,9 @@
+linux-2.6.24 (2.6.24-6~etchnhalf.2) UNRELEASED; urgency=low
+
+  * Add pci ids for the ICH10 southbridge
+
+ -- dann frazier <dannf at debian.org>  Fri, 02 May 2008 11:20:39 -0600
+
 linux-2.6.24 (2.6.24-6~etchnhalf.1) stable; urgency=low
 
   [ Martin Michlmayr ]

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-alsa-hd-audio-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-alsa-hd-audio-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,34 @@
+commit c34f5a0469c64a3e4e84b04a691247b72175402d
+Author: Jason Gaston <jason.d.gaston at intel.com>
+Date:   Tue Jan 29 12:38:49 2008 +0100
+
+    [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's
+    
+    This patch adds the Intel ICH10 HD Audio Controller DeviceID's.
+    
+    Signed-off-by: Jason Gaston <jason.d.gaston at intel.com>
+    Signed-off-by: Takashi Iwai <tiwai at suse.de>
+    Signed-off-by: Jaroslav Kysela <perex at perex.cz>
+
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.24.orig/sound/pci/hda/hda_intel.c linux-source-2.6.24/sound/pci/hda/hda_intel.c
+--- linux-source-2.6.24.orig/sound/pci/hda/hda_intel.c	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/sound/pci/hda/hda_intel.c	2008-05-01 17:21:06.000000000 -0600
+@@ -98,6 +98,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},
+ 			 "{Intel, ESB2},"
+ 			 "{Intel, ICH8},"
+ 			 "{Intel, ICH9},"
++			 "{Intel, ICH10},"
+ 			 "{ATI, SB450},"
+ 			 "{ATI, SB600},"
+ 			 "{ATI, RS600},"
+@@ -1936,6 +1937,8 @@ static struct pci_device_id azx_ids[] = 
+ 	{ 0x8086, 0x284b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH8 */
+ 	{ 0x8086, 0x293e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */
+ 	{ 0x8086, 0x293f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH9 */
++	{ 0x8086, 0x3a3e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
++	{ 0x8086, 0x3a6e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ICH }, /* ICH10 */
+ 	{ 0x1002, 0x437b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB450 */
+ 	{ 0x1002, 0x4383, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATI }, /* ATI SB600 */
+ 	{ 0x1002, 0x793b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_ATIHDMI }, /* ATI RS600 HDMI */

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-i2c-i801-smbus-controller-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-i2c-i801-smbus-controller-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,70 @@
+commit d28dc711217a2d5cafb64ec4e33a469b01376d91
+Author: Gaston, Jason D <jason.d.gaston at intel.com>
+Date:   Sun Feb 24 20:03:42 2008 +0100
+
+    i2c-i801: Add support for the ICH10
+    
+    Add the Intel ICH10 SMBus Controller DeviceID's and updates
+    Tolapai support.
+    
+    Signed-off-by: Jason Gaston <jason.d.gaston at intel.com>
+    Signed-off-by: Jean Delvare <khali at linux-fr.org>
+
+Backported to Debian's 2.6.24 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.24.orig/Documentation/i2c/busses/i2c-i801 linux-source-2.6.24/Documentation/i2c/busses/i2c-i801
+--- linux-source-2.6.24.orig/Documentation/i2c/busses/i2c-i801	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/Documentation/i2c/busses/i2c-i801	2008-05-01 17:27:17.000000000 -0600
+@@ -12,8 +12,9 @@ Supported adapters:
+   * Intel 82801G (ICH7)
+   * Intel 631xESB/632xESB (ESB2)
+   * Intel 82801H (ICH8)
+-  * Intel ICH9
++  * Intel 82801I (ICH9)
+   * Intel Tolapai
++  * Intel ICH10
+    Datasheets: Publicly available at the Intel website
+ 
+ Authors: 
+diff -urpN linux-source-2.6.24.orig/drivers/i2c/busses/Kconfig linux-source-2.6.24/drivers/i2c/busses/Kconfig
+--- linux-source-2.6.24.orig/drivers/i2c/busses/Kconfig	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/drivers/i2c/busses/Kconfig	2008-05-01 17:27:17.000000000 -0600
+@@ -177,6 +177,8 @@ config I2C_I801
+ 	    ESB2
+ 	    ICH8
+ 	    ICH9
++	    Tolapai
++	    ICH10
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called i2c-i801.
+diff -urpN linux-source-2.6.24.orig/drivers/i2c/busses/i2c-i801.c linux-source-2.6.24/drivers/i2c/busses/i2c-i801.c
+--- linux-source-2.6.24.orig/drivers/i2c/busses/i2c-i801.c	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/drivers/i2c/busses/i2c-i801.c	2008-05-01 17:32:48.000000000 -0600
+@@ -35,6 +35,8 @@
+     ICH8		283E
+     ICH9		2930
+     Tolapai		5032
++    ICH10		3A30
++    ICH10		3A60
+     This driver supports several versions of Intel's I/O Controller Hubs (ICH).
+     For SMBus support, they are similar to the PIIX4 and are part
+     of Intel's '810' and other chipsets.
+@@ -545,6 +547,8 @@ static struct pci_device_id i801_ids[] =
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TOLAPAI_1) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
+ 	{ 0, }
+ };
+ 
+@@ -566,6 +570,8 @@ static int __devinit i801_probe(struct p
+ 	case PCI_DEVICE_ID_INTEL_ICH8_5:
+ 	case PCI_DEVICE_ID_INTEL_ICH9_6:
+ 	case PCI_DEVICE_ID_INTEL_TOLAPAI_1:
++	case PCI_DEVICE_ID_INTEL_ICH10_4:
++	case PCI_DEVICE_ID_INTEL_ICH10_5:
+ 		isich4 = 1;
+ 		break;
+ 	default:

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-ide-mode-sata-controller-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-ide-mode-sata-controller-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,31 @@
+commit bf7f22b9cac74a1e3d8b8e77350db2baca2c35be
+Author: Jason Gaston <jason.d.gaston at intel.com>
+Date:   Mon Jan 28 17:36:45 2008 -0800
+
+    ata_piix: IDE mode SATA patch for Intel ICH10 DeviceID's
+    
+    This patch adds the Intel ICH10 IDE mode SATA Controller DeviceID's.
+    
+    Signed-off-by:  Jason Gaston <jason.d.gaston at intel.com>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.24.orig/drivers/ata/ata_piix.c linux-source-2.6.24/drivers/ata/ata_piix.c
+--- linux-source-2.6.24.orig/drivers/ata/ata_piix.c	2008-04-18 11:48:23.000000000 -0600
++++ linux-source-2.6.24/drivers/ata/ata_piix.c	2008-05-01 17:38:14.000000000 -0600
+@@ -221,6 +221,14 @@ static const struct pci_device_id piix_p
+ 	{ 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+ 	/* SATA Controller IDE (Tolapai) */
+ 	{ 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata_ahci },
++	/* SATA Controller IDE (ICH10) */
++	{ 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
++	/* SATA Controller IDE (ICH10) */
++	{ 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
++	/* SATA Controller IDE (ICH10) */
++	{ 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
++	/* SATA Controller IDE (ICH10) */
++	{ 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ 
+ 	{ }	/* terminate list */
+ };

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-irq-lpc-controller-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-irq-lpc-controller-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,27 @@
+commit cc09c5bcf130f7c6e17b824a06cbc9f2c1fbb060
+Author: Jason Gaston <jason.d.gaston at intel.com>
+Date:   Mon Jan 28 17:24:37 2008 -0800
+
+    PCI: irq: patch for Intel ICH10 DeviceID's
+    
+    This patch adds the Intel ICH10 LPC Controller DeviceID's.
+    
+    Signed-off-by: Jason Gaston <jason.d.gaston at intel.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.24.orig/arch/x86/pci/irq.c linux-source-2.6.24/arch/x86/pci/irq.c
+--- linux-source-2.6.24.orig/arch/x86/pci/irq.c	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/arch/x86/pci/irq.c	2008-05-01 17:44:12.000000000 -0600
+@@ -571,6 +571,10 @@ static __init int intel_router_probe(str
+ 		case PCI_DEVICE_ID_INTEL_ICH9_4:
+ 		case PCI_DEVICE_ID_INTEL_ICH9_5:
+ 		case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
++		case PCI_DEVICE_ID_INTEL_ICH10_0:
++		case PCI_DEVICE_ID_INTEL_ICH10_1:
++		case PCI_DEVICE_ID_INTEL_ICH10_2:
++		case PCI_DEVICE_ID_INTEL_ICH10_3:
+ 			r->name = "PIIX/ICH";
+ 			r->get = pirq_piix_get;
+ 			r->set = pirq_piix_set;

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-lpc,smbus-pci-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-lpc,smbus-pci-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,30 @@
+commit eb87f65f78bb4fc6dc532e6d7082d90ba0890cb8
+Author: Jason Gaston <jason.d.gaston at intel.com>
+Date:   Mon Jan 28 17:20:36 2008 -0800
+
+    PCI: pci_ids: patch for Intel ICH10 DeviceID's
+    
+    This patch adds the Intel ICH10 LPC and SMBus Controller DeviceID's.
+    
+    Signed-off-by:  Jason Gaston <jason.d.gaston at intel.com>
+    Cc: Jean Delvare <khali at linux-fr.org>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf at hp.com>
+
+diff -urpN linux-source-2.6.24.orig/include/linux/pci_ids.h linux-source-2.6.24/include/linux/pci_ids.h
+--- linux-source-2.6.24.orig/include/linux/pci_ids.h	2008-01-24 15:58:37.000000000 -0700
++++ linux-source-2.6.24/include/linux/pci_ids.h	2008-05-01 17:46:51.000000000 -0600
+@@ -2339,6 +2339,12 @@
+ #define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a
+ #define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e
+ #define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b
++#define PCI_DEVICE_ID_INTEL_ICH10_0	0x3a14
++#define PCI_DEVICE_ID_INTEL_ICH10_1	0x3a16
++#define PCI_DEVICE_ID_INTEL_ICH10_2	0x3a18
++#define PCI_DEVICE_ID_INTEL_ICH10_3	0x3a1a
++#define PCI_DEVICE_ID_INTEL_ICH10_4	0x3a30
++#define PCI_DEVICE_ID_INTEL_ICH10_5	0x3a60
+ #define PCI_DEVICE_ID_INTEL_IOAT_SNB	0x402f
+ #define PCI_DEVICE_ID_INTEL_IOAT_SCNB	0x65ff
+ #define PCI_DEVICE_ID_INTEL_TOLAPAI_0	0x5031

Added: dists/etch/linux-2.6.24/debian/patches/features/ich10-raid-mode-sata-controller-ids.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/features/ich10-raid-mode-sata-controller-ids.patch	Tue May  6 05:16:44 2008
@@ -0,0 +1,24 @@
+commit 16ad1ad9cbce153f4bfed22f9b9a6db4ae212fc7
+Author: Jason Gaston <jason.d.gaston at intel.com>
+Date:   Mon Jan 28 17:34:14 2008 -0800
+
+    ahci: RAID mode SATA patch for Intel ICH10 DeviceID's
+    
+    This patch adds the Intel ICH10 SATA RAID Controllers DeviceID's.
+    
+    Signed-off-by:  Jason Gaston <jason.d.gaston at intel.com>
+    Signed-off-by: Jeff Garzik <jeff at garzik.org>
+
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index 6f089b8..27c8d56 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -475,6 +475,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+ 	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M */
+ 	{ PCI_VDEVICE(INTEL, 0x502a), board_ahci }, /* Tolapai */
+ 	{ PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */
++	{ PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */
++	{ PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */
+ 
+ 	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
+ 	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

Added: dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.2
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6.24/debian/patches/series/6~etchnhalf.2	Tue May  6 05:16:44 2008
@@ -0,0 +1,6 @@
++ features/ich10-alsa-hd-audio-ids.patch
++ features/ich10-i2c-i801-smbus-controller-ids.patch
++ features/ich10-ide-mode-sata-controller-ids.patch
++ features/ich10-irq-lpc-controller-ids.patch
++ features/ich10-lpc,smbus-pci-ids.patch
++ features/ich10-raid-mode-sata-controller-ids.patch



More information about the Kernel-svn-changes mailing list