From patchwork Thu Aug 23 07:35:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Prisk X-Patchwork-Id: 179534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qc0-f184.google.com (mail-qc0-f184.google.com [209.85.216.184]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 6D3CA2C00AD for ; Thu, 23 Aug 2012 17:35:59 +1000 (EST) Received: by qcsv15 with SMTP id v15sf486574qcs.11 for ; Thu, 23 Aug 2012 00:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=7Dq1h+1TwETDS4wGpsWPG/8gDi+saB+TMHAI8anssKM=; b=qKdAxe3mc2EqzK33fZNa9QSGJoXjQymcfXtAnk/vSRoA2ImYbNT9B+/OHBCHC074wt yfvjHTZGyJlO+iuyE5c4HDaRqVgbe98oV4FiUIV7IIIUt+Xr4LCv2LxVl6oZewjqvoBq O1R/vWIzJQG8jRmuwIkiqvwe9soDWPQO2NdSh/2JVB7eTtV0vhL/a3KlJmBzxK+m/GGY 4iKGrf2dscOcEIGIZC6qVhCCxAe3c58d+2hsajeO8hA4cpK/L2z4YhJzAo0tLXtbhBcb qk/ee0URvfNz3T7Hw813CJob119yzNbg4Z4HELF+3b30RuGRY57h9EI4gdh5F/WZf44r 4hzQ== Received: by 10.68.229.231 with SMTP id st7mr87717pbc.10.1345707356771; Thu, 23 Aug 2012 00:35:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.68.210.197 with SMTP id mw5ls1012144pbc.7.gmail; Thu, 23 Aug 2012 00:35:56 -0700 (PDT) Received: by 10.66.77.199 with SMTP id u7mr109497paw.25.1345707356346; Thu, 23 Aug 2012 00:35:56 -0700 (PDT) Received: by 10.66.77.199 with SMTP id u7mr109496paw.25.1345707356335; Thu, 23 Aug 2012 00:35:56 -0700 (PDT) Received: from mta02.xtra.co.nz (mta05.xtra.co.nz. [210.54.141.250]) by gmr-mx.google.com with ESMTP id nv4si2932195pbc.2.2012.08.23.00.35.55; Thu, 23 Aug 2012 00:35:56 -0700 (PDT) Received-SPF: neutral (google.com: 210.54.141.250 is neither permitted nor denied by best guess record for domain of linux@prisktech.co.nz) client-ip=210.54.141.250; Received: from localhost.localdomain ([115.188.14.127]) by mta02.xtra.co.nz with ESMTP id <20120823073554.BUIR8118.mta02.xtra.co.nz@localhost.localdomain>; Thu, 23 Aug 2012 19:35:54 +1200 From: Tony Prisk To: vt8500-wm8505-linux-kernel@googlegroups.com Cc: Tony Prisk , Russell King , Alessandro Zummo , Alan Cox , Greg Kroah-Hartman , Florian Tobias Schandinat , Arnd Bergmann , Grant Likely , Rob Herring , Rob Landley , Linus Walleij , Mike Turquette , Stephen Warren , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-serial@vger.kernel.org, rtc-linux@googlegroups.com, devicetree-discuss@lists.ozlabs.org Subject: [rtc-linux] [PATCHv4 3/9] serial: vt8500: Add devicetree support for vt8500-serial Date: Thu, 23 Aug 2012 19:35:39 +1200 Message-Id: <1345707346-9035-4-git-send-email-linux@prisktech.co.nz> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345707346-9035-1-git-send-email-linux@prisktech.co.nz> References: <1345707346-9035-1-git-send-email-linux@prisktech.co.nz> X-Original-Sender: linux@prisktech.co.nz X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 210.54.141.250 is neither permitted nor denied by best guess record for domain of linux@prisktech.co.nz) smtp.mail=linux@prisktech.co.nz Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , Increase vt8500_max_ports to 6 as the WM8505 as 6 available uarts. Use devicetree port id as primary addressing for ports but allow auto-allocation if id not specified. Signed-off-by: Tony Prisk Acked-by: Alan Cox --- drivers/tty/serial/vt8500_serial.c | 58 ++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 2be006f..205d4cf 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c @@ -34,6 +34,7 @@ #include #include #include +#include /* * UART Register offsets @@ -76,6 +77,8 @@ #define RX_FIFO_INTS (RXFAF | RXFF | RXOVER | PER | FER | RXTOUT) #define TX_FIFO_INTS (TXFAE | TXFE | TXUDR) +#define VT8500_MAX_PORTS 6 + struct vt8500_port { struct uart_port uart; char name[16]; @@ -83,6 +86,13 @@ struct vt8500_port { unsigned int ier; }; +/* + * we use this variable to keep track of which ports + * have been allocated as we can't use pdev->id in + * devicetree + */ +static unsigned long vt8500_ports_in_use; + static inline void vt8500_write(struct uart_port *port, unsigned int val, unsigned int off) { @@ -431,7 +441,7 @@ static int vt8500_verify_port(struct uart_port *port, return 0; } -static struct vt8500_port *vt8500_uart_ports[4]; +static struct vt8500_port *vt8500_uart_ports[VT8500_MAX_PORTS]; static struct uart_driver vt8500_uart_driver; #ifdef CONFIG_SERIAL_VT8500_CONSOLE @@ -548,7 +558,9 @@ static int __devinit vt8500_serial_probe(struct platform_device *pdev) { struct vt8500_port *vt8500_port; struct resource *mmres, *irqres; + struct device_node *np = pdev->dev.of_node; int ret; + int port; mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); @@ -559,16 +571,46 @@ static int __devinit vt8500_serial_probe(struct platform_device *pdev) if (!vt8500_port) return -ENOMEM; + if (np) + port = of_alias_get_id(np, "serial"); + if (port > VT8500_MAX_PORTS) + port = -1; + else + port = -1; + + if (port < 0) { + /* calculate the port id */ + port = find_first_zero_bit(&vt8500_ports_in_use, + sizeof(vt8500_ports_in_use)); + } + + if (port > VT8500_MAX_PORTS) + return -ENODEV; + + /* reserve the port id */ + if (test_and_set_bit(port, &vt8500_ports_in_use)) { + /* port already in use - shouldn't really happen */ + return -EBUSY; + } + vt8500_port->uart.type = PORT_VT8500; vt8500_port->uart.iotype = UPIO_MEM; vt8500_port->uart.mapbase = mmres->start; vt8500_port->uart.irq = irqres->start; vt8500_port->uart.fifosize = 16; vt8500_port->uart.ops = &vt8500_uart_pops; - vt8500_port->uart.line = pdev->id; + vt8500_port->uart.line = port; vt8500_port->uart.dev = &pdev->dev; vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; - vt8500_port->uart.uartclk = 24000000; + + vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); + if (vt8500_port->clk) { + vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); + } else { + /* use the default of 24Mhz if not specified and warn */ + pr_warn("%s: serial clock source not specified\n", __func__); + vt8500_port->uart.uartclk = 24000000; + } snprintf(vt8500_port->name, sizeof(vt8500_port->name), "VT8500 UART%d", pdev->id); @@ -579,7 +621,7 @@ static int __devinit vt8500_serial_probe(struct platform_device *pdev) goto err; } - vt8500_uart_ports[pdev->id] = vt8500_port; + vt8500_uart_ports[port] = vt8500_port; uart_add_one_port(&vt8500_uart_driver, &vt8500_port->uart); @@ -603,12 +645,18 @@ static int __devexit vt8500_serial_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id wmt_dt_ids[] = { + { .compatible = "via,vt8500-uart", }, + {} +}; + static struct platform_driver vt8500_platform_driver = { .probe = vt8500_serial_probe, .remove = __devexit_p(vt8500_serial_remove), .driver = { .name = "vt8500_serial", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(wmt_dt_ids), }, }; @@ -642,4 +690,4 @@ module_exit(vt8500_serial_exit); MODULE_AUTHOR("Alexey Charkov "); MODULE_DESCRIPTION("Driver for vt8500 serial device"); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2");