patchbot at xen
Aug 8, 2013, 10:24 PM
Post #1 of 1
(8 views)
Permalink
|
|
[xen master] pl011: Implement vuart_info callback
|
|
commit 6349b01651c4c915a7e9600fcf3f6f77cb5cf9bb
Author: Julien Grall <julien.grall [at] linaro>
AuthorDate: Thu Aug 1 17:09:32 2013 +0100
Commit: Ian Campbell <ian.campbell [at] citrix>
CommitDate: Thu Aug 8 12:55:51 2013 +0100
pl011: Implement vuart_info callback
Signed-off-by: Julien Grall <julien.grall [at] linaro>
Reviewed-by: Tim Deegan <tim [at] xen>
---
xen/drivers/char/pl011.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index fd87e68..05d034f 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -36,6 +36,7 @@ static struct pl011 {
void __iomem *regs;
/* UART with IRQ line: interrupt-driven I/O. */
struct irqaction irqaction;
+ struct vuart_info vuart;
/* /\* UART with no IRQ line: periodically-polled I/O. *\/ */
/* struct timer timer; */
/* unsigned int timeout_ms; */
@@ -190,6 +191,13 @@ static const struct dt_irq __init *pl011_dt_irq(struct serial_port *port)
return &uart->irq;
}
+static const struct vuart_info *pl011_vuart(struct serial_port *port)
+{
+ struct pl011 *uart = port->uart;
+
+ return &uart->vuart;
+}
+
static struct uart_driver __read_mostly pl011_driver = {
.init_preirq = pl011_init_preirq,
.init_postirq = pl011_init_postirq,
@@ -201,6 +209,7 @@ static struct uart_driver __read_mostly pl011_driver = {
.getc = pl011_getc,
.irq = pl011_irq,
.dt_irq_get = pl011_dt_irq,
+ .vuart_info = pl011_vuart,
};
/* TODO: Parse UART config from the command line */
@@ -248,6 +257,12 @@ static int __init pl011_uart_init(struct dt_device_node *dev,
return res;
}
+ uart->vuart.base_addr = addr;
+ uart->vuart.size = size;
+ uart->vuart.data_off = DR;
+ uart->vuart.status_off = FR;
+ uart->vuart.status = 0;
+
/* Register with generic serial driver. */
serial_register_uart(SERHND_DTUART, &pl011_driver, uart);
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
