[kernel] r14167 - in dists/sid/linux-2.6/debian: . config/armel patches/features/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 23 13:43:36 2009
New Revision: 14167

Log:
Enable eSATA on QNAP TS-219P (John Holland).

Added:
   dists/sid/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch
   dists/sid/linux-2.6/debian/patches/series/7
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/armel/config.kirkwood

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Aug 23 12:30:23 2009	(r14166)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug 23 13:43:36 2009	(r14167)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.30-7) UNRELEASED; urgency=low
+
+  [ Martin Michlmayr ]
+  * Enable eSATA on QNAP TS-219P (John Holland).
+  * [armel/kirkwood] Enable CONFIG_SATA_AHCI.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Sun, 23 Aug 2009 22:42:34 +0900
+
 linux-2.6 (2.6.30-6) unstable; urgency=high
 
   [ Bastian Blank ]

Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Sun Aug 23 12:30:23 2009	(r14166)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Sun Aug 23 13:43:36 2009	(r14167)
@@ -73,7 +73,7 @@
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_ATA=m
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=m
 # CONFIG_SATA_SIL24 is not set
 CONFIG_ATA_SFF=y
 # CONFIG_SATA_SVW is not set

Added: dists/sid/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch	Sun Aug 23 13:43:36 2009	(r14167)
@@ -0,0 +1,37 @@
+From: John Holland <john.holland at cellent-fs.de>
+Date: Wed, 19 Aug 2009 23:24:03 +0000 (-1000)
+Subject: [ARM] Kirkwood: enable eSATA on QNAP TS-219P
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=cc6abd80be53f9169ea69a28df2003068b0625b5
+
+[ARM] Kirkwood: enable eSATA on QNAP TS-219P
+
+Initialize PCI/PCIe on the QNAP TS-119, TS-219 and TS-219P hardware
+allowing the use of the discrete eSATA controller connected to the PCIe
+bus in the TS-219P.
+
+Signed-off-by: John Holland <john.holland at cellent-fs.de>
+Tested-by: Thomas Reitmayr <treitmayr at devbase.at>
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+---
+
+diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
+index 01aa213..ec1a64f 100644
+--- a/arch/arm/mach-kirkwood/ts219-setup.c
++++ b/arch/arm/mach-kirkwood/ts219-setup.c
+@@ -206,6 +206,15 @@ static void __init qnap_ts219_init(void)
+ 
+ }
+ 
++static int __init ts219_pci_init(void)
++{
++   if (machine_is_ts219())
++           kirkwood_pcie_init();
++
++   return 0;
++}
++subsys_initcall(ts219_pci_init);
++
+ MACHINE_START(TS219, "QNAP TS-119/TS-219")
+ 	/* Maintainer: Martin Michlmayr <tbm at cyrius.com> */
+ 	.phys_io	= KIRKWOOD_REGS_PHYS_BASE,

Added: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/7	Sun Aug 23 13:43:36 2009	(r14167)
@@ -0,0 +1 @@
++ features/arm/qnap-219p-pci.patch