[PATCH 31/44] Fix i8042 PS/2 mouse on ARM
From: Vojtech Pavlik (vojtech_at_suse.cz)
Date: 03/16/04
- Previous message: Vojtech Pavlik: "[44 patches] Input update"
- Next in thread: Vojtech Pavlik: "[PATCH 32/44] Update of Wacom driver from Ping Cheng (from Wacom)"
- Reply: Vojtech Pavlik: "[PATCH 32/44] Update of Wacom driver from Ping Cheng (from Wacom)"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
To: torvalds@osdl.org, vojtech@ucw.cz, linux-kernel@vger.kernel.org Date: Tue, 16 Mar 2004 15:19:37 +0100
You can pull this changeset from:
bk://kernel.bkbits.net/vojtech/input
===================================================================
ChangeSet@1.1608.61.4, 2004-03-05 09:29:47+01:00, rmk@arm.linux.org.uk
input: Fix i8042 PS/2 mouse on ARM.
drivers/input/serio/i8042-io.h | 3 +++
include/asm-arm/arch-ebsa285/irqs.h | 4 ++--
include/asm-arm/arch-shark/irqs.h | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
===================================================================
diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h Tue Mar 16 13:18:11 2004
+++ b/drivers/input/serio/i8042-io.h Tue Mar 16 13:18:11 2004
@@ -25,6 +25,9 @@
#elif defined(__ia64__)
# define I8042_KBD_IRQ isa_irq_to_vector(1)
# define I8042_AUX_IRQ isa_irq_to_vector(12)
+#elif defined(__arm__)
+/* defined in include/asm-arm/arch-xxx/irqs.h */
+#include <asm/irq.h>
#else
# define I8042_KBD_IRQ 1
# define I8042_AUX_IRQ 12
diff -Nru a/include/asm-arm/arch-ebsa285/irqs.h b/include/asm-arm/arch-ebsa285/irqs.h
--- a/include/asm-arm/arch-ebsa285/irqs.h Tue Mar 16 13:18:11 2004
+++ b/include/asm-arm/arch-ebsa285/irqs.h Tue Mar 16 13:18:11 2004
@@ -91,8 +91,8 @@
#undef RTC_IRQ
#define RTC_IRQ IRQ_ISA_RTC_ALARM
-#undef AUX_IRQ
-#define AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE)
+#define I8042_KBD_IRQ IRQ_ISA_KEYBOARD
+#define I8042_AUX_IRQ (machine_is_netwinder() ? IRQ_NETWINDER_PS2MOUSE : IRQ_ISA_PS2MOUSE)
#define IRQ_FLOPPYDISK IRQ_ISA_FLOPPY
#define irq_canonicalize(_i) (((_i) == IRQ_ISA_CASCADE) ? IRQ_ISA_2 : _i)
diff -Nru a/include/asm-arm/arch-shark/irqs.h b/include/asm-arm/arch-shark/irqs.h
--- a/include/asm-arm/arch-shark/irqs.h Tue Mar 16 13:18:11 2004
+++ b/include/asm-arm/arch-shark/irqs.h Tue Mar 16 13:18:11 2004
@@ -8,5 +8,6 @@
#define IRQ_ISA_KEYBOARD 1
#define RTC_IRQ 8
-#define AUX_IRQ 12
+#define I8042_KBD_IRQ 1
+#define I8042_AUX_IRQ 12
#define IRQ_HARDDISK 14
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Vojtech Pavlik: "[44 patches] Input update"
- Next in thread: Vojtech Pavlik: "[PATCH 32/44] Update of Wacom driver from Ping Cheng (from Wacom)"
- Reply: Vojtech Pavlik: "[PATCH 32/44] Update of Wacom driver from Ping Cheng (from Wacom)"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
