lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64] auxio: Convert to pure of_device driver.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-06-29 14:36:35 -07:00
committed by David S. Miller
parent 50312ce9dd
commit 36a59bd89c
1 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
arch/sparc64/kernel/auxio.c
View File

@@ -111,12 +111,6 @@ void auxio_set_lte(int on)
} }
} }
static void __devinit auxio_report_dev(struct device_node *dp)
{
printk(KERN_INFO "AUXIO: Found device at %s\n",
dp->full_name);
}
static struct of_device_id auxio_match[] = { static struct of_device_id auxio_match[] = {
{ {
.name = "auxio", .name = "auxio",
@@ -126,67 +120,48 @@ static struct of_device_id auxio_match[] = {
MODULE_DEVICE_TABLE(of, auxio_match); MODULE_DEVICE_TABLE(of, auxio_match);
#ifdef CONFIG_SBUS static int __devinit auxio_probe(struct of_device *dev, const struct of_device_id *match)
static int __devinit auxio_sbus_probe(struct of_device *dev, const struct of_device_id *match)
{ {
struct sbus_dev *sdev = to_sbus_device(&dev->dev); struct device_node *dp = dev->node;
unsigned long size;
auxio_devtype = AUXIO_TYPE_SBUS; if (!strcmp(dp->parent->name, "ebus")) {
auxio_register = sbus_ioremap(&sdev->resource[0], 0, auxio_devtype = AUXIO_TYPE_EBUS;
sdev->reg_addrs[0].reg_size, size = sizeof(u32);
"auxiliaryIO"); } else if (!strcmp(dp->parent->name, "sbus")) {
auxio_devtype = AUXIO_TYPE_SBUS;
size = 1;
} else {
printk("auxio: Unknown parent bus type [%s]\n",
dp->parent->name);
return -ENODEV;
}
auxio_register = of_ioremap(&dev->resource[0], 0, size, "auxio");
if (!auxio_register) if (!auxio_register)
return -ENODEV; return -ENODEV;
auxio_report_dev(dev->node); printk(KERN_INFO "AUXIO: Found device at %s\n",
return 0; dp->full_name);
}
static struct of_platform_driver auxio_sbus_driver = { if (auxio_devtype == AUXIO_TYPE_EBUS)
.name = "auxio", auxio_set_led(AUXIO_LED_ON);
.match_table = auxio_match,
.probe = auxio_sbus_probe,
};
#endif
#ifdef CONFIG_PCI
static int __devinit auxio_ebus_probe(struct of_device *dev, const struct of_device_id *match)
{
struct linux_ebus_device *edev = to_ebus_device(&dev->dev);
auxio_devtype = AUXIO_TYPE_EBUS;
auxio_register = ioremap(edev->resource[0].start, sizeof(u32));
if (!auxio_register)
return -ENODEV;
auxio_report_dev(dev->node);
auxio_set_led(AUXIO_LED_ON);
return 0; return 0;
} }
static struct of_platform_driver auxio_ebus_driver = { static struct of_platform_driver auxio_driver = {
.name = "auxio", .name = "auxio",
.match_table = auxio_match, .match_table = auxio_match,
.probe = auxio_ebus_probe, .probe = auxio_probe,
}; };
#endif
static int __init auxio_probe(void) static int __init auxio_init(void)
{ {
#ifdef CONFIG_SBUS return of_register_driver(&auxio_driver, &of_bus_type);
of_register_driver(&auxio_sbus_driver, &sbus_bus_type);
#endif
#ifdef CONFIG_PCI
of_register_driver(&auxio_ebus_driver, &ebus_bus_type);
#endif
return 0;
} }
/* Must be after subsys_initcall() so that busses are probed. Must /* Must be after subsys_initcall() so that busses are probed. Must
* be before device_initcall() because things like the floppy driver * be before device_initcall() because things like the floppy driver
* need to use the AUXIO register. * need to use the AUXIO register.
*/ */
fs_initcall(auxio_probe); fs_initcall(auxio_init);