summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-06-27 13:32:34 +0100
committerGrant Likely <grant.likely@secretlab.ca>2011-06-30 13:02:00 -0600
commit7423734e19e7e0a90e3379152eacca2647f4377e (patch)
tree134745d5a331c27fa0a63da59264a2aceaa0d4ac /drivers/tty/serial
parent61ab1a90d81b5b8a53fc221a3665715c61614fb7 (diff)
downloadlinux-7423734e19e7e0a90e3379152eacca2647f4377e.tar.bz2
tty: of_serial: support for 32 bit accesses
Some platforms e.g. TI Davinci require 32-bit accesses to the UARTs. The of_serial driver currently registers all UARTs as UPIO_MEM. Add a new attribute "reg-io-width" to allow the port to be registered with different IO width requirements. Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/of_serial.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index c911b2419abb..36038ed8f09a 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c
@@ -65,6 +65,23 @@ static int __devinit of_platform_serial_setup(struct platform_device *ofdev,
port->irq = irq_of_parse_and_map(np, 0);
port->iotype = UPIO_MEM;
+ prop = of_get_property(np, "reg-io-width", &prop_size);
+ if (prop && (prop_size == sizeof(u32))) {
+ switch (be32_to_cpup(prop)) {
+ case 1:
+ port->iotype = UPIO_MEM;
+ break;
+ case 4:
+ port->iotype = UPIO_MEM32;
+ break;
+ default:
+ dev_warn(&ofdev->dev,
+ "unsupported io width (%d bytes)\n",
+ be32_to_cpup(prop));
+ return -EINVAL;
+ }
+ }
+
port->type = type;
port->uartclk = be32_to_cpup(clk);
port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP