From patchwork Fri Feb 7 14:59:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 3605891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1FE7BF418 for ; Fri, 7 Feb 2014 15:12:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65A3020125 for ; Fri, 7 Feb 2014 15:12:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA11C20115 for ; Fri, 7 Feb 2014 15:12:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBn6H-0006nd-09; Fri, 07 Feb 2014 15:12:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBn14-0004Te-8N; Fri, 07 Feb 2014 15:06:54 +0000 Received: from mail-we0-x22c.google.com ([2a00:1450:400c:c03::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBn0z-0004SP-Nn for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2014 15:06:51 +0000 Received: by mail-we0-f172.google.com with SMTP id p61so2419685wes.3 for ; Fri, 07 Feb 2014 07:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NuWZ4XZ0yBC7oAPEgtWN/RZ8R6jChjKGaKybOXFxEPg=; b=CdccGalvzCPW85BuXDYpJM8FxyrPFvVtKDgw+CmYztNUO5K3weM2QO3/El59FzNqsI 0M34hGfew/B5E/fe5XFLIc/QyPMtNMJsjCp718ACSfKB3qBTut93IxSxjDcxz+rAM8b3 k7AGs//nJhIkMZCtkQLmS9YijOz4aNAXAX8WM1t0ix7f2CPJvloX2s08XynjSviT+kIb Y5h6tUGUKX9s/hdnweBvrv41zASMvirNvbt9Fs6TOcN5MqCdv49TUaoVAB432IIXb+oR 4wCD5daUg8ApgLBuIJL9eb3KQXTp+ugKEbCasNge9aPDsileLr+zWYoyVD1xb0vxEg9O 71hA== X-Received: by 10.180.188.66 with SMTP id fy2mr99485wic.45.1391785228085; Fri, 07 Feb 2014 07:00:28 -0800 (PST) Received: from lnx-rg.pr (lyon.paratronic.fr. [213.41.177.106]) by mx.google.com with ESMTPSA id ha1sm11330842wjc.23.2014.02.07.07.00.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Feb 2014 07:00:27 -0800 (PST) From: Richard Genoud To: Greg Kroah-Hartman Subject: [PATCH 7/8] tty/serial: at91: add ring control via gpio Date: Fri, 7 Feb 2014 15:59:14 +0100 Message-Id: <1391785155-18525-8-git-send-email-richard.genoud@gmail.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1391785155-18525-1-git-send-email-richard.genoud@gmail.com> References: <1391785155-18525-1-git-send-email-richard.genoud@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140207_100650_007555_88A8C502 X-CRM114-Status: GOOD ( 18.23 ) X-Spam-Score: -2.0 (--) Cc: Richard Genoud , Linus Walleij , Nicolas Ferre , linux-serial@vger.kernel.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On sam9x5, the USART controller doesn't handle DTR/DSR/DCD/RI signals, so we have to control them via GPIO. This patch permits to use a GPIO to control the RI signal. Signed-off-by: Richard Genoud --- .../devicetree/bindings/serial/atmel-usart.txt | 3 ++ arch/arm/mach-at91/at91rm9200_devices.c | 5 +++ arch/arm/mach-at91/at91sam9260_devices.c | 7 +++++ arch/arm/mach-at91/at91sam9261_devices.c | 4 +++ arch/arm/mach-at91/at91sam9263_devices.c | 4 +++ arch/arm/mach-at91/at91sam9g45_devices.c | 5 +++ arch/arm/mach-at91/at91sam9rl_devices.c | 5 +++ drivers/tty/serial/atmel_serial.c | 36 +++++++++++++++++++++- include/linux/platform_data/atmel.h | 1 + 9 files changed, 69 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/atmel-usart.txt b/Documentation/devicetree/bindings/serial/atmel-usart.txt index 3b90795ee641..11d033649b19 100644 --- a/Documentation/devicetree/bindings/serial/atmel-usart.txt +++ b/Documentation/devicetree/bindings/serial/atmel-usart.txt @@ -21,6 +21,8 @@ Optional properties: function pin for the USART DTR feature. If unsure, don't specify this property. - dsr-gpios: specify a GPIO for DSR line. It will use specified PIO instead of the peripheral function pin for the USART DSR feature. If unsure, don't specify this property. +- ri-gpios: specify a GPIO for Ring line. It will use specified PIO instead of the peripheral + function pin for the USART Ring feature. If unsure, don't specify this property. - add dma bindings for dma transfer: - dmas: DMA specifier, consisting of a phandle to DMA controller node, memory peripheral interface and USART DMA channel ID, FIFO configuration. @@ -45,6 +47,7 @@ Example: cts-gpios = <&pioD 16 0>; dtr-gpios = <&pioD 17 0>; dsr-gpios = <&pioD 18 0>; + ri-gpios = <&pioD 19 0>; }; - use DMA: diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 980ea65142b4..11c5c7f5b067 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -926,6 +926,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -968,6 +969,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1022,6 +1024,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1077,6 +1080,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1124,6 +1128,7 @@ static struct atmel_uart_data uart3_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart3_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index c11d1225a75c..f8ccdbe2bcbc 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -823,6 +823,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -865,6 +866,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -920,6 +922,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -967,6 +970,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1014,6 +1018,7 @@ static struct atmel_uart_data uart3_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart3_dmamask = DMA_BIT_MASK(32); @@ -1061,6 +1066,7 @@ static struct atmel_uart_data uart4_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart4_dmamask = DMA_BIT_MASK(32); @@ -1103,6 +1109,7 @@ static struct atmel_uart_data uart5_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart5_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index ea35af48a2e2..c40aa819cfac 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -884,6 +884,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -926,6 +927,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -973,6 +975,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1020,6 +1023,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index c8833ebd4fcb..1da08465d952 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -1328,6 +1328,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1370,6 +1371,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1417,6 +1419,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1464,6 +1467,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 76772d12acfd..4520d8f70cff 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -1591,6 +1591,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1633,6 +1634,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1680,6 +1682,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1727,6 +1730,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1774,6 +1778,7 @@ static struct atmel_uart_data uart3_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart3_dmamask = DMA_BIT_MASK(32); diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 2aa6f8ddcd53..5916d65b6362 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c @@ -960,6 +960,7 @@ static struct atmel_uart_data dbgu_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1002,6 +1003,7 @@ static struct atmel_uart_data uart0_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1057,6 +1059,7 @@ static struct atmel_uart_data uart1_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1104,6 +1107,7 @@ static struct atmel_uart_data uart2_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1151,6 +1155,7 @@ static struct atmel_uart_data uart3_data = { .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, .dsr_gpio = -EINVAL, + .ri_gpio = -EINVAL, }; static u64 uart3_dmamask = DMA_BIT_MASK(32); diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 28b3636135cd..9d47497713ab 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -136,6 +136,8 @@ struct gpio_lines { int dtr; /* optional DTR GPIO */ int dsr; /* optional DSR GPIO */ int dsr_irq; + int ri; /* optional Ring GPIO */ + int ri_irq; }; /* @@ -271,6 +273,13 @@ static unsigned int atmel_get_lines_status(struct uart_port *port) status &= ~ATMEL_US_DSR; } + if (gpio_is_valid(atmel_port->gpio.ri)) { + if (gpio_get_value(atmel_port->gpio.ri)) + status |= ATMEL_US_RI; + else + status &= ~ATMEL_US_RI; + } + return status; } @@ -504,7 +513,7 @@ static void atmel_enable_ms(struct uart_port *port) atmel_port->ms_irq_enabled = true; - ier = ATMEL_US_RIIC | ATMEL_US_DCDIC; + ier = ATMEL_US_DCDIC; if (atmel_port->gpio.cts_irq != INVALID_IRQ) enable_irq(atmel_port->gpio.cts_irq); @@ -516,6 +525,11 @@ static void atmel_enable_ms(struct uart_port *port) else ier |= ATMEL_US_DSRIC; + if (atmel_port->gpio.ri_irq != INVALID_IRQ) + enable_irq(atmel_port->gpio.ri_irq); + else + ier |= ATMEL_US_RIIC; + UART_PUT_IER(port, ier); } @@ -1124,6 +1138,10 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id) (irq == atmel_port->gpio.dsr_irq)) pending |= ATMEL_US_DSRIC; + if ((irq != INVALID_IRQ) && + (irq == atmel_port->gpio.ri_irq)) + pending |= ATMEL_US_RIIC; + gpio_handled = true; } if (!pending) @@ -1662,6 +1680,11 @@ static int atmel_startup(struct uart_port *port) if (retval) goto free_cts_irq; + retval = atmel_request_gpio_irq(port, atmel_port->gpio.ri_irq, + "atmel_ri_irq"); + if (retval) + goto free_dsr_irq; + /* * Initialize DMA (if necessary) */ @@ -1727,6 +1750,9 @@ static int atmel_startup(struct uart_port *port) return 0; +free_dsr_irq: + free_irq(atmel_port->gpio.dsr_irq, port); + free_cts_irq: free_irq(atmel_port->gpio.cts_irq, port); @@ -1788,6 +1814,8 @@ static void atmel_shutdown(struct uart_port *port) free_irq(atmel_port->gpio.cts_irq, port); if (atmel_port->gpio.dsr_irq != INVALID_IRQ) free_irq(atmel_port->gpio.dsr_irq, port); + if (atmel_port->gpio.ri_irq != INVALID_IRQ) + free_irq(atmel_port->gpio.ri_irq, port); atmel_port->ms_irq_enabled = false; } @@ -2495,6 +2523,8 @@ static int atmel_init_gpios(struct atmel_uart_port *atmel_port, "DTR", NULL); ret += atmel_request_gpio(&pdev->dev, atmel_port->gpio.dsr, "DSR", &atmel_port->gpio.dsr_irq); + ret += atmel_request_gpio(&pdev->dev, atmel_port->gpio.ri, + "RI", &atmel_port->gpio.ri_irq); return ret; } @@ -2537,18 +2567,22 @@ static int atmel_serial_probe(struct platform_device *pdev) port->gpio.cts = -EINVAL; port->gpio.dtr = -EINVAL; port->gpio.dsr = -EINVAL; + port->gpio.ri = -EINVAL; port->gpio.cts_irq = INVALID_IRQ; port->gpio.dsr_irq = INVALID_IRQ; + port->gpio.ri_irq = INVALID_IRQ; if (pdata) { port->gpio.rts = pdata->rts_gpio; port->gpio.cts = pdata->cts_gpio; port->gpio.dtr = pdata->dtr_gpio; port->gpio.dsr = pdata->dsr_gpio; + port->gpio.ri = pdata->ri_gpio; } else if (np) { port->gpio.rts = of_get_named_gpio(np, "rts-gpios", 0); port->gpio.cts = of_get_named_gpio(np, "cts-gpios", 0); port->gpio.dtr = of_get_named_gpio(np, "dtr-gpios", 0); port->gpio.dsr = of_get_named_gpio(np, "dsr-gpios", 0); + port->gpio.ri = of_get_named_gpio(np, "ri-gpios", 0); } ret = atmel_init_gpios(port, pdev); diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 81f2c658c996..ce6ca1b8aef3 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -88,6 +88,7 @@ struct atmel_uart_data { int cts_gpio; /* optional CTS GPIO */ int dtr_gpio; /* optional DTR GPIO */ int dsr_gpio; /* optional DSR GPIO */ + int ri_gpio; /* optional Ring GPIO */ }; /* Touchscreen Controller */