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

[Arnaud Patard]

Author: rtp-guest
Date: Fri Jan 13 14:14:13 2012
New Revision: 18521

Log:
Backport 88f6282 A1 support from mainline

Added:
   dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/41

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Jan 13 10:42:17 2012	(r18520)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Jan 13 14:14:13 2012	(r18521)
@@ -19,6 +19,9 @@
   * [x86] ACPI: fix corrupt DSDT by enabling acpi=copy_dsdt automatically on
     more known-bad Toshiba models (Closes: #598104)
 
+  [ Arnaud Patard ]
+  * [armel] Backport 88f6282 from mainline (Closes: #655316)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Dec 2011 20:04:56 +0100
 
 linux-2.6 (2.6.32-40) stable; urgency=high

Added: dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-kirkwood-6282A1.patch	Fri Jan 13 14:14:13 2012	(r18521)
@@ -0,0 +1,36 @@
+commit a87d89e74f0a4b56eaee8c3ef74bce69277b780f
+Author: Martin Michlmayr <tbm at cyrius.com>
+Date:   Thu Nov 3 12:57:43 2011 +0000
+
+    ARM: Kirkwood: Recognize A1 revision of 6282 chip
+    
+    Recognize the Kirkwood 6282 revision A1 chip since products using
+    this chip are shipping now, such as the QNAP TS-x19P II devices.
+    
+    Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+    Acked-by: Lennert Buytenhek <buytenh at wantstofly.org>
+    Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+
+diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
+index f3248cf..b9632ee 100644
+--- a/arch/arm/mach-kirkwood/common.c
++++ b/arch/arm/mach-kirkwood/common.c
+@@ -430,6 +430,8 @@ static char * __init kirkwood_id(void)
+ 	} else if (dev == MV88F6282_DEV_ID) {
+ 		if (rev == MV88F6282_REV_A0)
+ 			return "MV88F6282-Rev-A0";
++		else if (rev == MV88F6282_REV_A1)
++			return "MV88F6282-Rev-A1";
+ 		else
+ 			return "MV88F6282-Rev-Unsupported";
+ 	} else {
+diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+index 010bdeb..fede3d5 100644
+--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
++++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+@@ -135,4 +135,5 @@
+ 
+ #define MV88F6282_DEV_ID	0x6282
+ #define MV88F6282_REV_A0	0
++#define MV88F6282_REV_A1	1
+ #endif

Modified: dists/squeeze/linux-2.6/debian/patches/series/41
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/41	Fri Jan 13 10:42:17 2012	(r18520)
+++ dists/squeeze/linux-2.6/debian/patches/series/41	Fri Jan 13 14:14:13 2012	(r18521)
@@ -3,3 +3,4 @@
 + bugfix/all/stable/2.6.32.52.patch
 + bugfix/all/stable/2.6.32.53.patch
 + bugfix/x86/ACPI-invoke-DSDT-corruption-workaround-on-all-Toshiba-.patch
++ features/arm/ARM-kirkwood-6282A1.patch