From patchwork Sun Mar 28 15:43:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Devera X-Patchwork-Id: 12171005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CDABC433E0 for ; Mon, 29 Mar 2021 21:38:11 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A01B161989 for ; Mon, 29 Mar 2021 21:38:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A01B161989 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eaxlabs.cz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i5Sqju0zrQs1tpFv5RhQfpk7OVQb2g56ogsmCfWGoAg=; b=ddhUOY5Iwm3sQLgd54HTHwbZmT 9oQDVI+qzs+1KqtQvWxVQRWs5ZnOwJCJZgSDqNB/4NsEMBHgXxalBOk7maLvXQ9Kj+PlMHPTjEDzl Sasz5UYbwWV+AIsT7XjRJwqAwH1By9sfRaGhGkKfTpdk2HFP0SmIgpbsn0Sv3QscTtFktp0dZj94L jc6yc40ZIOpYFLDejZMjDoCtBSteqsrnSTFwSeIZdD+0p+W4jE5vlIOAZC22JuiWHnLZm9Pi58dQe vnsDLnxAnUK3B6oKGEwwIXx3lucTZvvrgham4I4sycybYF0VQxrPvbEHT9yKfg/qUSZL4XzcEl321 nUIuhFRQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lQzXt-001UEa-6y; Mon, 29 Mar 2021 21:35:37 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lQovb-000ZZQ-1l for linux-arm-kernel@desiato.infradead.org; Mon, 29 Mar 2021 10:15:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=vpikJD29gomwC8ZCLMcKJZFaNKhjOnwb++xunGrRQQY=; b=K+naSwHVz7mOGMhIM5+DRVeLIi po0sPPpseZ1Dnvjsi1J2Yv08DmjSbVcwhZjMBenUBXE9OkkwbHXYWpo7sGUt8499IgOVg6ECAFOMn 2iSMJSIskIq0nwYP5A8w1R2Q67AvJif2fRvLSWQL744UkVJTNTZGxSOrykV1sfYS22kCWsxBQ0z+U POACHMForcJvaSzy5AURX1F/iTYLEeo71tAWVZgMs6ZAzt6wHqMRSeQYe7I/cBtPjcj3YijUjJe/4 tAeu0MPinC8REHnaPg8MgHnOXpj1d4arlK6jbYidoX8imNzYIpSAY+YCftmJcOJhamB6XEtbUb9br +Pg5LIQw==; Received: from smtp.wifcom.cz ([85.207.3.150]) by casper.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lQXby-000EK4-07 for linux-arm-kernel@lists.infradead.org; Sun, 28 Mar 2021 15:46:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=eaxlabs.cz; s=mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=vpikJD29gomwC8ZCLMcKJZFaNKhjOnwb++xunGrRQQY=; b=FjRxjHgQ/JU0splXWne3o9kBFZy2G/z0jd6nmLeR6XSOjhL04ELAZ2IuF++sSM8g8+6wdfvhIg0D5Ob0hV4qL9oLgvrchpXVWi3dhQy1m3o+SUEM8pro7Pt+jHEgGkEumcvg47lccuzQzrr5dkkV/rQcpEOunnzQ8uzZJ+B4ibk=; From: Martin Devera To: linux-kernel@vger.kernel.org Cc: Martin Devera , Greg Kroah-Hartman , Rob Herring , Maxime Coquelin , Alexandre Torgue , Jiri Slaby , Le Ray , fabrice.gasnier@foss.st.com, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 1/2] dt-bindings: serial: Add rx-tx-swap to stm32-usart Date: Sun, 28 Mar 2021 17:43:05 +0200 Message-Id: <20210328154306.22674-1-devik@eaxlabs.cz> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-Antivirus-Scanner: Clean mail though you should still use an Antivirus X-Wif-ss: -1.1 (-) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210328_164558_484362_31E51AE8 X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add new rx-tx-swap property to allow for RX & TX pin swapping. Signed-off-by: Martin Devera Acked-by: Fabrice Gasnier Reviewed-by: Rob Herring --- v8: - rebase to the latest tty-next v7: - fix yaml linter warning v6: - add version changelog v5: - yaml fixes based on Rob Herring comments - add serial.yaml reference - move compatible from 'then' to 'if' v3: - don't allow rx-tx-swap for st,stm32-uart (suggested by Fabrice Gasnier) v2: - change st,swap to rx-tx-swap (suggested by Rob Herring) --- .../devicetree/bindings/serial/st,stm32-uart.yaml | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) --- .../devicetree/bindings/serial/st,stm32-uart.yaml | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/serial/st,stm32-uart.yaml b/Documentation/devicetree/bindings/serial/st,stm32-uart.yaml index 8631678283f9..126e07566965 100644 --- a/Documentation/devicetree/bindings/serial/st,stm32-uart.yaml +++ b/Documentation/devicetree/bindings/serial/st,stm32-uart.yaml @@ -9,9 +9,6 @@ maintainers: title: STMicroelectronics STM32 USART bindings -allOf: - - $ref: rs485.yaml - properties: compatible: enum: @@ -40,6 +37,8 @@ properties: uart-has-rtscts: true + rx-tx-swap: true + dmas: minItems: 1 maxItems: 2 @@ -66,13 +65,23 @@ properties: linux,rs485-enabled-at-boot-time: true rs485-rx-during-tx: true -if: - required: - - st,hw-flow-ctrl -then: - properties: - cts-gpios: false - rts-gpios: false +allOf: + - $ref: rs485.yaml# + - $ref: serial.yaml# + - if: + required: + - st,hw-flow-ctrl + then: + properties: + cts-gpios: false + rts-gpios: false + - if: + properties: + compatible: + const: st,stm32-uart + then: + properties: + rx-tx-swap: false required: - compatible From patchwork Sun Mar 28 15:43:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Devera X-Patchwork-Id: 12170617 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A9D4C433C1 for ; Mon, 29 Mar 2021 17:55:27 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0538160238 for ; Mon, 29 Mar 2021 17:55:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0538160238 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eaxlabs.cz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fqrYimC5ajegZ77BCBmHRyMwJL4jbuliEiEOYl0wbsU=; b=UcFFGmm0KHcGPeTUEbnGhRojcv 6LPRZOrsZWPay4M91DFzJ5RCyxpmQafXdVGg2Q2fxS5KToQ7SEJ1gHwEATjTPqxbCpsZ7qHTxkaFj FLBhxp35KwSS+I6OD9RwDFt+3noe/8zJA1+xBA0nBcG/B+n97gOfQAMxl6JwPjtjV9smL2vXXdm25 utoSeiluMDgBlJsV/kDYguSOMSBTRcYMy1rhtRigbOPx+i4Sj8CgV1KNZJfY/xYUEFjHInx73CYlj N2pam6iWQfp0rAtn7+HbEvoPOLqUQpO2SGDBQoaP1WNifQQu0CvuKsRdDJSvT+o/MavkqaGk9EhAf z0JwX6bQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lQw49-000wkh-OX; Mon, 29 Mar 2021 17:52:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lQoxX-000ZfI-5f for linux-arm-kernel@desiato.infradead.org; Mon, 29 Mar 2021 10:17:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=/6zusLrlarjoJKgAyXwKgpDFQJDYaG12zzl0PqOu+pE=; b=DV/JdeXpcr5KZuTCbOd4vKZ/dc 1Uk8uTb6hSYUHmwQuAu5SsNJhwFIPVBuygdc6lv99kAuVob+DAheYe74iRkJ8j36VfLyQPo/u3lKQ pd147wg8+wscUTx5bmJ9XQKdLe1VUqGsCIBxH/5BtAr63Xu+KjR5xt+fj+JzVej6AAWeBho3gPo3e 9ufpajVmG3WHoaOzUy6AFGnYPvLZ9MWxzNnMKRLuN2qzpSE1h2FFb+iwmI9cDDLgDwpDK9xzJLv5/ clEd6sXD5pXSAeISFxqWHBCGqPXLma6/wb3OEu0V3oIASMgHZyJAQlE+HEcE9ees/C+HkOb6iDb23 EpMUoskA==; Received: from smtp.wifcom.cz ([85.207.3.150]) by casper.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lQXbw-000EK3-Mv for linux-arm-kernel@lists.infradead.org; Sun, 28 Mar 2021 15:46:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=eaxlabs.cz; s=mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=/6zusLrlarjoJKgAyXwKgpDFQJDYaG12zzl0PqOu+pE=; b=iOmEVd2h2FjOysT1WCaXG7jx9rnkY3KeVovNJIBjX2mZpxw+Cj5Uf86dB1+3DC9WjWN0Is/MJBws5j09mxJD8Vh8n6ugRQEMj+hKd89CWLiRJxkO2jNUxHvf2p0jE77fwvE2A465k334/ehqCSqeR4aNdg5MFE6UqIYSNgczjxY=; From: Martin Devera To: linux-kernel@vger.kernel.org Cc: Martin Devera , Greg Kroah-Hartman , Rob Herring , Maxime Coquelin , Alexandre Torgue , Jiri Slaby , Le Ray , fabrice.gasnier@foss.st.com, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 2/2] tty/serial: Add rx-tx-swap OF option to stm32-usart Date: Sun, 28 Mar 2021 17:43:06 +0200 Message-Id: <20210328154306.22674-2-devik@eaxlabs.cz> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210328154306.22674-1-devik@eaxlabs.cz> References: <20210328154306.22674-1-devik@eaxlabs.cz> X-Antivirus-Scanner: Clean mail though you should still use an Antivirus X-Wif-ss: -1.1 (-) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210328_164558_067107_D14CD2D2 X-CRM114-Status: GOOD ( 14.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org STM32 F7/H7 usarts supports RX & TX pin swapping. Add option to turn it on. Tested on STM32MP157. Signed-off-by: Martin Devera Acked-by: Fabrice Gasnier --- v8: - rebase to the latest tty-next v6: - add version changelog v4: - delete superfluous has_swap=false v3: - add has_swap to stm32_usart_info (because F4 line doesn't support swapping) - move swap variable init from stm32_usart_of_get_port to stm32_usart_init_port because info struct is not initialized in stm32_usart_of_get_port yet - set USART_CR2_SWAP in stm32_usart_startup too v2: - change st,swap to rx-tx-swap (pointed out by Rob Herring) - rebase patches as suggested by Greg Kroah-Hartman --- drivers/tty/serial/stm32-usart.c | 11 ++++++++++- drivers/tty/serial/stm32-usart.h | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- drivers/tty/serial/stm32-usart.c | 11 ++++++++++- drivers/tty/serial/stm32-usart.h | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index cba4f4ddf164..4d277804c63e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -671,6 +671,12 @@ static int stm32_usart_startup(struct uart_port *port) if (ret) return ret; + if (stm32_port->swap) { + val = readl_relaxed(port->membase + ofs->cr2); + val |= USART_CR2_SWAP; + writel_relaxed(val, port->membase + ofs->cr2); + } + /* RX FIFO Flush */ if (ofs->rqr != UNDEF_REG) writel_relaxed(USART_RQR_RXFRQ, port->membase + ofs->rqr); @@ -789,7 +795,7 @@ static void stm32_usart_set_termios(struct uart_port *port, cr1 = USART_CR1_TE | USART_CR1_RE; if (stm32_port->fifoen) cr1 |= USART_CR1_FIFOEN; - cr2 = 0; + cr2 = stm32_port->swap ? USART_CR2_SWAP : 0; /* Tx and RX FIFO configuration */ cr3 = readl_relaxed(port->membase + ofs->cr3); @@ -1047,6 +1053,9 @@ static int stm32_usart_init_port(struct stm32_port *stm32port, stm32port->wakeup_src = stm32port->info->cfg.has_wakeup && of_property_read_bool(pdev->dev.of_node, "wakeup-source"); + stm32port->swap = stm32port->info->cfg.has_swap && + of_property_read_bool(pdev->dev.of_node, "rx-tx-swap"); + stm32port->fifoen = stm32port->info->cfg.has_fifo; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/drivers/tty/serial/stm32-usart.h b/drivers/tty/serial/stm32-usart.h index a86773f1a4c4..77d1ac082e89 100644 --- a/drivers/tty/serial/stm32-usart.h +++ b/drivers/tty/serial/stm32-usart.h @@ -25,6 +25,7 @@ struct stm32_usart_offsets { struct stm32_usart_config { u8 uart_enable_bit; /* USART_CR1_UE */ bool has_7bits_data; + bool has_swap; bool has_wakeup; bool has_fifo; int fifosize; @@ -76,6 +77,7 @@ struct stm32_usart_info stm32f7_info = { .cfg = { .uart_enable_bit = 0, .has_7bits_data = true, + .has_swap = true, .fifosize = 1, } }; @@ -97,6 +99,7 @@ struct stm32_usart_info stm32h7_info = { .cfg = { .uart_enable_bit = 0, .has_7bits_data = true, + .has_swap = true, .has_wakeup = true, .has_fifo = true, .fifosize = 16, @@ -268,6 +271,7 @@ struct stm32_port { int last_res; bool tx_dma_busy; /* dma tx busy */ bool hw_flow_control; + bool swap; /* swap RX & TX pins */ bool fifoen; bool wakeup_src; int rdr_mask; /* receive data register mask */