From patchwork Fri Feb 7 14:59:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Genoud X-Patchwork-Id: 3605871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A7F529F344 for ; Fri, 7 Feb 2014 15:09:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6034E20154 for ; Fri, 7 Feb 2014 15:09:31 +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 737D5200F4 for ; Fri, 7 Feb 2014 15:09:29 +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 1WBn0p-0003fO-8S; Fri, 07 Feb 2014 15:06:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBmvs-0004Iv-Bh; Fri, 07 Feb 2014 15:01:32 +0000 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBmv8-0004DC-Qe for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2014 15:01:00 +0000 Received: by mail-wi0-f176.google.com with SMTP id hi5so918992wib.9 for ; Fri, 07 Feb 2014 07:00:24 -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=iNzDDkrSaRE1C2LGi0W4rbkhNefOHe0jVXAXEz77Yc8=; b=x0sPS/zoBe7r2nchMDBDVtad6yz4rLh+TUgGi3ckaC/uWIO6MQX8GmJXHGIMKPssyR SScNkUO1yAwIM9gPLcWhSbYU+PjTUEtEsHZUheFgx6YBoPqzr1g3lZNFjeXIo1BFN7tK gf8BdnPcekCxRwCQ4PjgP0ZnBIbo+sqTgOL/uZRyZLxpA9ZlJqIn15n3nm8X9mV6qA3P zu7Db5Jl3jBvL68KC6+iu8GwkohKQc6TANC4N8LMlM//XJQc+pT0tZ1A2kRtow4QxAih ceL7SVVFG1ICXWBM1L1fWY4h6/mcWB6Ge4ptmttnZf8mVL2uagbYgPFWAV0lljuoJWw6 Jw5w== X-Received: by 10.180.98.71 with SMTP id eg7mr123677wib.31.1391785224842; Fri, 07 Feb 2014 07:00:24 -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.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Feb 2014 07:00:24 -0800 (PST) From: Richard Genoud To: Greg Kroah-Hartman Subject: [PATCH 6/8] tty/serial: at91: add dsr control via gpio Date: Fri, 7 Feb 2014 15:59:13 +0100 Message-Id: <1391785155-18525-7-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_100047_225009_44BBC5AB X-CRM114-Status: GOOD ( 18.60 ) 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 DSR 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 | 37 +++++++++++++++++++++- include/linux/platform_data/atmel.h | 1 + 9 files changed, 70 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/atmel-usart.txt b/Documentation/devicetree/bindings/serial/atmel-usart.txt index 77d45c88b494..3b90795ee641 100644 --- a/Documentation/devicetree/bindings/serial/atmel-usart.txt +++ b/Documentation/devicetree/bindings/serial/atmel-usart.txt @@ -19,6 +19,8 @@ Optional properties: function pin for the USART CTS feature. If unsure, don't specify this property. - dtr-gpios: specify a GPIO for DTR line. It will use specified PIO instead of the peripheral 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. - 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. @@ -42,6 +44,7 @@ Example: rts-gpios = <&pioD 15 0>; cts-gpios = <&pioD 16 0>; dtr-gpios = <&pioD 17 0>; + dsr-gpios = <&pioD 18 0>; }; - use DMA: diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index d8523cc05157..980ea65142b4 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -925,6 +925,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -966,6 +967,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1019,6 +1021,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1073,6 +1076,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1119,6 +1123,7 @@ static struct atmel_uart_data uart3_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 b8e325b00e1a..c11d1225a75c 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -822,6 +822,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -863,6 +864,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -917,6 +919,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -963,6 +966,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1009,6 +1013,7 @@ static struct atmel_uart_data uart3_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart3_dmamask = DMA_BIT_MASK(32); @@ -1055,6 +1060,7 @@ static struct atmel_uart_data uart4_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart4_dmamask = DMA_BIT_MASK(32); @@ -1096,6 +1102,7 @@ static struct atmel_uart_data uart5_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 3a05d9f09b0d..ea35af48a2e2 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -883,6 +883,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -924,6 +925,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -970,6 +972,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1016,6 +1019,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 d26255ba3907..c8833ebd4fcb 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -1327,6 +1327,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1368,6 +1369,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1414,6 +1416,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1460,6 +1463,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 67e9f7f259e1..76772d12acfd 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -1590,6 +1590,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1631,6 +1632,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1677,6 +1679,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1723,6 +1726,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1769,6 +1773,7 @@ static struct atmel_uart_data uart3_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 94fecc40dbba..2aa6f8ddcd53 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c @@ -959,6 +959,7 @@ static struct atmel_uart_data dbgu_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 dbgu_dmamask = DMA_BIT_MASK(32); @@ -1000,6 +1001,7 @@ static struct atmel_uart_data uart0_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart0_dmamask = DMA_BIT_MASK(32); @@ -1054,6 +1056,7 @@ static struct atmel_uart_data uart1_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart1_dmamask = DMA_BIT_MASK(32); @@ -1100,6 +1103,7 @@ static struct atmel_uart_data uart2_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_gpio = -EINVAL, }; static u64 uart2_dmamask = DMA_BIT_MASK(32); @@ -1146,6 +1150,7 @@ static struct atmel_uart_data uart3_data = { .rts_gpio = -EINVAL, .cts_gpio = -EINVAL, .dtr_gpio = -EINVAL, + .dsr_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 f5bdb84aed53..28b3636135cd 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -134,6 +134,8 @@ struct gpio_lines { int cts; /* optional CTS GPIO */ int cts_irq; int dtr; /* optional DTR GPIO */ + int dsr; /* optional DSR GPIO */ + int dsr_irq; }; /* @@ -262,6 +264,13 @@ static unsigned int atmel_get_lines_status(struct uart_port *port) status &= ~ATMEL_US_CTS; } + if (gpio_is_valid(atmel_port->gpio.dsr)) { + if (gpio_get_value(atmel_port->gpio.dsr)) + status |= ATMEL_US_DSR; + else + status &= ~ATMEL_US_DSR; + } + return status; } @@ -495,13 +504,18 @@ static void atmel_enable_ms(struct uart_port *port) atmel_port->ms_irq_enabled = true; - ier = ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC; + ier = ATMEL_US_RIIC | ATMEL_US_DCDIC; if (atmel_port->gpio.cts_irq != INVALID_IRQ) enable_irq(atmel_port->gpio.cts_irq); else ier |= ATMEL_US_CTSIC; + if (atmel_port->gpio.dsr_irq != INVALID_IRQ) + enable_irq(atmel_port->gpio.dsr_irq); + else + ier |= ATMEL_US_DSRIC; + UART_PUT_IER(port, ier); } @@ -1105,6 +1119,11 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id) if ((irq != INVALID_IRQ) && (irq == atmel_port->gpio.cts_irq)) pending |= ATMEL_US_CTSIC; + + if ((irq != INVALID_IRQ) && + (irq == atmel_port->gpio.dsr_irq)) + pending |= ATMEL_US_DSRIC; + gpio_handled = true; } if (!pending) @@ -1638,6 +1657,11 @@ static int atmel_startup(struct uart_port *port) if (retval) goto free_ctrl_irq; + retval = atmel_request_gpio_irq(port, atmel_port->gpio.dsr_irq, + "atmel_dsr_irq"); + if (retval) + goto free_cts_irq; + /* * Initialize DMA (if necessary) */ @@ -1703,6 +1727,9 @@ static int atmel_startup(struct uart_port *port) return 0; +free_cts_irq: + free_irq(atmel_port->gpio.cts_irq, port); + free_ctrl_irq: free_irq(port->irq, port); @@ -1759,6 +1786,8 @@ static void atmel_shutdown(struct uart_port *port) free_irq(port->irq, port); if (atmel_port->gpio.cts_irq != INVALID_IRQ) free_irq(atmel_port->gpio.cts_irq, port); + if (atmel_port->gpio.dsr_irq != INVALID_IRQ) + free_irq(atmel_port->gpio.dsr_irq, port); atmel_port->ms_irq_enabled = false; } @@ -2464,6 +2493,8 @@ static int atmel_init_gpios(struct atmel_uart_port *atmel_port, "CTS", &atmel_port->gpio.cts_irq); ret += atmel_request_gpio(&pdev->dev, atmel_port->gpio.dtr, "DTR", NULL); + ret += atmel_request_gpio(&pdev->dev, atmel_port->gpio.dsr, + "DSR", &atmel_port->gpio.dsr_irq); return ret; } @@ -2505,15 +2536,19 @@ static int atmel_serial_probe(struct platform_device *pdev) port->gpio.rts = -EINVAL; /* Invalid, zero could be valid */ port->gpio.cts = -EINVAL; port->gpio.dtr = -EINVAL; + port->gpio.dsr = -EINVAL; port->gpio.cts_irq = INVALID_IRQ; + port->gpio.dsr_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; } 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); } ret = atmel_init_gpios(port, pdev); diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 8472b6f3c618..81f2c658c996 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -87,6 +87,7 @@ struct atmel_uart_data { int rts_gpio; /* optional RTS GPIO */ int cts_gpio; /* optional CTS GPIO */ int dtr_gpio; /* optional DTR GPIO */ + int dsr_gpio; /* optional DSR GPIO */ }; /* Touchscreen Controller */