[kernel] r13690 - in dists/sid/linux-2.6/debian: . patches/bugfix/arm patches/series

[Martin Michlmayr]

Author: tbm
Date: Thu May 28 16:11:35 2009
New Revision: 13690

Log:
Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/ts219-sata-led.patch
   dists/sid/linux-2.6/debian/patches/series/6
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu May 28 06:50:19 2009	(r13689)
+++ dists/sid/linux-2.6/debian/changelog	Thu May 28 16:11:35 2009	(r13690)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.29-6) UNRELEASED; urgency=low
+
+  [ Martin Michlmayr ]
+  * Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Thu, 28 May 2009 18:11:09 +0200
+
 linux-2.6 (2.6.29-5) unstable; urgency=low
 
   [ dann frazier ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/arm/ts219-sata-led.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/ts219-sata-led.patch	Thu May 28 16:11:35 2009	(r13690)
@@ -0,0 +1,40 @@
+From: Thomas Reitmayr <treitmayr at devbase.at>
+Date: Tue, 19 May 2009 17:35:26 +0000 (+0200)
+Subject: [ARM] Kirkwood: Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=385aa9e7012d35b017981e67b3464aef4e1e7108
+
+[ARM] Kirkwood: Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.
+
+For the QNAP TS-119 and TS-219 the wrong MPPs were used for the SATA
+activity/presence LEDs. The new settings make these LEDs work as
+expected.
+
+Signed-off-by: Thomas Reitmayr <treitmayr at devbase.at>
+Tested-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 dda5743..01aa213 100644
+--- a/arch/arm/mach-kirkwood/ts219-setup.c
++++ b/arch/arm/mach-kirkwood/ts219-setup.c
+@@ -142,6 +142,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
+ 	MPP1_SPI_MOSI,
+ 	MPP2_SPI_SCK,
+ 	MPP3_SPI_MISO,
++	MPP4_SATA1_ACTn,
++	MPP5_SATA0_ACTn,
+ 	MPP8_TW_SDA,
+ 	MPP9_TW_SCK,
+ 	MPP10_UART0_TXD,
+@@ -150,10 +152,6 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = {
+ 	MPP14_UART1_RXD,	/* PIC controller */
+ 	MPP15_GPIO,		/* USB Copy button */
+ 	MPP16_GPIO,		/* Reset button */
+-	MPP20_SATA1_ACTn,
+-	MPP21_SATA0_ACTn,
+-	MPP22_SATA1_PRESENTn,
+-	MPP23_SATA0_PRESENTn,
+ 	0
+ };
+ 

Added: dists/sid/linux-2.6/debian/patches/series/6
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/6	Thu May 28 16:11:35 2009	(r13690)
@@ -0,0 +1 @@
++ bugfix/arm/ts219-sata-led.patch