m68k: amiga - Serial port platform device conversion
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Родитель
314c926f64
Коммит
826e8c8c80
|
@ -168,6 +168,9 @@ static int __init amiga_init_devices(void)
|
||||||
if (AMIGAHW_PRESENT(AMI_MOUSE))
|
if (AMIGAHW_PRESENT(AMI_MOUSE))
|
||||||
platform_device_register_simple("amiga-mouse", -1, NULL, 0);
|
platform_device_register_simple("amiga-mouse", -1, NULL, 0);
|
||||||
|
|
||||||
|
if (AMIGAHW_PRESENT(AMI_SERIAL))
|
||||||
|
platform_device_register_simple("amiga-serial", -1, NULL, 0);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,7 @@ static char *serial_version = "4.30";
|
||||||
#include <linux/smp_lock.h>
|
#include <linux/smp_lock.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
|
@ -1954,29 +1955,16 @@ static const struct tty_operations serial_ops = {
|
||||||
/*
|
/*
|
||||||
* The serial driver boot-time initialization code!
|
* The serial driver boot-time initialization code!
|
||||||
*/
|
*/
|
||||||
static int __init rs_init(void)
|
static int __init amiga_serial_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct serial_state * state;
|
struct serial_state * state;
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_SERIAL))
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
serial_driver = alloc_tty_driver(1);
|
serial_driver = alloc_tty_driver(1);
|
||||||
if (!serial_driver)
|
if (!serial_driver)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
/*
|
|
||||||
* We request SERDAT and SERPER only, because the serial registers are
|
|
||||||
* too spreaded over the custom register space
|
|
||||||
*/
|
|
||||||
if (!request_mem_region(CUSTOM_PHYSADDR+0x30, 4,
|
|
||||||
"amiserial [Paula]")) {
|
|
||||||
error = -EBUSY;
|
|
||||||
goto fail_put_tty_driver;
|
|
||||||
}
|
|
||||||
|
|
||||||
IRQ_ports = NULL;
|
IRQ_ports = NULL;
|
||||||
|
|
||||||
show_serial_version();
|
show_serial_version();
|
||||||
|
@ -1998,7 +1986,7 @@ static int __init rs_init(void)
|
||||||
|
|
||||||
error = tty_register_driver(serial_driver);
|
error = tty_register_driver(serial_driver);
|
||||||
if (error)
|
if (error)
|
||||||
goto fail_release_mem_region;
|
goto fail_put_tty_driver;
|
||||||
|
|
||||||
state = rs_table;
|
state = rs_table;
|
||||||
state->magic = SSTATE_MAGIC;
|
state->magic = SSTATE_MAGIC;
|
||||||
|
@ -2050,23 +2038,24 @@ static int __init rs_init(void)
|
||||||
ciab.ddra |= (SER_DTR | SER_RTS); /* outputs */
|
ciab.ddra |= (SER_DTR | SER_RTS); /* outputs */
|
||||||
ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR); /* inputs */
|
ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR); /* inputs */
|
||||||
|
|
||||||
|
platform_set_drvdata(pdev, state);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_free_irq:
|
fail_free_irq:
|
||||||
free_irq(IRQ_AMIGA_TBE, state);
|
free_irq(IRQ_AMIGA_TBE, state);
|
||||||
fail_unregister:
|
fail_unregister:
|
||||||
tty_unregister_driver(serial_driver);
|
tty_unregister_driver(serial_driver);
|
||||||
fail_release_mem_region:
|
|
||||||
release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
|
|
||||||
fail_put_tty_driver:
|
fail_put_tty_driver:
|
||||||
put_tty_driver(serial_driver);
|
put_tty_driver(serial_driver);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
static __exit void rs_exit(void)
|
static int __exit amiga_serial_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
struct async_struct *info = rs_table[0].info;
|
struct serial_state *state = platform_get_drvdata(pdev);
|
||||||
|
struct async_struct *info = state->info;
|
||||||
|
|
||||||
/* printk("Unloading %s: version %s\n", serial_name, serial_version); */
|
/* printk("Unloading %s: version %s\n", serial_name, serial_version); */
|
||||||
tasklet_kill(&info->tlet);
|
tasklet_kill(&info->tlet);
|
||||||
|
@ -2075,19 +2064,38 @@ static __exit void rs_exit(void)
|
||||||
error);
|
error);
|
||||||
put_tty_driver(serial_driver);
|
put_tty_driver(serial_driver);
|
||||||
|
|
||||||
if (info) {
|
|
||||||
rs_table[0].info = NULL;
|
rs_table[0].info = NULL;
|
||||||
kfree(info);
|
kfree(info);
|
||||||
}
|
|
||||||
|
|
||||||
free_irq(IRQ_AMIGA_TBE, rs_table);
|
free_irq(IRQ_AMIGA_TBE, rs_table);
|
||||||
free_irq(IRQ_AMIGA_RBF, rs_table);
|
free_irq(IRQ_AMIGA_RBF, rs_table);
|
||||||
|
|
||||||
release_mem_region(CUSTOM_PHYSADDR+0x30, 4);
|
platform_set_drvdata(pdev, NULL);
|
||||||
|
|
||||||
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(rs_init)
|
static struct platform_driver amiga_serial_driver = {
|
||||||
module_exit(rs_exit)
|
.remove = __exit_p(amiga_serial_remove),
|
||||||
|
.driver = {
|
||||||
|
.name = "amiga-serial",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init amiga_serial_init(void)
|
||||||
|
{
|
||||||
|
return platform_driver_probe(&amiga_serial_driver, amiga_serial_probe);
|
||||||
|
}
|
||||||
|
|
||||||
|
module_init(amiga_serial_init);
|
||||||
|
|
||||||
|
static void __exit amiga_serial_exit(void)
|
||||||
|
{
|
||||||
|
platform_driver_unregister(&amiga_serial_driver);
|
||||||
|
}
|
||||||
|
|
||||||
|
module_exit(amiga_serial_exit);
|
||||||
|
|
||||||
|
|
||||||
#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
|
#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE)
|
||||||
|
@ -2154,3 +2162,4 @@ console_initcall(amiserial_console_init);
|
||||||
#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
|
#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */
|
||||||
|
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
MODULE_ALIAS("platform:amiga-serial");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче