From patchwork Thu Jun 9 15:10:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhuvanchandra DV X-Patchwork-Id: 9167317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 258AD604DB for ; Thu, 9 Jun 2016 15:28:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1728428338 for ; Thu, 9 Jun 2016 15:28:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0AAA828356; Thu, 9 Jun 2016 15:28:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85C9328338 for ; Thu, 9 Jun 2016 15:28:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932664AbcFIP1r (ORCPT ); Thu, 9 Jun 2016 11:27:47 -0400 Received: from mail-db3on0140.outbound.protection.outlook.com ([157.55.234.140]:62211 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932543AbcFIP1n (ORCPT ); Thu, 9 Jun 2016 11:27:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.onmicrosoft.com; s=selector1-toradex-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=iMtWeXzR0L1KiLpIAuSpbt5SewV0V/jvTDllhe/Bsx4=; b=IAPvyWYsvWAn9JyGpjZc7U0F6AU/TR4pBWN6P8k+oRI03bk4R7A+gBwQJEmLhm89RQWBe6lxpI7qM8Je6CIPR7OOvrqFP/+oRwcWxNPDn+VCLErQMaBf7oT5LEU5pqAZuKaIj8IP3LsPCkRCS3yKyukOPoSWsHjDufrO2XpKJ6o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=bhuvanchandra.dv@toradex.com; Received: from tdx-in-nb-0014.toradex.ext (115.115.243.34) by DB4PR05MB270.eurprd05.prod.outlook.com (10.242.158.24) with Microsoft SMTP Server (TLS) id 15.1.511.8; Thu, 9 Jun 2016 15:11:47 +0000 From: Bhuvanchandra DV To: CC: , , , , , , , , , , Bhuvanchandra DV Subject: [PATCH 8/8] tty: serial: fsl_lpuart: Add support for RS-485 Date: Thu, 9 Jun 2016 20:40:39 +0530 Message-ID: <20160609151039.20817-9-bhuvanchandra.dv@toradex.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160609151039.20817-1-bhuvanchandra.dv@toradex.com> References: <20160609151039.20817-1-bhuvanchandra.dv@toradex.com> MIME-Version: 1.0 X-Originating-IP: [115.115.243.34] X-ClientProxiedBy: SIXPR04CA0050.apcprd04.prod.outlook.com (10.162.171.40) To DB4PR05MB270.eurprd05.prod.outlook.com (10.242.158.24) X-MS-Office365-Filtering-Correlation-Id: 9d74a134-24e8-4c51-54ac-08d39078635f X-Microsoft-Exchange-Diagnostics: 1; DB4PR05MB270; 2:bcOGuDg+Rvc8p8KFzdYPrqCn1vGe7w6/g6CgXB0Nuslw7K5LsBWdgXzWXdzd5TNc4XI+y00ZrO6jRJjbRhH6KnLPdHavRE10wn09v0A9b3KyIEDmW7ST1ogNqV4viWeuvezl33sOZFb0HsnXL3gDzRO3Q3t+NgpK0Agwni7+PoTpm3a5cQhk883BLdhxYWzb; 3:WSGknzco+0NI832RxbcjMysWkX6fVt7K/5uJNPD/JqDUOmNoKt/SB2NqSHeZcGlQdc6DLyG0CtzGsMzITYm2BcF86Jge9ITJQFQA0yqt8CpzSx0kj9N3n+tiTThlqcGG; 25:1xJPQKbgJirCI2aoOKi/iXp8aaf0vFAjM2dkomD3wkOCu0g3KuvBK3L0gMzkNQHcw0/sP0mGrvJqZQSrrigUVzhSxvT59sjoHDS4Is9Z3Nqk9F1gTk4akr7AlIf/Nm1t4DV8VkZEa2mFnmVKpjetIMM6h6zLtf0ZLOFaMoOF+F2DUqnKfULdZVwE7hLNourL3+ajADsfZlQRJugTdnKNygVEuDn0I8g5wB4+L5RQddxuAj0u3o1rEwzHpdGhN09xqJhfwZwKa4F5u9gz+gyP/vn+UyMXtPu6j9qwxAQv0mOZYfk4IWaoL5QLWclAAuCQqoDyfRVU+qNriFLvAD0dEXlAR16FMQOynHhCHU2TYDpgKQcjfQOosYWi7LtMqlvLV7DOPMGiXOULQ6y6rSC/Lk2gykwoleTAfUbm4cJx/Fc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB4PR05MB270; X-Microsoft-Exchange-Diagnostics: 1; DB4PR05MB270; 20:vp03/NOnqgSDIz4RJ7Ir40IJKrx22pHmYF4GnZK1qkE6zJn4/CCaIcSsHPBk/Vxe0kutou1CnA8RwvAg7YoBkAzu6myGdWn+jZM6Fptunc+4XAvZ0F6iLyVTtE+sK8OcN6Gfkg0+WMMghXzfNs1R+zSZMICp+GZJyfEtR8OaM7A8TgD22Xbr52hp+hOYulXsdrBy9m3+99oQUvagkTiz2M3YDrcYh8TvhwhuX4VZpmB4Sz4Ycf7yhA4zKfF60hy97GOzHnu3WOx1nZ0gAb80N6GzqVCFjdgK0FTJk7Z95rGdgyfbBqqlx4v9oLeDWlAgcxTbHE9ZnI9Nfxt5HWkk0w==; 4:RFbtzWYwNSZp78Wsn2d4EMSWJr8iYRv4iBdvT0xHKVHZwc4JPuJxB7i4D/27+H/FhfSOtNGmho7KQofpnGZJrIYI5GRVHeRNsjKjEqCQn5cCK7PJVrKUFLTGVyEjL9oeqdYgWC8DPjZmR729MGFDqEwlxpWbytEuLMuoPPPKmUfsfCJNgWaxiNC8Sc6UnAL4a7NUiW7KZgmjoChFSle9REEfKoENTIldvVAMzXVuJ1CX6VmX0M4iOnma9JbE4Jr2p8KJCXap9gnf6J52EQI443xQ1+T8fZGniQzz4ikDB9tvd+duJdvUis2X6sjS1a7bvTWqp6ZYMHQo5q3AVb8L5oOYpLUoaL5hhwP7wQa9OdWrTV8RJ0AseXlto9Xcqz/+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:DB4PR05MB270; BCL:0; PCL:0; RULEID:; SRVR:DB4PR05MB270; X-Forefront-PRVS: 0968D37274 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(189002)(199003)(36756003)(50466002)(4001430100002)(42186005)(1076002)(86362001)(19580395003)(69596002)(48376002)(5008740100001)(81156014)(19580405001)(97736004)(4326007)(2906002)(77096005)(101416001)(81166006)(50226002)(2950100001)(33646002)(6116002)(68736007)(2351001)(3846002)(5003940100001)(107886002)(105586002)(110136002)(106356001)(53416004)(229853001)(50986999)(8676002)(189998001)(92566002)(5004730100002)(66066001)(586003)(76176999)(47776003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB4PR05MB270; H:tdx-in-nb-0014.toradex.ext; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR05MB270; 23:2DADal93NgzkbOs5aSN5dutahhu/vOyNpk3ACL5HyG?= =?us-ascii?Q?nyFfGF+leBXyiCZCypCZjiONlBZ9Bem36G+FHa1guI+AwELjuys9vIjB4Gf/?= =?us-ascii?Q?cbyMdw5aISAv482K6hTT3vwHFyCxbnj3s2mFj0u12Ht3FwxSPdpvVuA6S75+?= =?us-ascii?Q?frdGFHgbPg2AhND7hxAzfF1Xx0XapVbkKKGoCuBTP1OGXDUdrIVFjIAxDPF9?= =?us-ascii?Q?Hsd/cfBQ6gvRBLj24gruixApfEnCFEHTyAz+aDGhbAiYqWIAAlJ7LTxYtjMh?= =?us-ascii?Q?S3EgPlJ63Au435PHo1+ODnUN0d92tkK5fBn84IDbYd02dXRRq6Gzh+psyn5p?= =?us-ascii?Q?ryZXrg6VD+JYN/GgYjUcJ/hmalxcj3FKCWUfRXqctmiWwCromjuosoilWOKj?= =?us-ascii?Q?YLtcZorWlZ0G/zLqHqbOi5hN/Q2ROCRQXbrJIZBKhylQX0A/eBVpvxrMwpHI?= =?us-ascii?Q?yg13QIih+W/IXRjAV40rNKLwYaz9Uxf0hD+8+/a0hATxQ09hg+qU6bwlz0/R?= =?us-ascii?Q?AWUBBcceMqRBDVGsFWfPEMlFeqpRIwidGrPWyp0dkfaoWUH9TgSA8EbBAg01?= =?us-ascii?Q?apxmI62xC8QISNxX84eqk7U5Q6h6nw5pDR5OZDP1W0nf7YizNnrO565tRKLY?= =?us-ascii?Q?yYNA7CmEp2T9OiduoIhghyvhASMRMN7NuZ2+I6hv+noIVpmt5P1oZD+UcHb+?= =?us-ascii?Q?lkBLf7ZY8EmcekvG/dWyDo4I8Vj+9FjapquKUF0FxLvzOVWboK9UWyaBOTAg?= =?us-ascii?Q?+OZC8QgMQ3jeTapAYa1ZXrMbLAuqFR7kGtRB+wInPiIvnHl0Xq8A2IwqkkFf?= =?us-ascii?Q?XphOvSy5gBDUqGoa0LFoTyBo+1RpcIR+BfVlwEy9FrYzs0RsajvQOigZ9kFP?= =?us-ascii?Q?Y4mtNZLnPmGOQleNVLJKpvpglpU3GP37fOzKpGgF7PoFwUC7njgbXgzX9wkc?= =?us-ascii?Q?Y/ms6xPiUYlPDxyMVno0T/ZTmG519VByFZoVuNkk9OoDx+xdd3wZdK6S/OyS?= =?us-ascii?Q?4XlqGT0s3DekxX7ize8MjUOn0WsSdMdxKznRGbg7dqIaMq8Uzxa6sth2k3Mo?= =?us-ascii?Q?+Ui2yOl9FX+Rryy5BsHsjvEVSEVkmHHmuQxLW2qyzCcWwxlLMXhPTbuEGTTk?= =?us-ascii?Q?JK12LLKdDEBUT0ppVceL1mc9X84TpAnIZPNBVssceggG3vT/YCHg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB4PR05MB270; 5:KnLte7w7lYX/+6/6fkQMwPjWf/q+f0UyTfu4R2L9Eptz8EqzCulGyGmA+ErvCDLx3TW1bbWxarXPCt1414O/rwtfNP17UKYwDOY7lJAYuJUavQ+QMJs92wQtDKQI6RqoMcMt6rCXODL85ntMrCh0dA==; 24:lvyg04kz6LPoKpxGdQIVmXgoKSoMIWAA5PDp9c5X2xrZ77UNTY7PYWQOUVIcc/MWKhDkIf2G2QVPBomTM3hDxB5XFc9Z1dhqjxkPq7aWv6o=; 7:z696iogWDhcxOO4ou4LW+1Rdk6CzNbbRsQNAJ3KyHfA3lt+aeG+qrgJpjohUH/rM3WVtz49ZAMNHJKFwK7hJir/sj1TvgbWXnA698hAFcpy/HYJKQX6wEPk8ZshiD943fXp4QKg4snzXMGn2UOC3X/CCfu0ABlB/nwhjmXuFr+2tgJGBkzzC9AIip0bAnLePCmU6RReE3mJEwJW0OFoXyg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2016 15:11:47.8132 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR05MB270 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable Vybrid's build-in support for RS-485 auto RTS for controlling line direction of RS-485 transceiver driver. Enable RS485 feature by either using ioctrl 'TIOCSRS485' or enable it in the device tree by setting 'linux,rs485-enabled-at-boot-time' property. Signed-off-by: Bhuvanchandra DV --- drivers/tty/serial/fsl_lpuart.c | 78 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 134090a..4d1fca4 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -917,6 +917,52 @@ static void lpuart_dma_rx_free(struct uart_port *port) sport->dma_rx_cookie = -EINVAL; } +static int lpuart_config_rs485(struct uart_port *port, + struct serial_rs485 *rs485) +{ + struct lpuart_port *sport = container_of(port, + struct lpuart_port, port); + + u8 modem = readb(sport->port.membase + UARTMODEM) & + ~(UARTMODEM_TXRTSPOL | UARTMODEM_TXRTSE); + writeb(modem, sport->port.membase + UARTMODEM); + + if (rs485->flags & SER_RS485_ENABLED) { + /* Enable auto RS-485 RTS mode */ + modem |= UARTMODEM_TXRTSE; + + /* + * RTS needs to be logic HIGH either during transer _or_ after + * transfer, other variants are not supported by the hardware. + */ + + if (!(rs485->flags & (SER_RS485_RTS_ON_SEND | + SER_RS485_RTS_AFTER_SEND))) + rs485->flags |= SER_RS485_RTS_ON_SEND; + + if (rs485->flags & SER_RS485_RTS_ON_SEND && + rs485->flags & SER_RS485_RTS_AFTER_SEND) + rs485->flags &= ~SER_RS485_RTS_AFTER_SEND; + + /* + * The hardware defaults to RTS logic HIGH while transfer. + * Switch polarity in case RTS shall be logic HIGH + * after transfer. + * Note: UART is assumed to be active high. + */ + if (rs485->flags & SER_RS485_RTS_ON_SEND) + modem &= ~UARTMODEM_TXRTSPOL; + else if (rs485->flags & SER_RS485_RTS_AFTER_SEND) + modem |= UARTMODEM_TXRTSPOL; + } + + /* Store the new configuration */ + sport->port.rs485 = *rs485; + + writeb(modem, sport->port.membase + UARTMODEM); + return 0; +} + static unsigned int lpuart_get_mctrl(struct uart_port *port) { unsigned int temp = 0; @@ -950,17 +996,22 @@ static unsigned int lpuart32_get_mctrl(struct uart_port *port) static void lpuart_set_mctrl(struct uart_port *port, unsigned int mctrl) { unsigned char temp; + struct lpuart_port *sport = container_of(port, + struct lpuart_port, port); - temp = readb(port->membase + UARTMODEM) & + /* Make sure RXRTSE bit is not set when RS485 is enabled */ + if (!(sport->port.rs485.flags & SER_RS485_ENABLED)) { + temp = readb(sport->port.membase + UARTMODEM) & ~(UARTMODEM_RXRTSE | UARTMODEM_TXCTSE); - if (mctrl & TIOCM_RTS) - temp |= UARTMODEM_RXRTSE; + if (mctrl & TIOCM_RTS) + temp |= UARTMODEM_RXRTSE; - if (mctrl & TIOCM_CTS) - temp |= UARTMODEM_TXCTSE; + if (mctrl & TIOCM_CTS) + temp |= UARTMODEM_TXCTSE; - writeb(temp, port->membase + UARTMODEM); + writeb(temp, port->membase + UARTMODEM); + } } static void lpuart32_set_mctrl(struct uart_port *port, unsigned int mctrl) @@ -1256,6 +1307,13 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, cr1 |= UARTCR1_M; } + /* + * When auto RS-485 RTS mode is enabled, + * hardware flow control need to be disabled. + */ + if (sport->port.rs485.flags & SER_RS485_ENABLED) + termios->c_cflag &= ~CRTSCTS; + if (termios->c_cflag & CRTSCTS) { modem |= (UARTMODEM_RXRTSE | UARTMODEM_TXCTSE); } else { @@ -1864,6 +1922,8 @@ static int lpuart_probe(struct platform_device *pdev) sport->port.ops = &lpuart_pops; sport->port.flags = UPF_BOOT_AUTOCONF; + sport->port.rs485_config = lpuart_config_rs485; + sport->clk = devm_clk_get(&pdev->dev, "ipg"); if (IS_ERR(sport->clk)) { ret = PTR_ERR(sport->clk); @@ -1904,6 +1964,12 @@ static int lpuart_probe(struct platform_device *pdev) dev_info(sport->port.dev, "DMA rx channel request failed, " "operating without rx DMA\n"); + if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time")) { + sport->port.rs485.flags |= SER_RS485_ENABLED; + sport->port.rs485.flags |= SER_RS485_RTS_ON_SEND; + writeb(UARTMODEM_TXRTSE, sport->port.membase + UARTMODEM); + } + return 0; }