Skip to contentSkip to conversation

M68k: Disable SERIO_I8042, except on Q40/Q60

PATCH In review Geert Uytterhoeven 2 participants 3 messages Oct 31, 2004 Input drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 M68k: Disable SERIO_I8042, except on Q40/Q60

M68k: Disable SERIO_I8042, except on Q40/Q60

drivers/input/serio/Kconfig +1 -1
@@ -20,7 +20,7 @@ config SERIO_I8042
 	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
 	default y
 	select SERIO
-	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST)
+	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && (!M68K || Q40)
 	---help---
 	  i8042 is the chip over which the standard AT keyboard and PS/2
 	  mouse are connected to the computer. If you use these devices,

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#1 lore raw
Quoted 1 line · Geert Uytterhoeven

M68k: Disable SERIO_I8042, except on Q40/Q60

I thought Q40 uses the q40kbd.c driver and shouldn't need i8042 either?

Quoted 26 lines
drivers/input/serio/Kconfig +1 -1
@@ -20,7 +20,7 @@ config SERIO_I8042
 	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
 	default y
 	select SERIO
-	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST)
+	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && (!M68K || Q40)
 	---help---
 	  i8042 is the chip over which the standard AT keyboard and PS/2
 	  mouse are connected to the computer. If you use these devices,

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Signature · 2 lines
Vojtech Pavlik
SuSE Labs, SuSE CR
#2 lore raw
Quoted 5 lines · Vojtech Pavlik
Quoted 1 line · Geert Uytterhoeven

M68k: Disable SERIO_I8042, except on Q40/Q60

I thought Q40 uses the q40kbd.c driver and shouldn't need i8042 either?

Bummer. I got confused by Q40 having an i8042-alike controller, but you're right that it uses a different driver (and no Q40 guy complained).

Here's an updated patch:

M68k: Disable SERIO_I8042

drivers/input/serio/Kconfig +1 -1
@@ -20,7 +20,7 @@ config SERIO_I8042
 	tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
 	default y
 	select SERIO
-	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST)
+	depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
 	---help---
 	  i8042 is the chip over which the standard AT keyboard and PS/2
 	  mouse are connected to the computer. If you use these devices,

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds