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

[Martin Michlmayr]

Author: tbm
Date: Tue Jul 31 10:54:59 2007
New Revision: 9239

Log:
[powerpc] Fix PS/2 keyboard detection on Pegasos (closes: #435378).


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jul 31 10:54:59 2007
@@ -6,6 +6,9 @@
   [ dann frazier ]
   * [hppa] Use generic compat_sys_getdents (closes: #431773)
 
+  [ Martin Michlmayr ]
+  * [powerpc] Fix PS/2 keyboard detection on Pegasos (closes: #435378).
+
  -- dann frazier <dannf at debian.org>  Mon, 30 Jul 2007 11:23:31 -0600
 
 linux-2.6 (2.6.22-3) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/powerpc/i8042-pegasos.patch	Tue Jul 31 10:54:59 2007
@@ -0,0 +1,34 @@
+From: Alan Curry <pacman at theworld.com>
+Date: Wed, 25 Jul 2007 01:28:32 +0000 (+1000)
+Subject: [POWERPC] Fix Pegasos keyboard detection
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f5d834fc34e61f1a40435981062000e5d2b2baa8
+
+[POWERPC] Fix Pegasos keyboard detection
+
+As of 2.6.22 the kernel doesn't recognize the i8042 keyboard/mouse
+controller on the PegasosPPC.  This is because of a feature/bug in the
+OF device tree: the "device_type" attribute is an empty string instead
+of "8042" as the kernel expects.  This adds a secondary detection
+which looks for a device whose *name* is "8042" if there is no device
+whose *type* is "8042".
+
+Signed-off-by: Alan Curry <pacman at world.std.com>
+Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
+Signed-off-by: Paul Mackerras <paulus at samba.org>
+---
+
+diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
+index 4924c48..50ef38c 100644
+--- a/arch/powerpc/kernel/setup-common.c
++++ b/arch/powerpc/kernel/setup-common.c
+@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port)
+ 			break;
+ 		}
+ 		np = of_find_node_by_type(NULL, "8042");
++		/* Pegasos has no device_type on its 8042 node, look for the
++		 * name instead */
++		if (!np)
++			np = of_find_node_by_name(NULL, "8042");
+ 		break;
+ 	case FDC_BASE: /* FDC1 */
+ 		np = of_find_node_by_type(NULL, "fdc");

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Tue Jul 31 10:54:59 2007
@@ -26,3 +26,4 @@
 + features/powerpc/efika/11861_mpc52xx_sparse_fixes.patch
 + features/powerpc/efika/12626_mpx5200_uart_drop_port_lock_across_tty_flip_buffer_call.patch
 + bugfix/hppa/use-generic-compat_sys_getdents.patch
++ bugfix/powerpc/i8042-pegasos.patch