Attachment 167811 Details for Bug 247602 – Keyboard detection patch again ripped from SuSe 2.6.22.3-7

[patch] Keyboard detection patch again ripped from SuSe 2.6.22.3-7

ppc-pegasos-keyboard-8042-check.patch (text/plain), 1.42 KB, created by Marcin Kurek on 2007-08-23 07:44:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Kurek

Created: 2007-08-23 07:44:40 UTC

Size: 1.42 KB

patch

obsolete

>commit f5d834fc34e61f1a40435981062000e5d2b2baa8
>tree 3ed0b4a2ba4870b733e66483b01d69903142aa59
>parent 16782a604c458e1edcefca52457a82395b788bed
>author Alan Curry <pacman@theworld.com> 1185326912 +1000
>committer Paul Mackerras <paulus@samba.org> 1185430665 +1000
>
>    [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@world.std.com>
>    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>    Signed-off-by: Paul Mackerras <paulus@samba.org>
>
>---
> arch/powerpc/kernel/setup-common.c |    4 ++++
> 1 files changed, 4 insertions(+)
>
>--- linux-2.6.22.orig/arch/powerpc/kernel/setup-common.c
>+++ linux-2.6.22/arch/powerpc/kernel/setup-common.c
>@@ -487,6 +487,10 @@ int check_legacy_ioport(unsigned long ba
> 	switch(base_port) {
> 	case I8042_DATA_REG:
> 		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");

Actions: View | Diff

Attachments on bug 247602: 167747 | 167811