[kernel] r19373 - in dists/squeeze/linux-2.6/debian: . patches/features/arm patches/series

[Ben Hutchings]

Author: benh
Date: Mon Sep 10 00:28:17 2012
New Revision: 19373

Log:
[armel/kirkwood] ahci: Add JMicron 362 device IDs (Closes: #634180)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/46

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Sep 10 00:13:53 2012	(r19372)
+++ dists/squeeze/linux-2.6/debian/changelog	Mon Sep 10 00:28:17 2012	(r19373)
@@ -22,6 +22,7 @@
       (Closes: #575893)
     - drm: mm: fix range restricted allocations (regression in 2.6.32-36)
     - drm/i915: no lvds quirk for AOpen MP45
+  * [armel/kirkwood] ahci: Add JMicron 362 device IDs (Closes: #634180)
 
   [ Jonathan Nieder ]
   * ath5k: initialize default noise floor

Added: dists/squeeze/linux-2.6/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch	Mon Sep 10 00:28:17 2012	(r19373)
@@ -0,0 +1,27 @@
+Subject: ahci: Add JMicron 362 device IDs
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 22 Jul 2011 01:43:22 +0200
+
+The JMicron JMB362 controller supports AHCI only, but some revisions
+use the IDE class code.  These need to be matched by device ID.
+
+These additions have apparently been included by QNAP in their NAS
+devices using these controllers.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/ahci.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -264,6 +264,9 @@ static const struct pci_device_id ahci_p
+ 	/* 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,
+ 	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
++	/* JMicron 362B and 362C have an AHCI function with IDE class code */
++	{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
++	{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
+ 
+ 	/* ATI */
+ 	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */

Modified: dists/squeeze/linux-2.6/debian/patches/series/46
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/46	Mon Sep 10 00:13:53 2012	(r19372)
+++ dists/squeeze/linux-2.6/debian/patches/series/46	Mon Sep 10 00:28:17 2012	(r19373)
@@ -19,3 +19,4 @@
 + bugfix/x86/drm-i915-no-lvds-quirk-for-AOpen-MP45.patch
 + bugfix/all/drm-radeon-kms-fix-MSI-re-arm-on-rv370.patch
 + features/all/sky2/0057-sky2-override-for-PCI-legacy-power-management.patch
++ features/arm/ahci-Add-JMicron-362-device-IDs.patch