mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-22 17:33:01 +00:00
4018294b53
.name, .match_table and .owner are duplicated in both of_platform_driver and device_driver. This patch is a removes the extra copies from struct of_platform_driver and converts all users to the device_driver members. This patch is a pretty mechanical change. The usage model doesn't change and if any drivers have been missed, or if anything has been fixed up incorrectly, then it will fail with a compile time error, and the fixup will be trivial. This patch looks big and scary because it touches so many files, but it should be pretty safe. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sean MacLennan <smaclennan@pikatech.com>
159 lines
3.4 KiB
C
159 lines
3.4 KiB
C
#ifndef _I8042_SPARCIO_H
|
|
#define _I8042_SPARCIO_H
|
|
|
|
#include <linux/of_device.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/oplib.h>
|
|
#include <asm/prom.h>
|
|
|
|
static int i8042_kbd_irq = -1;
|
|
static int i8042_aux_irq = -1;
|
|
#define I8042_KBD_IRQ i8042_kbd_irq
|
|
#define I8042_AUX_IRQ i8042_aux_irq
|
|
|
|
#define I8042_KBD_PHYS_DESC "sparcps2/serio0"
|
|
#define I8042_AUX_PHYS_DESC "sparcps2/serio1"
|
|
#define I8042_MUX_PHYS_DESC "sparcps2/serio%d"
|
|
|
|
static void __iomem *kbd_iobase;
|
|
static struct resource *kbd_res;
|
|
|
|
#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
|
|
#define I8042_DATA_REG (kbd_iobase + 0x60UL)
|
|
|
|
static inline int i8042_read_data(void)
|
|
{
|
|
return readb(kbd_iobase + 0x60UL);
|
|
}
|
|
|
|
static inline int i8042_read_status(void)
|
|
{
|
|
return readb(kbd_iobase + 0x64UL);
|
|
}
|
|
|
|
static inline void i8042_write_data(int val)
|
|
{
|
|
writeb(val, kbd_iobase + 0x60UL);
|
|
}
|
|
|
|
static inline void i8042_write_command(int val)
|
|
{
|
|
writeb(val, kbd_iobase + 0x64UL);
|
|
}
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
|
#define OBP_PS2KBD_NAME1 "kb_ps2"
|
|
#define OBP_PS2KBD_NAME2 "keyboard"
|
|
#define OBP_PS2MS_NAME1 "kdmouse"
|
|
#define OBP_PS2MS_NAME2 "mouse"
|
|
|
|
static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match)
|
|
{
|
|
struct device_node *dp = op->dev.of_node;
|
|
|
|
dp = dp->child;
|
|
while (dp) {
|
|
if (!strcmp(dp->name, OBP_PS2KBD_NAME1) ||
|
|
!strcmp(dp->name, OBP_PS2KBD_NAME2)) {
|
|
struct of_device *kbd = of_find_device_by_node(dp);
|
|
unsigned int irq = kbd->irqs[0];
|
|
if (irq == 0xffffffff)
|
|
irq = op->irqs[0];
|
|
i8042_kbd_irq = irq;
|
|
kbd_iobase = of_ioremap(&kbd->resource[0],
|
|
0, 8, "kbd");
|
|
kbd_res = &kbd->resource[0];
|
|
} else if (!strcmp(dp->name, OBP_PS2MS_NAME1) ||
|
|
!strcmp(dp->name, OBP_PS2MS_NAME2)) {
|
|
struct of_device *ms = of_find_device_by_node(dp);
|
|
unsigned int irq = ms->irqs[0];
|
|
if (irq == 0xffffffff)
|
|
irq = op->irqs[0];
|
|
i8042_aux_irq = irq;
|
|
}
|
|
|
|
dp = dp->sibling;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit sparc_i8042_remove(struct of_device *op)
|
|
{
|
|
of_iounmap(kbd_res, kbd_iobase, 8);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id sparc_i8042_match[] = {
|
|
{
|
|
.name = "8042",
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sparc_i8042_match);
|
|
|
|
static struct of_platform_driver sparc_i8042_driver = {
|
|
.driver = {
|
|
.name = "i8042",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = sparc_i8042_match,
|
|
},
|
|
.probe = sparc_i8042_probe,
|
|
.remove = __devexit_p(sparc_i8042_remove),
|
|
};
|
|
|
|
static int __init i8042_platform_init(void)
|
|
{
|
|
struct device_node *root = of_find_node_by_path("/");
|
|
|
|
if (!strcmp(root->name, "SUNW,JavaStation-1")) {
|
|
/* Hardcoded values for MrCoffee. */
|
|
i8042_kbd_irq = i8042_aux_irq = 13 | 0x20;
|
|
kbd_iobase = ioremap(0x71300060, 8);
|
|
if (!kbd_iobase)
|
|
return -ENODEV;
|
|
} else {
|
|
int err = of_register_driver(&sparc_i8042_driver,
|
|
&of_bus_type);
|
|
if (err)
|
|
return err;
|
|
|
|
if (i8042_kbd_irq == -1 ||
|
|
i8042_aux_irq == -1) {
|
|
if (kbd_iobase) {
|
|
of_iounmap(kbd_res, kbd_iobase, 8);
|
|
kbd_iobase = (void __iomem *) NULL;
|
|
}
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
|
|
i8042_reset = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline void i8042_platform_exit(void)
|
|
{
|
|
struct device_node *root = of_find_node_by_path("/");
|
|
|
|
if (strcmp(root->name, "SUNW,JavaStation-1"))
|
|
of_unregister_driver(&sparc_i8042_driver);
|
|
}
|
|
|
|
#else /* !CONFIG_PCI */
|
|
static int __init i8042_platform_init(void)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline void i8042_platform_exit(void)
|
|
{
|
|
}
|
|
#endif /* !CONFIG_PCI */
|
|
|
|
#endif /* _I8042_SPARCIO_H */
|