From patchwork Fri Jun 23 09:49:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 779908 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wvDHR1Wtfz9sNW for ; Fri, 23 Jun 2017 19:51:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TdJIESNq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="mhVbxr0p"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nPA5agRbPxkjMqmuuAIoQ8VH6ZYMgYPR9MXnyAXvZ2A=; b=TdJIESNqtV+YQQ FScJLkcy7RBCQXxEnmj0yvdJ82L1K99FxTpkKHo5VgqnTIbRY4d+pBqHCBI8Pz2+BDc3FLe27Uz88 iL/nDCcbyV9+rO2AbljZOLKaOW3kTxOdeAibZ3AbRkBSQPn8kny9S88owQP2acoOefAbqsavq1pPH 5BnIRU5nwuULbqIJKfGSgCtTb0Lpmgd6ekvqjzqCM4H26gZUzILiUMDQqZTrBYAluG/su9BxAQAH3 8Ovgiw7nAsc5+/1HIMyHX/7rFeZcpvSM88un7f0CJuMizbUm7HqOHfAsW6Y/hzTNM9v6uN+p97iNJ l91+ozoyvUShu8vS2FFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dOLFQ-0007Bg-J6; Fri, 23 Jun 2017 09:51:28 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dOLEN-0005wk-L5 for linux-arm-kernel@bombadil.infradead.org; Fri, 23 Jun 2017 09:50:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=/zFd2m/4DcZ1iqs2ELVeOf7KnQWfsTMYVA600Nktx04=; b=mhVbxr0pI96wGq/32v96uhPcES 9GRvg3Ck7Kkr5bMWjv4WudmsLWfEuO4J4Jirojep93VJKxphV9tGDMHHN6NInJrtchthlYGvN8uyQ jRtgYJmN6dsXpzjLJ6HkTFq4RNHutDZyw6YuGvaSnOLUHZpokUy7N4Qj4c2qSSCyqwU6Nnu5YKQdK UAsDZm3V528du428r5TEMjKFiWG56fOhOQ9VWqLyd7146Nvg005JZkljxN8hYa61WYGaUzl4YzX3o STJ/oSxU9VNudXBSUFltDOJo1Cfq+kQoWt5OJpcL9uz1EATyu3KgNjjfmmxAQ3K7wdsMq4TdF+2AW 9sk4zVpA==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dOLEJ-00014a-LT for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2017 09:50:21 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dOLDt-0000rJ-LU; Fri, 23 Jun 2017 11:49:53 +0200 Received: from ukl by dude.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1dOLDt-0000AT-8y; Fri, 23 Jun 2017 11:49:53 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/9] serial: atmel: Use common rs485 device tree parsing function Date: Fri, 23 Jun 2017 11:49:40 +0200 Message-Id: <20170623094945.31908-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170623094945.31908-1-u.kleine-koenig@pengutronix.de> References: <20170623094945.31908-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Genoud , devicetree@vger.kernel.org, Sascha Hauer , Alexandre Belloni , kernel@pengutronix.de Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Sascha Hauer We just got a common helper for parsing the rs485 specific device tree properties. Use it and drop the open coded parser. Note that there is a small difference between the removed and the now used implementation: The former cleared flags to 0 if rs485-rts-delay was given, the common helper clears SER_RS485_RX_DURING_TX and SER_RS485_ENABLED only but always which makes more sense. Signed-off-by: Sascha Hauer [ukleinek: point out semantic change in commit log] Signed-off-by: Uwe Kleine-König --- Changes since v1: - as I dropped my two atmel patches and used Alexandre Belloni's (that are already in next) instead, there are a few changes that are necessary to adapt to the new base. drivers/tty/serial/atmel_serial.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 937d67f22fba..357570a216ad 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -1689,22 +1689,7 @@ static void atmel_init_rs485(struct uart_port *port, { struct device_node *np = pdev->dev.of_node; - struct serial_rs485 *rs485conf = &port->rs485; - u32 rs485_delay[2]; - - /* rs485 properties */ - if (of_property_read_u32_array(np, "rs485-rts-delay", - rs485_delay, 2) == 0) { - rs485conf->delay_rts_before_send = rs485_delay[0]; - rs485conf->delay_rts_after_send = rs485_delay[1]; - rs485conf->flags = 0; - } - - if (of_get_property(np, "rs485-rx-during-tx", NULL)) - rs485conf->flags |= SER_RS485_RX_DURING_TX; - - if (of_get_property(np, "linux,rs485-enabled-at-boot-time", NULL)) - rs485conf->flags |= SER_RS485_ENABLED; + of_get_rs485_mode(np, &port->rs485); } static void atmel_set_ops(struct uart_port *port)