From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 18 Jun 2013 21:14:25 +0200 (CEST) Received: from mail-pd0-f174.google.com ([209.85.192.174]:33919 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6834996Ab3FRTNNOkfGP (ORCPT ); Tue, 18 Jun 2013 21:13:13 +0200 Received: by mail-pd0-f174.google.com with SMTP id 10so4193645pdc.5 for ; Tue, 18 Jun 2013 12:13:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=b4CNIuBDGiQXoQgBzJI3jgKf5rQ930eY4KOgPdhbIpw=; b=xHxFwX8CbS4k/TeweqeQRNmY2Sn/Y/uEiAHEdU73i+KJiuePcLpcxIGNGZj+jZqzc3 GJRjrzC11RLRMdS/+175yKpiiJ+3G+cSsj8fkUYdVAVg8Xvm4TgO7CmQMHjuTdblFnzn fj8lk89MXSn7NV5Lj3sdhz4r7eX7eMDFcjtsWrLzeRqBYht1sV40x14Ot6c4xqQVWyEi FkVcdvgoKvtsemozCM5LQOsbO0Knhy9rigLCSkK++gNubUjFJcAToxeN0equt1uPRDCJ dZ80FDrjIAc44iPph+Vc5zy4BHABozM0Ax9c7oWla6V0Lj6QHsUGgS2YW48CMmcXcaII P1uQ== X-Received: by 10.68.69.108 with SMTP id d12mr18401640pbu.187.1371582786736; Tue, 18 Jun 2013 12:13:06 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id g8sm15492479pbq.6.2013.06.18.12.13.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 18 Jun 2013 12:13:05 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id r5IJD2Od012192; Tue, 18 Jun 2013 12:13:02 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id r5IJD2PE012191; Tue, 18 Jun 2013 12:13:02 -0700 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org, Jamie Iles , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Daney Subject: [PATCH 3/5] tty/8250_dw: Add support for OCTEON UARTS. Date: Tue, 18 Jun 2013 12:12:53 -0700 Message-Id: <1371582775-12141-4-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1371582775-12141-1-git-send-email-ddaney.cavm@gmail.com> References: <1371582775-12141-1-git-send-email-ddaney.cavm@gmail.com> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 36992 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ddaney.cavm@gmail.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips From: David Daney A few differences needed by OCTEON: o These are DWC UARTS, but have USR at a different offset. o OCTEON must have 64-bit wide register accesses, so we have OCTEON specific register accessors. o No UCV register, so we hard code some properties. Signed-off-by: David Daney --- drivers/tty/serial/8250/8250_dw.c | 45 +++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index d07b6af..a50c1d5 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -57,8 +57,30 @@ struct dw8250_data { int last_lcr; int line; struct clk *clk; + u8 usr_reg; + bool no_ucv; }; +static unsigned int dw8250_serial_inq(struct uart_port *p, int offset) +{ + offset <<= p->regshift; + + return (u8)__raw_readq(p->membase + offset); +} + +static void dw8250_serial_outq(struct uart_port *p, int offset, int value) +{ + struct dw8250_data *d = p->private_data; + + if (offset == UART_LCR) + d->last_lcr = value; + + offset <<= p->regshift; + __raw_writeq(value, p->membase + offset); + dw8250_serial_inq(p, UART_LCR); +} + + static void dw8250_serial_out(struct uart_port *p, int offset, int value) { struct dw8250_data *d = p->private_data; @@ -104,7 +126,7 @@ static int dw8250_handle_irq(struct uart_port *p) return 1; } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) { /* Clear the USR and write the LCR again. */ - (void)p->serial_in(p, DW_UART_USR); + (void)p->serial_in(p, d->usr_reg); p->serial_out(p, UART_LCR, d->last_lcr); return 1; @@ -125,12 +147,20 @@ dw8250_do_pm(struct uart_port *port, unsigned int state, unsigned int old) pm_runtime_put_sync_suspend(port->dev); } -static int dw8250_probe_of(struct uart_port *p) +static int dw8250_probe_of(struct uart_port *p, + struct dw8250_data *data) { struct device_node *np = p->dev->of_node; u32 val; - if (!of_property_read_u32(np, "reg-io-width", &val)) { + if (of_device_is_compatible(np, "cavium,octeon-3860-uart")) { + p->serial_in = dw8250_serial_inq; + p->serial_out = dw8250_serial_outq; + p->flags = ASYNC_SKIP_TEST | UPF_SHARE_IRQ | UPF_FIXED_TYPE; + p->type = PORT_OCTEON; + data->usr_reg = 0x27; + data->no_ucv = true; + } else if (!of_property_read_u32(np, "reg-io-width", &val)) { switch (val) { case 1: break; @@ -259,6 +289,7 @@ static int dw8250_probe(struct platform_device *pdev) if (!data) return -ENOMEM; + data->usr_reg = DW_UART_USR; data->clk = devm_clk_get(&pdev->dev, NULL); if (!IS_ERR(data->clk)) { clk_prepare_enable(data->clk); @@ -270,10 +301,8 @@ static int dw8250_probe(struct platform_device *pdev) uart.port.serial_out = dw8250_serial_out; uart.port.private_data = data; - dw8250_setup_port(&uart); - if (pdev->dev.of_node) { - err = dw8250_probe_of(&uart.port); + err = dw8250_probe_of(&uart.port, data); if (err) return err; } else if (ACPI_HANDLE(&pdev->dev)) { @@ -284,6 +313,9 @@ static int dw8250_probe(struct platform_device *pdev) return -ENODEV; } + if (!data->no_ucv) + dw8250_setup_port(&uart); + data->line = serial8250_register_8250_port(&uart); if (data->line < 0) return data->line; @@ -362,6 +394,7 @@ static const struct dev_pm_ops dw8250_pm_ops = { static const struct of_device_id dw8250_of_match[] = { { .compatible = "snps,dw-apb-uart" }, + { .compatible = "cavium,octeon-3860-uart" }, { /* Sentinel */ } }; MODULE_DEVICE_TABLE(of, dw8250_of_match); -- 1.7.11.7