[kernel] r11951 - in dists/trunk/linux-2.6/debian/patches: features/arm series

[Martin Michlmayr]

Author: tbm
Date: Sun Aug  3 06:33:06 2008
New Revision: 11951

Log:
should go into 2.6.27


Added:
   dists/trunk/linux-2.6/debian/patches/features/arm/5281d0.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/features/arm/orion_use_mv_xor.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/features/arm/5281d0.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/5281d0.patch	Sun Aug  3 06:33:06 2008
@@ -0,0 +1,47 @@
+From: Lennert Buytenhek <buytenh at marvell.com>
+Date: Mon, 5 May 2008 18:19:55 +0000 (-0400)
+Subject: Orion: support for D0 stepping
+
+Orion: support for D0 stepping
+
+Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+
+diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
+index faf4e32..a7a6d79 100644
+--- a/arch/arm/mach-orion5x/common.c
++++ b/arch/arm/mach-orion5x/common.c
+@@ -382,6 +382,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
+ 			*dev_name = "MV88F5281-D2";
+ 		} else if (*rev == MV88F5281_REV_D1) {
+ 			*dev_name = "MV88F5281-D1";
++		} else if (*rev == MV88F5281_REV_D0) {
++			*dev_name = "MV88F5281-D0";
+ 		} else {
+ 			*dev_name = "MV88F5281-Rev-Unsupported";
+ 		}
+@@ -416,6 +418,12 @@ void __init orion5x_init(void)
+ 	 * Setup Orion address map
+ 	 */
+ 	orion5x_setup_cpu_mbus_bridge();
++
++	/*
++	if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
++		printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
++		disable_hlt();
++	}
+ }
+ 
+ /*
+diff --git a/include/asm-arm/arch-orion5x/orion5x.h b/include/asm-arm/arch-orion5x/orion5x.h
+index 10257f5..15f07a4 100644
+--- a/include/asm-arm/arch-orion5x/orion5x.h
++++ b/include/asm-arm/arch-orion5x/orion5x.h
+@@ -73,6 +73,7 @@
+ #define MV88F5182_REV_A2	2
+ /* Orion-2 (88F5281) */
+ #define MV88F5281_DEV_ID	0x5281
++#define MV88F5281_REV_D0	4
+ #define MV88F5281_REV_D1	5
+ #define MV88F5281_REV_D2	6
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sun Aug  3 06:33:06 2008
@@ -30,8 +30,8 @@
 + bugfix/arm/disable-r6040.patch
 + bugfix/arm/kurobox_fix_nr_controllers.patch
 + bugfix/arm/xfs_pack_dir2_struct.patch
++ features/arm/5281d0.patch
 #+ features/arm/tsx09-fix-key-codes.patch
-#+ features/arm/orion_use_mv_xor.patch
 + features/arm/orion_watchdog.patch
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch