Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758284AbbEVP4S (ORCPT ); Fri, 22 May 2015 11:56:18 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:49543 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758263AbbEVP4N (ORCPT ); Fri, 22 May 2015 11:56:13 -0400 From: Paul Burton To: CC: , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , "Paul Burton" , Greg Kroah-Hartman , Jiri Slaby , , Subject: [PATCH 08/15] of_serial: support for UARTs on I/O ports Date: Fri, 22 May 2015 16:51:07 +0100 Message-ID: <1432309875-9712-9-git-send-email-paul.burton@imgtec.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1432309875-9712-1-git-send-email-paul.burton@imgtec.com> References: <1432309875-9712-1-git-send-email-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.159.131] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1249 Lines: 36 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 --- 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; -- 2.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/