From patchwork Fri Jun 23 09:58:22 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: 9806131 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 9E90160349 for ; Fri, 23 Jun 2017 09:59:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EBE6282EC for ; Fri, 23 Jun 2017 09:59:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8363E2867E; Fri, 23 Jun 2017 09:59:01 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 06009282EC for ; Fri, 23 Jun 2017 09:59:01 +0000 (UTC) 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=DUgFQjFQuBcuZWWgRKd8t4JdIsVHPax3T+YKK9smC/4=; b=itpX+Jyl+d1xDk qNqgGYRc0vBuBawXpj18w5zHDeBnyBDmX3SxD/hiA2XgaKiMbgw9IV36XvL2CYSRUU9pWsrXAgmeg NgcGrpI6GddB74wd2k+8Z/O2TocSiqk90NiPLeX28KDaUvgHc26vKDoHAcyf1wdVJWpi33SSXGZHS 0FQ/tVKUWITDIYhkY7W39f8qRlX7z1wPZrqJIRa6EEelhjSj1BYxOpI+fTRS3kAasu5yUyRQ6sRYw YkKcqnNkIFKnvFxs+4OCYj7TiMYcJRy4+WSWyY92rylKAM+apznxD8iIAPQcpveR7X2oLqJS+I99N JrMaS77oSrE3Uyh4RUZg==; 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 1dOLMg-0003S2-2T; Fri, 23 Jun 2017 09:58:58 +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 1dOLMe-0003Rt-44 for linux-arm-kernel@bombadil.infradead.org; Fri, 23 Jun 2017 09:58:56 +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=5Npfl+aFLeurxOe0zFNiuloh4GCpiKwDA2IFJoIDFCk=; b=WlfVkR3MVxElEsXpGQl0YCi+4s JOzhjG8BWGGmmW01b2TEpGZ9QSBGqtJZawNzlPXFWCma5fzl0TVwq3QEO9y/BHJ4qWtWdoZLQ/Asb TgPcapeBTEWCIV2Tk+A94TkJCJmx7PVVInFnlwP916iZe2Ts2G+2cXt9/aaONShY3ErTxmKHKybbt CT4JlcrgVMyCc/PHX4hPYKgXscTEF61Kz4dX+2phgvSWyQ7li9lKvU6cfFWXCf6jQKVGuScAR19o5 ckaEwQ/9TeSpO56NoWQzTuEsiH+0sDCbMQu5ymDVkUnILoi3DdBxqZF62c5Biyn4sDJhfonEWEmyk XwTMUbZA==; 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 1dOLMb-0001GD-Dj for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2017 09:58:54 +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 1dOLMG-0003Ez-68; Fri, 23 Jun 2017 11:58:32 +0200 Received: from ukl by dude.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1dOLMF-00028o-Qy; Fri, 23 Jun 2017 11:58:31 +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.5 6/9] serial: omap-serial: Use common rs485 device tree parsing function Date: Fri, 23 Jun 2017 11:58:22 +0200 Message-Id: <20170623095822.6306-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170623094945.31908-7-u.kleine-koenig@pengutronix.de> References: <20170623094945.31908-7-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-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tony Lindgren , devicetree@vger.kernel.org, Sascha Hauer , linux-omap@vger.kernel.org, kernel@pengutronix.de Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Sascha Hauer Signed-off-by: Uwe Kleine-König --- Changes since v2: - remove now unused variable Changes since v1: - drop paragraph in commit log that of_get_rs485_mode is more strict as this is wrong in v2. drivers/tty/serial/omap-serial.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 1ea05ac57aa7..6d22097e6dd0 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1607,7 +1607,6 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up, struct device_node *np) { struct serial_rs485 *rs485conf = &up->port.rs485; - u32 rs485_delay[2]; enum of_gpio_flags flags; int ret; @@ -1638,17 +1637,7 @@ static int serial_omap_probe_rs485(struct uart_omap_port *up, up->rts_gpio = -EINVAL; } - 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]; - } - - if (of_property_read_bool(np, "rs485-rx-during-tx")) - rs485conf->flags |= SER_RS485_RX_DURING_TX; - - if (of_property_read_bool(np, "linux,rs485-enabled-at-boot-time")) - rs485conf->flags |= SER_RS485_ENABLED; + of_get_rs485_mode(np, rs485conf); return 0; }