This patch adds devicetree support to the altera_jtaguart driver.
Tested on hardware on the nios2 architecture.
diff --git a/drivers/serial/altera_jtaguart.c b/drivers/serial/altera_jtaguart.c
index f9b49b5..b71ba92 100644
--- a/drivers/serial/altera_jtaguart.c
+++ b/drivers/serial/altera_jtaguart.c
@@ -431,21 +431,44 @@ static int __devinit altera_jtaguart_probe(struct
platform_device *pdev)
{
struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;
struct uart_port *port;
- int i;
-
- for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase; i++) {
- port = &altera_jtaguart_ports[i].port;
-
- port->line = i;
- port->type = PORT_ALTERA_JTAGUART;
- port->mapbase = platp[i].mapbase;
- port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
- port->iotype = SERIAL_IO_MEM;
- port->irq = platp[i].irq;
- port->ops = &altera_jtaguart_ops;
- port->flags = ASYNC_BOOT_AUTOCONF;
-
- uart_add_one_port(&altera_jtaguart_driver, port);
+ if(platp) {
+ int i;
+ for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase;
i++) {
+ port = &altera_jtaguart_ports[i].port;
+
+ port->line = i;
+ port->type = PORT_ALTERA_JTAGUART;
+ port->mapbase = platp[i].mapbase;
+ port->membase = ioremap(port->mapbase,
ALTERA_JTAGUART_SIZE);
+ port->iotype = SERIAL_IO_MEM;
+ port->irq = platp[i].irq;
+ port->ops = &altera_jtaguart_ops;
+ port->flags = ASYNC_BOOT_AUTOCONF;
+
+ uart_add_one_port(&altera_jtaguart_driver, port);
+ }
+#ifdef CONFIG_OF
+ } else {
+ struct resource *res_irq;
+ struct resource *res_mem = platform_get_resource(pdev,
IORESOURCE_MEM, 0);
+ if(res_mem)
+ {
+ res_irq = platform_get_resource(pdev, IORESOURCE_IRQ,
0);
+ if(res_irq)
+ {
+ port = &altera_jtaguart_ports[0].port;
+ port->line = 0;
+ port->type = PORT_ALTERA_JTAGUART;
+ port->mapbase = res_mem->start;
+ port->membase = ioremap(port->mapbase,
ALTERA_JTAGUART_SIZE);
+ port->iotype = SERIAL_IO_MEM;
+ port->irq = res_irq->start;
+ port->ops = &altera_jtaguart_ops;
+ port->flags = ASYNC_BOOT_AUTOCONF;
+ uart_add_one_port(&altera_jtaguart_driver,
port);
+ }
+ }
+#endif
}
return 0;
@@ -464,6 +487,15 @@ static int __devexit altera_jtaguart_remove(struct
platform_device *pdev)
return 0;
}
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+ {
+ .compatible = "altera,altera_juart",
+ },
+ {},
+}
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#endif /* CONFIG_OF */
static struct platform_driver altera_jtaguart_platform_driver = {
.probe = altera_jtaguart_probe,
@@ -471,6 +503,9 @@ static struct platform_driver
altera_jtaguart_platform_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
+#ifdef CONFIG_OF
+ .of_match_table = altera_jtaguart_match,
+#endif
},
};
_______________________________________________
devicetree-discuss mailing list
[email protected]
https://lists.ozlabs.org/listinfo/devicetree-discuss
