[ + Arnd who has been reviewing/acking of_serial.c changes ] On 05/22/2015 11:51 AM, Paul Burton wrote: > If the address provided for the UART is of an I/O port rather than > a regular memory address, then set the port iotype appropriately and > write the address to iobase rather than mapbase. > > Signed-off-by: Paul Burton <paul.burton@xxxxxxxxxx> > --- > > drivers/tty/serial/of_serial.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c > index 137381e..ccff9ba 100644 > --- a/drivers/tty/serial/of_serial.c > +++ b/drivers/tty/serial/of_serial.c > @@ -110,7 +110,12 @@ static int of_platform_serial_setup(struct platform_device *ofdev, > > port->irq = irq_of_parse_and_map(np, 0); > port->iotype = UPIO_MEM; > - if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { > + > + if (resource.flags & IORESOURCE_IO) { > + port->iotype = UPIO_PORT; > + port->iobase = port->mapbase; > + port->mapbase = 0; > + } else if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { > switch (prop) { > case 1: > port->iotype = UPIO_MEM; >