From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Vojtech Pavlik <vojtech@suse.cz>, Andrew Morton <akpm@osdl.org>
Cc: Alessandro Rubini <rubini@ipvvis.unipv.it>, linux-kernel@vger.kernel.org
Subject: [PATCH] allow i8042 register location override
Date: Thu, 2 Sep 2004 10:09:23 -0600 [thread overview]
Message-ID: <200409021009.23280.bjorn.helgaas@hp.com> (raw)
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 <bjorn.helgaas@hp.com>
diff -u -ur 2.6.9-rc1-mm2/drivers/input/serio/i8042-io.h 2.6.9-rc1-mm2-kbd1/drivers/input/serio/i8042-io.h
--- 2.6.9-rc1-mm2/drivers/input/serio/i8042-io.h 2004-09-02 09:49:05.000000000 -0600
+++ 2.6.9-rc1-mm2-kbd1/drivers/input/serio/i8042-io.h 2004-09-02 09:50:26.000000000 -0600
@@ -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;
}
diff -u -ur 2.6.9-rc1-mm2/drivers/input/serio/i8042.c 2.6.9-rc1-mm2-kbd1/drivers/input/serio/i8042.c
--- 2.6.9-rc1-mm2/drivers/input/serio/i8042.c 2004-09-02 09:49:05.000000000 -0600
+++ 2.6.9-rc1-mm2-kbd1/drivers/input/serio/i8042.c 2004-09-02 09:49:50.000000000 -0600
@@ -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);
next reply other threads:[~2004-09-02 16:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-02 16:09 Bjorn Helgaas [this message]
2004-09-02 17:56 Dmitry Torokhov
2004-09-02 21:29 ` Bjorn Helgaas
2004-09-03 6:57 ` Dmitry Torokhov
2004-09-03 15:41 ` Bjorn Helgaas
2004-09-06 12:22 ` Vojtech Pavlik
2004-09-06 18:28 ` Dmitry Torokhov
2004-09-06 19:58 ` Vojtech Pavlik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200409021009.23280.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rubini@ipvvis.unipv.it \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®