[kernel] r14165 - in dists/trunk/linux-2.6/debian: config/armel patches/bugfix/arm patches/features/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat Aug 22 13:11:21 2009
New Revision: 14165

Log:
kirkdwood build fix and fix

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/kirkwood-init-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch
Modified:
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sat Aug 22 11:53:11 2009	(r14164)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sat Aug 22 13:11:21 2009	(r14165)
@@ -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/trunk/linux-2.6/debian/patches/bugfix/arm/kirkwood-init-build-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/kirkwood-init-build-fix.patch	Sat Aug 22 13:11:21 2009	(r14165)
@@ -0,0 +1,35 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Tue, 18 Aug 2009 09:34:10 +0000 (-1000)
+Subject: [ARM] Kirkwood: __init requires linux/init.h
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=232ee7a0f11120b03fe6eb84c84bee3d069b1716
+
+[ARM] Kirkwood: __init requires linux/init.h
+
+Include linux/init.h for __init to fix this error:
+
+CC [M]  drivers/net/wireless/wl12xx/boot.o
+In file included from arch/arm/mach-kirkwood/include/mach/gpio.h:13,
+                 from arch/arm/include/asm/gpio.h:5,
+                 from include/linux/gpio.h:7,
+                 from drivers/net/wireless/wl12xx/boot.c:24:
+arch/arm/plat-orion/include/plat/gpio.h:32: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘orion_gpio_init’
+make[6]: *** [drivers/net/wireless/wl12xx/boot.o] Error 1
+make[5]: *** [drivers/net/wireless/wl12xx] Error 2
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+---
+
+diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
+index 9646a94..07c430f 100644
+--- a/arch/arm/plat-orion/include/plat/gpio.h
++++ b/arch/arm/plat-orion/include/plat/gpio.h
+@@ -11,6 +11,8 @@
+ #ifndef __PLAT_GPIO_H
+ #define __PLAT_GPIO_H
+ 
++#include <linux/init.h>
++
+ /*
+  * GENERIC_GPIO primitives.
+  */

Added: dists/trunk/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/qnap-219p-pci.patch	Sat Aug 22 13:11:21 2009	(r14165)
@@ -0,0 +1,50 @@
+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/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
+index 0a1abb9..af74cc2 100644
+--- a/arch/arm/configs/kirkwood_defconfig
++++ b/arch/arm/configs/kirkwood_defconfig
+@@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y
+ CONFIG_ATA=y
+ # CONFIG_ATA_NONSTANDARD is not set
+ CONFIG_SATA_PMP=y
+-# CONFIG_SATA_AHCI is not set
++CONFIG_SATA_AHCI=y
+ # CONFIG_SATA_SIL24 is not set
+ CONFIG_ATA_SFF=y
+ # CONFIG_SATA_SVW is not set
+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,

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sat Aug 22 11:53:11 2009	(r14164)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sat Aug 22 13:11:21 2009	(r14165)
@@ -29,3 +29,5 @@
 #+ bugfix/all/wireless-regulatory-default-EU.patch
 #+ features/sparc/video-sunxvr500-intergraph.patch
 #+ bugfix/sparc/arch-zimage-target.patch
++ bugfix/arm/kirkwood-init-build-fix.patch
++ features/arm/qnap-219p-pci.patch