[kernel] r16427 - in dists/trunk/linux-2.6/debian: . config/armel config/ia64 config/kernelarch-x86 patches/debian patches/features/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Sun Oct 10 22:01:51 2010
New Revision: 16427

Log:
Move last valid device ID from piix to ata_piix

piix has been kept around because it has 2 device IDs not listed in
other drivers:

PCI_DEVICE_ID_INTEL_82371FB_0 == 0x122e (PIIX function 0)
This function is the ISA bridge, not a PATA controller!

PCI_DEVICE_ID_INTEL_82801DB_1 == 0x24c1 (ICH4-L function 1)
This should be functionally identical to the ICH4's PATA
controller.

Add the latter device ID to ata_piix and disable piix (except on
alpha, which has not been converted to use libata).

Added:
   dists/trunk/linux-2.6/debian/patches/features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch
Deleted:
   dists/trunk/linux-2.6/debian/patches/debian/piix-disable-redundant-devids.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Oct 10 21:12:51 2010	(r16426)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Oct 10 22:01:51 2010	(r16427)
@@ -12,6 +12,8 @@
   * crypto: Explicitly enable algorithm self-tests (Closes: #599441)
   * [x86] Skip looking for ioapic overrides when ioapics are not present
     (Closes: #598533)
+  * [x86] ata_piix: Add device ID for ICH4-L
+  * [armel/iop32x,ia64,x86] Disable BLK_DEV_PIIX as obsolete
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Oct 2010 03:24:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Sun Oct 10 21:12:51 2010	(r16426)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Sun Oct 10 22:01:51 2010	(r16427)
@@ -244,7 +244,7 @@
 # CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
 # CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=m
+# CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Sun Oct 10 21:12:51 2010	(r16426)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Sun Oct 10 22:01:51 2010	(r16427)
@@ -265,7 +265,7 @@
 # CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
 # CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=m
+# CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Oct 10 21:12:51 2010	(r16426)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Oct 10 22:01:51 2010	(r16427)
@@ -523,7 +523,7 @@
 # CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
 # CONFIG_BLK_DEV_SC1200 is not set
-CONFIG_BLK_DEV_PIIX=m
+# CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
 # CONFIG_BLK_DEV_PDC202XX_NEW is not set

Added: dists/trunk/linux-2.6/debian/patches/features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch	Sun Oct 10 22:01:51 2010	(r16427)
@@ -0,0 +1,33 @@
+From 3080c2292effe085e2ab795b26aeccab724d6bce Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 10 Oct 2010 22:31:26 +0100
+Subject: [PATCH] ata_piix: Add device ID for ICH4-L
+
+ICH4-L is a variant of ICH4 lacking USB2 functionality and with some
+different device IDs.
+
+It is documented in Intel specification update 290745-025, currently
+at <http://www.intel.com/assets/pdf/specupdate/290745.pdf>, and is
+included in the device ID table for piix.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/ata_piix.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index 2cfc1ae..6cb14ca 100644
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
+@@ -210,6 +210,8 @@ static const struct pci_device_id piix_pci_tbl[] = {
+ 	{ 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ 	/* Intel ICH3 (E7500/1) UDMA 100 */
+ 	{ 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
++	/* Intel ICH4-L */
++	{ 0x8086, 0x24C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ 	/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
+ 	{ 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ 	{ 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-- 
+1.7.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Oct 10 21:12:51 2010	(r16426)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Oct 10 22:01:51 2010	(r16427)
@@ -3,8 +3,6 @@
 + debian/doc-build-parallel.patch
 + debian/scripts-kconfig-reportoldconfig.patch
 
-+ debian/piix-disable-redundant-devids.patch
-
 + features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
 
 + features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
@@ -50,3 +48,4 @@
 + bugfix/all/perf-Use-PERF_EXEC_PATH-in-canned-report-scripts.patch
 + bugfix/all/perf-Fix-detection-of-script-extension.patch
 + bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
++ features/x86/ata_piix-Add-device-ID-for-ICH4-L.patch