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

[Martin Michlmayr]

Author: tbm
Date: Tue Feb 15 09:43:04 2011
New Revision: 16891

Log:
Kirkwood: initialize PCIE1 for QNAP TS-419P+ (Closes: #613499).

Added:
   dists/squeeze/linux-2.6/debian/patches/features/arm/ts419p-plus-pcie1.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/31

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue Feb 15 04:13:09 2011	(r16890)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue Feb 15 09:43:04 2011	(r16891)
@@ -31,6 +31,7 @@
 
   [ Martin Michlmayr ]
   * Orion: add support for Buffalo LS-CHL (Closes: #590105).
+  * Kirkwood: initialize PCIE1 for QNAP TS-419P+ (Closes: #613499).
 
  -- Ian Campbell <ijc at hellion.org.uk>  Thu, 13 Jan 2011 07:07:54 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/features/arm/ts419p-plus-pcie1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/arm/ts419p-plus-pcie1.patch	Tue Feb 15 09:43:04 2011	(r16891)
@@ -0,0 +1,38 @@
+http://git.kernel.org/?p=linux/kernel/git/nico/orion.git;a=commitdiff;h=31481adbabd1a6d66af40f1508531af3bed6f2c3
+
+From: Zintis Pētersons <zintis.petersons at abcsolutions.lv>
+Subject: [PATCH] Kirkwood: initialize PCIE1 for QNAP TS-419P+
+To: nico at fluxnic.net
+Cc: linux-arm-kernel at lists.infradead.org
+
+Initialize PCIE1 on the 6282-based QNAP TS-419P+ since it has a
+Marvell 9125 SATA chip on each PCI bus.
+
+Signed-off-by: Zintis Pētersons <zintis.petersons at abcsolutions.lv>
+
+diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
+index 9a44029..11f23c3 100644
+--- a/arch/arm/mach-kirkwood/ts41x-setup.c
++++ b/arch/arm/mach-kirkwood/ts41x-setup.c
+@@ -251,6 +251,8 @@ static void __init qnap_ts41x_init(void)
+ 
+ static int __init ts41x_pci_init(void)
+ {
++	u32 dev, rev;
++
+ 	if (machine_is_ts41x()) {
+ 		/*
+ 		 * Without this explicit reset, the PCIe SATA controller
+@@ -259,7 +261,11 @@ static int __init ts41x_pci_init(void)
+ 		 */
+ 		orion_pcie_reset((void __iomem *)PCIE_VIRT_BASE);
+ 
+-		kirkwood_pcie_init(KW_PCIE0);
++		kirkwood_pcie_id(&dev, &rev);
++		if (dev == MV88F6282_DEV_ID)
++			kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);
++		else
++			kirkwood_pcie_init(KW_PCIE0);
+ 	}
+ 
+    return 0;

Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31	Tue Feb 15 04:13:09 2011	(r16890)
+++ dists/squeeze/linux-2.6/debian/patches/series/31	Tue Feb 15 09:43:04 2011	(r16891)
@@ -19,3 +19,4 @@
 + features/all/aufs2/aufs-bugfix-another-approach-to-keep-the-lock-order-.patch
 + features/all/aufs2/aufs-bugfix-separate-the-workqueue-for-preprocessing.patch
 + bugfix/all/rt2500usb-fallback-to-SW-encryption-for-TKIP-AES.patch
++ features/arm/ts419p-plus-pcie1.patch