allow i8042 register location override
PATCH 1/1 allow i8042 register location override
Allow the default i8042 register locations to be changed at run-time. This is a prelude to adding discovery via the ACPI namespace.
Signed-off-by Bjorn Helgaas <[email protected]>
drivers/input/serio/i8042-io.h +9 -5
@@ -36,32 +36,36 @@#endif /* -* Register numbers. +* Register numbers (may be overridden) */ #define I8042_COMMAND_REG 0x64#define I8042_STATUS_REG 0x64#define I8042_DATA_REG 0x60 +extern unsigned long i8042_command_reg; +extern unsigned long i8042_status_reg; +extern unsigned long i8042_data_reg; +static inline int i8042_read_data (void ) { -return inb (I8042_DATA_REG ); +return inb (i8042_data_reg); }static inline int i8042_read_status (void ) { -return inb (I8042_STATUS_REG ); +return inb (i8042_status_reg); }static inline void i8042_write_data (int val) { -outb (val,I8042_DATA_REG ); +outb (val, i8042_data_reg);return ; }static inline void i8042_write_command (int val) { -outb (val,I8042_COMMAND_REG ); +outb (val, i8042_command_reg);return ; }
drivers/input/serio/i8042.c +5 -4
@@ -106,6 +106,10 @@static struct timer_list i8042_timer;static struct platform_device *i8042_platform_device; +static unsigned long i8042_command_reg =I8042_COMMAND_REG ; +static unsigned long i8042_status_reg =I8042_STATUS_REG ; +static unsigned long i8042_data_reg =I8042_DATA_REG ; +/* * Shared IRQ's require a device pointer, but this driver doesn't support * multiple devices
@@ -650,10 +654,7 @@ }printk (KERN_INFO "serio: i8042 %s port at %#lx,%#lx irq %d\n" , - values->name, - (unsigned long )I8042_DATA_REG , - (unsigned long )I8042_COMMAND_REG , - values->irq); + values->name, i8042_data_reg, i8042_command_reg, values->irq);serio_register_port (port);