From patchwork Fri Jul 21 16:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp340079vqg; Fri, 21 Jul 2023 10:00:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlGL6HCx0B7w8Eo5kmpqPnwRt1KI5GRC7Y/ZsbpKR4O1I9BiCh70wAcYiQkfr/QAii7p1CYQ X-Received: by 2002:a05:6a00:c90:b0:64c:c5f9:1533 with SMTP id a16-20020a056a000c9000b0064cc5f91533mr739850pfv.33.1689958812810; Fri, 21 Jul 2023 10:00:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689958812; cv=none; d=google.com; s=arc-20160816; b=Cy9azOVS+Ni9XzPcdWKceM9tcx43pdy4V7tXNEQDqj3tJV40cdu8n2E2HHofGYA5To nOgIX9F4i16XRcvZql5FByxcTh3pf/b2narYOFhc27vgm6HHUl6SM8Lp98JgydgHeupu GUD4Aqx8PN9uMnynCcArMQE176tFk3Gx3stcfepcGDMqZF1tWFv6nh1QBvSEBlZTD1yU O0v0kMsPC9yGu6RCzuAy7pY51LiWnxf/Anby6WMHgJL0qg47uSV+yAYqlmUBMUEj4nRn AscOsS4KxR/2RTFtc71xcO3RaBXxqOp8BHAHTMGmnH5b5gpqIMFUUazsmEPYstIvKD0B zxzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=5nJGAa1uU81DK4gB/PIFJUn37k+YUGRc051pFa/OAlQ=; fh=ZWZ1kBSEdRQxL6BTnURWRpUE9a4Pl4C0hLQ6ZZmFXXY=; b=SkkCPDG3/p5YtH3fViEfkx5bWUpukobT4u4kl0+gDL4FSE1GGAaFRtNReFNVacrmLJ fxRV3jyP/jyth/YmJptIwq1Lt8GxoHPFDAyZhZ1+96ZTggoWbDPNxHcxcVf6KVPtNi9f Sn/YYXJzB9qtZ6dMXMg0q7TvfF7E4AYGRprKfnNube8LWvs82y8w6HAiKBrvzsD/ewiD jXvA9WT041YsyoQ+12UJSOArnwZuIREGqcVocSuaSIWbo0nCJRVtV6xVq8HjpOvVldmL 2ayxEvbdDLIF16qqMMPsrGtt+QAzPqvCZB/0ncLsJ2+cv6BYJBoDO7aPU8CCBuptq/E6 lEiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=dlO0UqDQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv14-20020a056a00414e00b0068250f2627asi3350161pfb.61.2023.07.21.09.59.55; Fri, 21 Jul 2023 10:00:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=dlO0UqDQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232706AbjGUQUh (ORCPT + 99 others); Fri, 21 Jul 2023 12:20:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232584AbjGUQUI (ORCPT ); Fri, 21 Jul 2023 12:20:08 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E48B449D; Fri, 21 Jul 2023 09:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-Id:Date: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=5nJGAa1uU81DK4gB/PIFJUn37k+YUGRc051pFa/OAlQ=; b=dlO0UqDQdoI5hYfTYZdpZgK1QD Sz2V3qgdeiJi3ErUW98tb5InJwXHawIyVntxLTzjdDiAH8ZiE9ZyRhWwEa6pFf4uTwZFrEU6ocx2s zOtivUhXWVYQbPU95ppZLf+XXU4etEo9+h5qWrUcq+NzNCmbw7ogynWJUrA+UVQntkH8=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsq9-0003IO-4c; Fri, 21 Jul 2023 12:18:49 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Lech Perczak Date: Fri, 21 Jul 2023 12:18:31 -0400 Message-Id: <20230721161840.1393996-2-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 01/10] serial: sc16is7xx: fix broken port 0 uart init X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050252362971366 X-GMAIL-MSGID: 1772050252362971366 From: Hugo Villeneuve The sc16is7xx_config_rs485() function is called only for the second port (index 1, channel B), causing initialization problems for the first port. For the sc16is7xx driver, port->membase and port->mapbase are not set, and their default values are 0. And we set port->iobase to the device index. This means that when the first device is registered using the uart_add_one_port() function, the following values will be in the port structure: port->membase = 0 port->mapbase = 0 port->iobase = 0 Therefore, the function uart_configure_port() in serial_core.c will exit early because of the following check: /* * If there isn't a port here, don't do anything further. */ if (!port->iobase && !port->mapbase && !port->membase) return; Typically, I2C and SPI drivers do not set port->membase and port->mapbase. The max310x driver sets port->membase to ~0 (all ones). By implementing the same change in this driver, uart_configure_port() is now correctly executed for all ports. Fixes: dfeae619d781 ("serial: sc16is7xx") Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Ilpo Järvinen Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 2e7e7c409cf2..8ae2afc76a9b 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1436,6 +1436,7 @@ static int sc16is7xx_probe(struct device *dev, s->p[i].port.fifosize = SC16IS7XX_FIFO_SIZE; s->p[i].port.flags = UPF_FIXED_TYPE | UPF_LOW_LATENCY; s->p[i].port.iobase = i; + s->p[i].port.membase = (void __iomem *)~0; s->p[i].port.iotype = UPIO_PORT; s->p[i].port.uartclk = freq; s->p[i].port.rs485_config = sc16is7xx_config_rs485; From patchwork Fri Jul 21 16:18:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 124008 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp346655vqg; Fri, 21 Jul 2023 10:08:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlFAecysj1x3tsUcFmcpmeHtk7dSGMQqtKIWw4lANx1LGM6yYjwk4COwlMV8vaM4Y9ZjnMa0 X-Received: by 2002:a05:6a20:394f:b0:134:1ef9:8c17 with SMTP id r15-20020a056a20394f00b001341ef98c17mr3234193pzg.20.1689959299386; Fri, 21 Jul 2023 10:08:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959299; cv=none; d=google.com; s=arc-20160816; b=k7fDCnx0MPsu3df+5MhlSKjNqXL0Xe+ZSsJ9fkIrpOomou84klnPhKc33uZ9SD1hDS sJE/xmSmyRjwZj067ofjXOXYYsL0Q/XMqLeOz2dM0lUPzkmaZ1d3m3xAxUC8ZlEg2ONN FU16wRr3WPUCOvBEz5sEiDNbQnEo6tPjTD7IEsiDI7mSFgnf34azML6KE7Osxl3ujnd3 vp2UYgGrn0Lvk1/vTQt5wbdhV7WQOWoLchS6TagUsuUzSYYkQkTSSFQGFAcgCF8+eKOq PSpD5zYZZAHCLEriMV0MjNQymc/9oNgHC6RA+1fYkRItxIWT6o3gh4mmgPAf3Q6eZ8Cc 5UUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=P6gLA3cgegvRbC7LXs18deF6K32T+CIZJfA5vParMVw=; fh=YcnO5F9tILQN1YTlpEJZBUiDonMxpEYqyincPQzfQj8=; b=MjHh3xq8PF+e3vqRX4/yxLiH4m6OG8IxYkoBPTPOa5Wu7i3vsPAvRE80MTsPLtPnd3 a5ESeK64/J7WGyK6hAMIkWZbCAFCnGdV9HKt4h7pwrk3AI2OMNgB5VYRodF8ALh7LYa8 8UYnG4EcjHKSJlXWSRdh34oBrMxEtofZ7BhvRM9CJmAwZv1kyJzE5x814kJcQhXG8nQG 6k8bwJ0aRFi7gXmXaaI+FHz9t4ASy94xonGCVNB5BQteXe79suTP5qBkRvTjx7KyeXoL xp6x3ODQ2jOwd3oGTgO1j0UVLOtJ+nsiCKY/iBmvF2uS4giXv9Qmjnh2VDHF/l1SrilS RieA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=rS2xLOpv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f16-20020a056a00239000b0066a45a450e4si3587501pfc.30.2023.07.21.10.08.06; Fri, 21 Jul 2023 10:08:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=rS2xLOpv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232603AbjGUQUb (ORCPT + 99 others); Fri, 21 Jul 2023 12:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232552AbjGUQUH (ORCPT ); Fri, 21 Jul 2023 12:20:07 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07183449C; Fri, 21 Jul 2023 09:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=P6gLA3cgegvRbC7LXs18deF6K32T+CIZJfA5vParMVw=; b=rS2xLOpvHRtMvBXolceVC+kXBr R3DX8hv5PtN8Vd98c5IMKpS+Sf4M5spftYCzc5yRlt03rkEi3d5zg1y3iEgmbCDFLl4rht6orgG2+ vNrEkSe2+HEbu6EBDurmvuNwopndUy3qSaNt8XI7dqS6OfLXkeggwFBjzd5RLVHdZLzY=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqA-0003IO-Fi; Fri, 21 Jul 2023 12:18:50 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, Lech Perczak Date: Fri, 21 Jul 2023 12:18:32 -0400 Message-Id: <20230721161840.1393996-3-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 02/10] serial: sc16is7xx: mark IOCONTROL register as volatile X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050762428872316 X-GMAIL-MSGID: 1772050762428872316 From: Hugo Villeneuve Bit SRESET (3) is cleared when a reset operation is completed. Having the IOCONTROL register as non-volatile will always read SRESET as 1, which is incorrect. Also, if IOCONTROL register is not a volatile register, the upcoming patch "serial: sc16is7xx: fix regression with GPIO configuration" doesn't work when setting some shared GPIO lines as modem control lines. Therefore mark IOCONTROL register as a volatile register. Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 8ae2afc76a9b..306ae512b38a 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -488,6 +488,7 @@ static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) case SC16IS7XX_TXLVL_REG: case SC16IS7XX_RXLVL_REG: case SC16IS7XX_IOSTATE_REG: + case SC16IS7XX_IOCONTROL_REG: return true; default: break; From patchwork Fri Jul 21 16:18:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp340565vqg; Fri, 21 Jul 2023 10:00:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGHuE540PvLrZKbC4jrx74VIGmxYMU+RBWq++cW9qfJizPcgDisBfRTU6tzgPaKI7MzICi5 X-Received: by 2002:a05:6402:1646:b0:51d:7fa6:62ca with SMTP id s6-20020a056402164600b0051d7fa662camr2162570edx.14.1689958848904; Fri, 21 Jul 2023 10:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689958848; cv=none; d=google.com; s=arc-20160816; b=SVkZuCHZyMBmZga4Nex6yYKWgoLXJotzmTi68rPkrtTL3xutgFtjp05Jj6S5MhsWC5 PdzuON9KVSNwI/Ipm/IQoSqlzNld90KYjgiXjz/h6BvrKs0lVilxr6zgl+l7lsX61D9r sRKShI93ckzjvSAh5x1Y4zKioOb5YUcXLX74SauAQl37GNE98ubfAp79sQ2qLNXlBUoB 2zYQBph2dGnO2yH4w6lmIOHlg0bHklKZbhQU2oAde25VkMTlwUm0GWfgWjsyf0DphiZP BopKBsO4Oru7HwZ9PdZFIw2gtdKCfCjWRTixUE3yv0Mf63koIFiLj6LMVApcEGq+g/9k JF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=3cFxvmO7sr+2mXLVwLsYIFte9IVFO4PRYte249nYxi0=; fh=epHSD/U4qlqwlkxyH4lStiicYWFU1qh809Zbn2TMxbQ=; b=A9sgB28X/QprfSj5xSPp/ybH0uuYO6mNVQ5r5Y83w40xrQa2Ob5434Z33PRTyKNMtb f9UETrqslvrKT8hVRZbNxks/N0VgROmRL+yn51C+y+wPdbzLB2JfsWkD/Dgr03oiU9Ho OvMFNUh1qEac6TmK5kZ7diE1qTMafJMQ3y9uWtdrQYuilxyAMGuUtJV83PGhKa/vDjE6 ihvuGADHPbENVFilRMrJEICz9K0Jv0Sb/35AOPdc43zESb7zpROYN+q/N1Xiwr+XVxAr t1NyqZ6ut7ruVdR3JWrDTEOcU2Zl3Fee2dZdNqQ1OyswRtPCclYB5MD8AA9wMGMOS0S5 a4yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=OdGfTgls; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020aa7d984000000b0051dd300b37bsi2554365eds.76.2023.07.21.10.00.23; Fri, 21 Jul 2023 10:00:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=OdGfTgls; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232700AbjGUQUe (ORCPT + 99 others); Fri, 21 Jul 2023 12:20:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232577AbjGUQUI (ORCPT ); Fri, 21 Jul 2023 12:20:08 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D71144A2; Fri, 21 Jul 2023 09:18:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=3cFxvmO7sr+2mXLVwLsYIFte9IVFO4PRYte249nYxi0=; b=OdGfTglspj/Kc6tb8paw23WvoY 2IysbbniAYeD32v9Y6SXRDoAF0DV5uypi/ZIYs5EWf39cJxDYQqEd5o/cEJzIy2t91TBaR89/5RIb CqfmE4mvma9/i5KMuJN1HP4DOilrnl5/UCp0tywyf4Ug777smxXYFkh56KMjVXPjwnfA=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqB-0003IO-Lj; Fri, 21 Jul 2023 12:18:52 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , Lech Perczak , Andy Shevchenko Date: Fri, 21 Jul 2023 12:18:33 -0400 Message-Id: <20230721161840.1393996-4-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 03/10] serial: sc16is7xx: remove obsolete out_thread label X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050289975832722 X-GMAIL-MSGID: 1772050289975832722 From: Hugo Villeneuve Commit c8f71b49ee4d ("serial: sc16is7xx: setup GPIO controller later in probe") moved GPIO setup code later in probe function. Doing so also required to move ports cleanup code (out_ports label) after the GPIO cleanup code. After these moves, the out_thread label becomes misplaced and makes part of the cleanup code illogical. This patch remove the now obsolete out_thread label and make GPIO setup code jump to out_ports label if it fails. Fixes: c8f71b49ee4d ("serial: sc16is7xx: setup GPIO controller later in probe") Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak Reviewed-by: Andy Shevchenko --- drivers/tty/serial/sc16is7xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 306ae512b38a..32d43d00a583 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1516,7 +1516,7 @@ static int sc16is7xx_probe(struct device *dev, s->gpio.can_sleep = 1; ret = gpiochip_add_data(&s->gpio, s); if (ret) - goto out_thread; + goto out_ports; } #endif @@ -1542,8 +1542,6 @@ static int sc16is7xx_probe(struct device *dev, #ifdef CONFIG_GPIOLIB if (devtype->nr_gpio) gpiochip_remove(&s->gpio); - -out_thread: #endif out_ports: From patchwork Fri Jul 21 16:18:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp318936vqg; Fri, 21 Jul 2023 09:22:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlGH46aS7mqofnV5LYHUlZV3SEZXz/KbB0GhWQVdnboyn35t7R83kg3Cx+tzHWnyx7T9a2Fy X-Received: by 2002:a05:6a20:3217:b0:134:409f:41f4 with SMTP id hl23-20020a056a20321700b00134409f41f4mr1616953pzc.24.1689956524725; Fri, 21 Jul 2023 09:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689956524; cv=none; d=google.com; s=arc-20160816; b=e6rxgxdlNgnrONjJRmcdNBxk5URMDnea2Zoeo1mIBjCsJb/hpnNcQT8gXXCO3eJ5Zf CeMthPdD7G9HkZkmr6mmepl0/VMAtTappJvosCVldu2p95jBf1ky4SXH4jJAswDcG1HA 5uscwFDmYRm0xM8zqz/6zMRGbYNqWGmCxdPPPSWvCBATBZoUMK5uSG49OlgCtZkvidNz jiueAWex0MWRJ2rRy2bbQyaVde5QWfm6iPtKlFzgCLucarbLfnY8I6i3eMDbSR0pQ4c/ dPpbQDigr4HWBlzAmJ31rOgjy0NoAsdhiMJ0C1eVUCU+zdIwxdcbBcadcDcMYvxD2zEQ nIIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=eY2wZ9vhu1FfoaXy9aP9IFu/H9QUJ71zX/Q2ydr3vEg=; fh=YcnO5F9tILQN1YTlpEJZBUiDonMxpEYqyincPQzfQj8=; b=Od9f5CHQ5BGEZmg+9I893F7sib3qQVm5QzHvHAna7HIoVgYhjucrSep3vpZWFTuLrV SOfd6Rw5yzeP0Y1C2VT/cDEJKN/xhwRv59riT/TgWlxg8YQk0BTviz4mxWbuvS3ESmDs M+ToR8Lg2good54YhFa25LAolbRTeyQkRmjsuE85SStM6PtJ6gZUYTtrrksn7awlrjDW 3K5qPNZQGfynOWbYMSJFrS2bXTukAQ6yA1JBem5yWllwNhYx32tWmWnYd8YH5bH8NJZJ FqM3iO6+hwm8+Kk7IhmcKgB8kEz+6f0Y5iRbZhX6fQJwgZ2d38pdtbFxnHkuUsnn7E4j zqqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=SYrrevZ9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z41-20020a056a001da900b0064d5e926241si3429367pfw.149.2023.07.21.09.21.22; Fri, 21 Jul 2023 09:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=SYrrevZ9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbjGUQUs (ORCPT + 99 others); Fri, 21 Jul 2023 12:20:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232648AbjGUQUR (ORCPT ); Fri, 21 Jul 2023 12:20:17 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C9353C0E; Fri, 21 Jul 2023 09:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=eY2wZ9vhu1FfoaXy9aP9IFu/H9QUJ71zX/Q2ydr3vEg=; b=SYrrevZ9txg+HUIOOn/FHXgp3v 3MOk0wxzcts+zylqfTZzTDvkUpzBy4hzSoVBxXwNclTDQ7tKNG0TKQA8fa3ipqNOTu8HnbQU0bMDQ FB5kK8byg58lzJW8+ITmqLItIqtX5uuLFFvTPmx5Jn50GsAXt2fMnZigx2j8pL9w4w14=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqD-0003IO-4v; Fri, 21 Jul 2023 12:18:53 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, Lech Perczak Date: Fri, 21 Jul 2023 12:18:34 -0400 Message-Id: <20230721161840.1393996-5-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 04/10] serial: sc16is7xx: refactor GPIO controller registration X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772047852953738573 X-GMAIL-MSGID: 1772047852953738573 From: Hugo Villeneuve In preparation for upcoming patch "fix regression with GPIO configuration". To facilitate review and make code more modular. Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 40 ++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 32d43d00a583..5b0aeef9d534 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -332,6 +332,7 @@ struct sc16is7xx_one { struct sc16is7xx_port { const struct sc16is7xx_devtype *devtype; + struct device *dev; struct regmap *regmap; struct clk *clk; #ifdef CONFIG_GPIOLIB @@ -1349,6 +1350,25 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } + +static int sc16is7xx_setup_gpio_chip(struct sc16is7xx_port *s) +{ + if (!s->devtype->nr_gpio) + return 0; + + s->gpio.owner = THIS_MODULE; + s->gpio.parent = s->dev; + s->gpio.label = dev_name(s->dev); + s->gpio.direction_input = sc16is7xx_gpio_direction_input; + s->gpio.get = sc16is7xx_gpio_get; + s->gpio.direction_output = sc16is7xx_gpio_direction_output; + s->gpio.set = sc16is7xx_gpio_set; + s->gpio.base = -1; + s->gpio.ngpio = s->devtype->nr_gpio; + s->gpio.can_sleep = 1; + + return gpiochip_add_data(&s->gpio, s); +} #endif static const struct serial_rs485 sc16is7xx_rs485_supported = { @@ -1412,6 +1432,7 @@ static int sc16is7xx_probe(struct device *dev, s->regmap = regmap; s->devtype = devtype; + s->dev = dev; dev_set_drvdata(dev, s); mutex_init(&s->efr_lock); @@ -1502,22 +1523,9 @@ static int sc16is7xx_probe(struct device *dev, } #ifdef CONFIG_GPIOLIB - if (devtype->nr_gpio) { - /* Setup GPIO cotroller */ - s->gpio.owner = THIS_MODULE; - s->gpio.parent = dev; - s->gpio.label = dev_name(dev); - s->gpio.direction_input = sc16is7xx_gpio_direction_input; - s->gpio.get = sc16is7xx_gpio_get; - s->gpio.direction_output = sc16is7xx_gpio_direction_output; - s->gpio.set = sc16is7xx_gpio_set; - s->gpio.base = -1; - s->gpio.ngpio = devtype->nr_gpio; - s->gpio.can_sleep = 1; - ret = gpiochip_add_data(&s->gpio, s); - if (ret) - goto out_ports; - } + ret = sc16is7xx_setup_gpio_chip(s); + if (ret) + goto out_ports; #endif /* From patchwork Fri Jul 21 16:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123952 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp318935vqg; Fri, 21 Jul 2023 09:22:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlGbwVyLJnErLPHzhphVPmQVylRmnBP3otz3nmhv6+3Ljds6fywgIC9p7atwOIbK+0yWGiyM X-Received: by 2002:a05:6358:4186:b0:134:eb97:ea01 with SMTP id w6-20020a056358418600b00134eb97ea01mr470592rwc.27.1689956524861; Fri, 21 Jul 2023 09:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689956524; cv=none; d=google.com; s=arc-20160816; b=z0x2oIZ5u6JQebDt2fnpwjBl+My63KdssAGjWZSc/mgXdmC4nbXzBkDDm/+jL+3Ajs Vqu9bXyuNmEwNcZ0Pc5a1leXz1UfG8kBXxmQh3M5bN/CO8oYYDRqGWKrqITAhcCM/I7A 0P/q+Z/wQeZA/ybgTXAgWztwSneE+yZfsfisErL3KDheYIWwaqlYHuACse6+7I813uQZ dMVoq8S19KZUe3wP8nDi+6SCFv6nQfCmYMxxyq6Q4Hjfs4HHa42xGr5LjEMkY+Ehd2I5 FZ4N02RiMVWd63aFrzcPfT28wgKGLoLsZOGgc06rI8VXsAHtKEBJhX3F1/zzwbEFvT22 Bigg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=SuJQI5JxUPzY+H5j7N6gL+Df0hCmvZbTgQvKUtpTEpg=; fh=DRwcSDW0V2k6nM816aH5jvz/mMwP4AVMcBdNZhFOwDA=; b=rMpWkqHIuDU6m57vmnitDz6Z7NKcDt2SyS4yorlplRr+/7qdQZuq6nABXoWN1XH4TF hwsU9WudtNOAVldts5LGQReeoLDOQI7JNIrUZUJoKWMXnSGQGU9SXoQ92k3hxXdHl+Sh Qfh11N1N1RC1IeKz6uT5f5CwUzO4N9pye6T/UTA+O2GDtvnmexmyoELmTVDVY0zf7YmG 61YxsAwcfPwF5kSLfs7kU+999y9xqOm2IjVGbNPXi45gw2TB6H3nACS91XGF0ofNCaOA fV0kSl9LAYkAos1k4yQAI82KfnfGN+i1foOFrYAfbV6eyctfva2dBHREVWX2gmKXF1ru 2mag== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=eHZc63hd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k14-20020a636f0e000000b005346b8dae84si3278546pgc.787.2023.07.21.09.21.28; Fri, 21 Jul 2023 09:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=eHZc63hd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232733AbjGUQU4 (ORCPT + 99 others); Fri, 21 Jul 2023 12:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231351AbjGUQUU (ORCPT ); Fri, 21 Jul 2023 12:20:20 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15BD73C14; Fri, 21 Jul 2023 09:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=SuJQI5JxUPzY+H5j7N6gL+Df0hCmvZbTgQvKUtpTEpg=; b=eHZc63hdtsg1y+fjHZW7M8RiIX TN8r4C0tbaB+1D2OBnuHT/V3k83Bx8u1kS47cCF7SylhwFGNjXnTmqOjQDzNHck4/uFuDNnz21jzv eF/+axOJZseXX2THzpEz8cOP+5p81sxUVnEYH5OulTKqNYqOV10OKsfizoG+2cPivMv0=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqE-0003IO-HL; Fri, 21 Jul 2023 12:18:55 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, Conor Dooley , Lech Perczak Date: Fri, 21 Jul 2023 12:18:35 -0400 Message-Id: <20230721161840.1393996-6-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 05/10] dt-bindings: sc16is7xx: Add property to change GPIO function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772047852682007523 X-GMAIL-MSGID: 1772047852682007523 From: Hugo Villeneuve Some variants in this series of UART controllers have GPIO pins that are shared between GPIO and modem control lines. The pin mux mode (GPIO or modem control lines) can be set for each ports (channels) supported by the variant. This adds a property to the device tree to set the GPIO pin mux to modem control lines on selected ports if needed. Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Acked-by: Conor Dooley Reviewed-by: Lech Perczak --- .../bindings/serial/nxp,sc16is7xx.txt | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt index 0fa8e3e43bf8..1a7e4bff0456 100644 --- a/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt +++ b/Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt @@ -23,6 +23,9 @@ Optional properties: 1 = active low. - irda-mode-ports: An array that lists the indices of the port that should operate in IrDA mode. +- nxp,modem-control-line-ports: An array that lists the indices of the port that + should have shared GPIO lines configured as + modem control lines. Example: sc16is750: sc16is750@51 { @@ -35,6 +38,26 @@ Example: #gpio-cells = <2>; }; + sc16is752: sc16is752@53 { + compatible = "nxp,sc16is752"; + reg = <0x53>; + clocks = <&clk20m>; + interrupt-parent = <&gpio3>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */ + gpio-controller; /* Port 0 as GPIOs */ + #gpio-cells = <2>; + }; + + sc16is752: sc16is752@54 { + compatible = "nxp,sc16is752"; + reg = <0x54>; + clocks = <&clk20m>; + interrupt-parent = <&gpio3>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */ + }; + * spi as bus Required properties: @@ -59,6 +82,9 @@ Optional properties: 1 = active low. - irda-mode-ports: An array that lists the indices of the port that should operate in IrDA mode. +- nxp,modem-control-line-ports: An array that lists the indices of the port that + should have shared GPIO lines configured as + modem control lines. Example: sc16is750: sc16is750@0 { @@ -70,3 +96,23 @@ Example: gpio-controller; #gpio-cells = <2>; }; + + sc16is752: sc16is752@1 { + compatible = "nxp,sc16is752"; + reg = <1>; + clocks = <&clk20m>; + interrupt-parent = <&gpio3>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + nxp,modem-control-line-ports = <1>; /* Port 1 as modem control lines */ + gpio-controller; /* Port 0 as GPIOs */ + #gpio-cells = <2>; + }; + + sc16is752: sc16is752@2 { + compatible = "nxp,sc16is752"; + reg = <2>; + clocks = <&clk20m>; + interrupt-parent = <&gpio3>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + nxp,modem-control-line-ports = <0 1>; /* Ports 0 and 1 as modem control lines */ + }; From patchwork Fri Jul 21 16:18:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp318955vqg; Fri, 21 Jul 2023 09:22:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlHbCcdqIoKFOci5yM8nltCoVhBx7R4jpV6MFFyE1G672QRfnA0rIEImGoviR9gxlj1lNwbj X-Received: by 2002:a05:6a00:84c:b0:67a:b045:e290 with SMTP id q12-20020a056a00084c00b0067ab045e290mr700458pfk.4.1689956527361; Fri, 21 Jul 2023 09:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689956527; cv=none; d=google.com; s=arc-20160816; b=Oah0rE6AEUjf3BklLzCUkVd3Bksfd2YIzsJ4Xc4ZcrOg7naLSeTFC8DRIQkoSs/8xn hqUdMu1USgLi22aB8FqLJmvUmpGKIq8stW3NCV2N2jLZYAVmpHbIjdYUsymnibuPPAGg YAq+kjQGta+ybv9pRsYWKyQt0883xBTs6ucxMAOcWO1Enqm0z7OeU3ZjYdldpSRPCJyj Wi3ZHy4I37COjvASkG7/yOvRuFiHeeKjOZ+lp13xh1bDueqN+CtpG3wRCaSaNR8ToSLV QUJmMRehpFZzl1w88aN6malRCdAZrePbhHPQPKwg2E/kNCT6C3tQ20/EyJuShVKFQdeB wSYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=Vt61VCJDfvny8Z+IuQuRqjAZVrpDSblm5wiaTdKznrg=; fh=r+5PSrLOVeqa5rJ4IxMDM9WD9mQLsBnSmymlh2LBmS8=; b=1JJEvRU34i2jkxRnK45D8GwkrC9QQWiWBtSJfxrZMeYPb+u3V1P/N0fEgz2DzILJzK PtwmNoIhIegIFcIzn0V5tVQmFb96z9I4bINxjk7T+BWBBmeaMkAauowaYdkBVWPYI8Bl WFEL4yKql7SwZrSkS8vIxg1z1w7IRkeMrGCmXcw0/fsSBMifk9JLYtIfehDZvO2j39Pg PBOkPPYTYdmGE3ssRP0QfWZ3TgJfk2yLUjzol+rzo+mMq0PX34J7lYX1bVuZBLvIzcr5 B4dQAW320C6XK/xnlmC8Qsqo4OTq3/GZG2BWYuVr9Em6A1Qbk1AP2iD0OeGG8RhrG38E 5txA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=NA3oqE8d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a056a00248f00b006834175c797si3497814pfv.330.2023.07.21.09.21.52; Fri, 21 Jul 2023 09:22:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=NA3oqE8d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232650AbjGUQVK (ORCPT + 99 others); Fri, 21 Jul 2023 12:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232422AbjGUQU0 (ORCPT ); Fri, 21 Jul 2023 12:20:26 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66889469D; Fri, 21 Jul 2023 09:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=Vt61VCJDfvny8Z+IuQuRqjAZVrpDSblm5wiaTdKznrg=; b=NA3oqE8d4HtlolmEBdOmOVShOS 8W96OEAdY8E9or/Qbcf/bvD1fNP40yoVOahkAT1ew04wvG70bmI+PNbhL0Xs0BHLokwkq/bLVvlx8 Nz5YXPt9xzz3IWIvOFil8U3yQEzSZROb8GODLSXW/aorYGTAtJF21ktnQn07WEjD0FJw=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqG-0003IO-5V; Fri, 21 Jul 2023 12:19:00 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, Andy Shevchenko , Lech Perczak Date: Fri, 21 Jul 2023 12:18:36 -0400 Message-Id: <20230721161840.1393996-7-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 06/10] serial: sc16is7xx: fix regression with GPIO configuration X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772047855606259653 X-GMAIL-MSGID: 1772047855606259653 From: Hugo Villeneuve Commit 679875d1d880 ("sc16is7xx: Separate GPIOs from modem control lines") and commit 21144bab4f11 ("sc16is7xx: Handle modem status lines") changed the function of the GPIOs pins to act as modem control lines without any possibility of selecting GPIO function. As a consequence, applications that depends on GPIO lines configured by default as GPIO pins no longer work as expected. Also, the change to select modem control lines function was done only for channel A of dual UART variants (752/762). This was not documented in the log message. Allow to specify GPIO or modem control line function in the device tree, and for each of the ports (A or B). Do so by using the new device-tree property named "modem-control-line-ports" (property added in separate patch). When registering GPIO chip controller, mask-out GPIO pins declared as modem control lines according to this new "modem-control-line-ports" DT property. Boards that need to have GPIOS configured as modem control lines should add that property to their device tree. Here is a list of boards using the sc16is7xx driver in their device tree and that may need to be modified: arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts mips/boot/dts/ingenic/cu1830-neo.dts mips/boot/dts/ingenic/cu1000-neo.dts Fixes: 679875d1d880 ("sc16is7xx: Separate GPIOs from modem control lines") Fixes: 21144bab4f11 ("sc16is7xx: Handle modem status lines") Cc: # 6.1.x: 95982fad dt-bindings: sc16is7xx: Add property to change GPIO function Cc: # 6.1.x: 1584d572 serial: sc16is7xx: refactor GPIO controller registration Cc: # 6.1.x: ac2caa5a serial: sc16is7xx: remove obsolete out_thread label Cc: # 6.1.x: d90961ad serial: sc16is7xx: mark IOCONTROL register as volatile Cc: # 6.1.x: 6dae3bad serial: sc16is7xx: fix broken port 0 uart init Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Andy Shevchenko Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 104 +++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 19 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 5b0aeef9d534..bc0a288f258d 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -236,7 +236,8 @@ /* IOControl register bits (Only 750/760) */ #define SC16IS7XX_IOCONTROL_LATCH_BIT (1 << 0) /* Enable input latching */ -#define SC16IS7XX_IOCONTROL_MODEM_BIT (1 << 1) /* Enable GPIO[7:4] as modem pins */ +#define SC16IS7XX_IOCONTROL_MODEM_A_BIT (1 << 1) /* Enable GPIO[7:4] as modem A pins */ +#define SC16IS7XX_IOCONTROL_MODEM_B_BIT (1 << 2) /* Enable GPIO[3:0] as modem B pins */ #define SC16IS7XX_IOCONTROL_SRESET_BIT (1 << 3) /* Software Reset */ /* EFCR register bits */ @@ -301,12 +302,12 @@ /* Misc definitions */ #define SC16IS7XX_FIFO_SIZE (64) #define SC16IS7XX_REG_SHIFT 2 +#define SC16IS7XX_GPIOS_PER_BANK 4 struct sc16is7xx_devtype { char name[10]; int nr_gpio; int nr_uart; - int has_mctrl; }; #define SC16IS7XX_RECONF_MD (1 << 0) @@ -337,7 +338,9 @@ struct sc16is7xx_port { struct clk *clk; #ifdef CONFIG_GPIOLIB struct gpio_chip gpio; + unsigned long gpio_valid_mask; #endif + u8 mctrl_mask; unsigned char buf[SC16IS7XX_FIFO_SIZE]; struct kthread_worker kworker; struct task_struct *kworker_task; @@ -448,35 +451,30 @@ static const struct sc16is7xx_devtype sc16is74x_devtype = { .name = "SC16IS74X", .nr_gpio = 0, .nr_uart = 1, - .has_mctrl = 0, }; static const struct sc16is7xx_devtype sc16is750_devtype = { .name = "SC16IS750", - .nr_gpio = 4, + .nr_gpio = 8, .nr_uart = 1, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is752_devtype = { .name = "SC16IS752", - .nr_gpio = 0, + .nr_gpio = 8, .nr_uart = 2, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is760_devtype = { .name = "SC16IS760", - .nr_gpio = 4, + .nr_gpio = 8, .nr_uart = 1, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is762_devtype = { .name = "SC16IS762", - .nr_gpio = 0, + .nr_gpio = 8, .nr_uart = 2, - .has_mctrl = 1, }; static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) @@ -1351,14 +1349,43 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } +static int sc16is7xx_gpio_init_valid_mask(struct gpio_chip *chip, + unsigned long *valid_mask, + unsigned int ngpios) +{ + struct sc16is7xx_port *s = gpiochip_get_data(chip); + + *valid_mask = s->gpio_valid_mask; + + return 0; +} + static int sc16is7xx_setup_gpio_chip(struct sc16is7xx_port *s) { if (!s->devtype->nr_gpio) return 0; + switch (s->mctrl_mask) { + case 0: + s->gpio_valid_mask = GENMASK(7, 0); + break; + case SC16IS7XX_IOCONTROL_MODEM_A_BIT: + s->gpio_valid_mask = GENMASK(3, 0); + break; + case SC16IS7XX_IOCONTROL_MODEM_B_BIT: + s->gpio_valid_mask = GENMASK(7, 4); + break; + default: + break; + } + + if (s->gpio_valid_mask == 0) + return 0; + s->gpio.owner = THIS_MODULE; s->gpio.parent = s->dev; s->gpio.label = dev_name(s->dev); + s->gpio.init_valid_mask = sc16is7xx_gpio_init_valid_mask; s->gpio.direction_input = sc16is7xx_gpio_direction_input; s->gpio.get = sc16is7xx_gpio_get; s->gpio.direction_output = sc16is7xx_gpio_direction_output; @@ -1371,6 +1398,47 @@ static int sc16is7xx_setup_gpio_chip(struct sc16is7xx_port *s) } #endif +/* + * Configure ports designated to operate as modem control lines. + */ +static int sc16is7xx_setup_mctrl_ports(struct sc16is7xx_port *s) +{ + int i; + int ret; + int count; + u32 mctrl_port[2]; + + count = device_property_count_u32(s->dev, + "nxp,modem-control-line-ports"); + if (count < 0 || count > ARRAY_SIZE(mctrl_port)) + return 0; + + ret = device_property_read_u32_array(s->dev, + "nxp,modem-control-line-ports", + mctrl_port, count); + if (ret) + return ret; + + s->mctrl_mask = 0; + + for (i = 0; i < count; i++) { + /* Use GPIO lines as modem control lines */ + if (mctrl_port[i] == 0) + s->mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_A_BIT; + else if (mctrl_port[i] == 1) + s->mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_B_BIT; + } + + if (s->mctrl_mask) + regmap_update_bits( + s->regmap, + SC16IS7XX_IOCONTROL_REG << SC16IS7XX_REG_SHIFT, + SC16IS7XX_IOCONTROL_MODEM_A_BIT | + SC16IS7XX_IOCONTROL_MODEM_B_BIT, s->mctrl_mask); + + return 0; +} + static const struct serial_rs485 sc16is7xx_rs485_supported = { .flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND, .delay_rts_before_send = 1, @@ -1479,12 +1547,6 @@ static int sc16is7xx_probe(struct device *dev, SC16IS7XX_EFCR_RXDISABLE_BIT | SC16IS7XX_EFCR_TXDISABLE_BIT); - /* Use GPIO lines as modem status registers */ - if (devtype->has_mctrl) - sc16is7xx_port_write(&s->p[i].port, - SC16IS7XX_IOCONTROL_REG, - SC16IS7XX_IOCONTROL_MODEM_BIT); - /* Initialize kthread work structs */ kthread_init_work(&s->p[i].tx_work, sc16is7xx_tx_proc); kthread_init_work(&s->p[i].reg_work, sc16is7xx_reg_proc); @@ -1522,6 +1584,10 @@ static int sc16is7xx_probe(struct device *dev, s->p[u].irda_mode = true; } + ret = sc16is7xx_setup_mctrl_ports(s); + if (ret) + goto out_ports; + #ifdef CONFIG_GPIOLIB ret = sc16is7xx_setup_gpio_chip(s); if (ret) @@ -1548,7 +1614,7 @@ static int sc16is7xx_probe(struct device *dev, return 0; #ifdef CONFIG_GPIOLIB - if (devtype->nr_gpio) + if (s->gpio_valid_mask) gpiochip_remove(&s->gpio); #endif @@ -1572,7 +1638,7 @@ static void sc16is7xx_remove(struct device *dev) int i; #ifdef CONFIG_GPIOLIB - if (s->devtype->nr_gpio) + if (s->gpio_valid_mask) gpiochip_remove(&s->gpio); #endif From patchwork Fri Jul 21 16:18:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 124016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp348014vqg; Fri, 21 Jul 2023 10:10:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlHxOkH07V+oranUGE67R8bZqbA6H6NLEcYzCfC5BXHTYw0K23k3i6XvPstaWLU9r02D71St X-Received: by 2002:a17:903:1106:b0:1b6:4bbd:c3a7 with SMTP id n6-20020a170903110600b001b64bbdc3a7mr2466997plh.66.1689959419893; Fri, 21 Jul 2023 10:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689959419; cv=none; d=google.com; s=arc-20160816; b=CBIZtpcXekIS86MNpdhv3h1BXOObeV3S0PAQd45I9e4RxoMpk9PrdnBa1dmfjoMMPR hUxBk+zPKG6iACGw+w1aZF7cec9NjtXJ4nlJ2YwaRlbbW4CUrKE75zDVI/5T0pSw5i2Z ixct5eIPV9GB4QOz1mQqTqpxH7rgL16VFIpODVbmv9qBgFuwZUFPSQfcwkRT0jeg8v60 xSdOKh1Y2QxEepr21Q6WX7v5FltAnI+mDRbCiyuS5/ngIK9cA7Y33CX9VDiaj8S8lIoy Hd30InfHmvY8VCUhWYJ6+ByRLTuM2fm/U85oFgd6uYB6vyuT9t6bZIDsQtQZqyuIKNNJ v8xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=g0IqX97ybKTf/1b9IfX3fw+nZZPbUPYVvGhnzhAVJ8Y=; fh=YcnO5F9tILQN1YTlpEJZBUiDonMxpEYqyincPQzfQj8=; b=jdAwknVIzTbtpN0YOqQTvBgM8HYzHOmDDy5tsjqNxv+wQr8esQt5C9BoIV+lbv4Lu8 HcAfyWo1q3OFNHB6TKr6iRdKPS/EI6N3YRqX4BdnoRkSCYb0UDDgEREyAsHyIw7EeQsP FIPyBbods+c8yqIhiNjnEkAZureYdr/72IG46aaawPyz0qnv9MRdlq2N6IOisbYJhQ71 QtSWAwQuF4xCfhgBQBbqkvzm/d15B43U/V8/RptFZ1uvEjqFwzI/58jphokkRb8aRX19 3a86UDo1RukAaSqmjw7IWyepfCAFOtSmbWSb26HzUgmcv646Z2HpfVlN/hd3HqX30LRN xXyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=K95k3duD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l2-20020a170903244200b001b86deba2fbsi3432977pls.605.2023.07.21.10.10.07; Fri, 21 Jul 2023 10:10:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=K95k3duD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232769AbjGUQVH (ORCPT + 99 others); Fri, 21 Jul 2023 12:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232363AbjGUQUZ (ORCPT ); Fri, 21 Jul 2023 12:20:25 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10A7B4684; Fri, 21 Jul 2023 09:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=g0IqX97ybKTf/1b9IfX3fw+nZZPbUPYVvGhnzhAVJ8Y=; b=K95k3duDE5Uw7Pakq7g9/EtMYn vtl95f0J8SHixA9iRR6ISV9swrw//qhOtjKCC5Kb6CzGDcGLUemT3uA9/zVP31U06r2x9x94zXBrn HNk2wLjxj6lTHTbdG2D/fK2KAFEW0i8xSBUJsxls2qh4Rw+N8Z9LIKm+BHRnQyFWI/Ow=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqK-0003IO-TF; Fri, 21 Jul 2023 12:19:01 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , stable@vger.kernel.org, Lech Perczak Date: Fri, 21 Jul 2023 12:18:37 -0400 Message-Id: <20230721161840.1393996-8-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 07/10] serial: sc16is7xx: fix bug when first setting GPIO direction X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050888652805280 X-GMAIL-MSGID: 1772050888652805280 From: Hugo Villeneuve When configuring a pin as an output pin with a value of logic 0, we end up as having a value of logic 1 on the output pin. Setting a logic 0 a second time (or more) after that will correctly output a logic 0 on the output pin. By default, all GPIO pins are configured as inputs. When we enter sc16is7xx_gpio_direction_output() for the first time, we first set the desired value in IOSTATE, and then we configure the pin as an output. The datasheet states that writing to IOSTATE register will trigger a transfer of the value to the I/O pin configured as output, so if the pin is configured as an input, nothing will be transferred. Therefore, set the direction first in IODIR, and then set the desired value in IOSTATE. This is what is done in NXP application note AN10587. Fixes: dfeae619d781 ("serial: sc16is7xx") Cc: Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index bc0a288f258d..07ae889db296 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1342,9 +1342,18 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, state |= BIT(offset); else state &= ~BIT(offset); - sc16is7xx_port_write(port, SC16IS7XX_IOSTATE_REG, state); + + /* + * If we write IOSTATE first, and then IODIR, the output value is not + * transferred to the corresponding I/O pin. + * The datasheet states that each register bit will be transferred to + * the corresponding I/O pin programmed as output when writing to + * IOSTATE. Therefore, configure direction first with IODIR, and then + * set value after with IOSTATE. + */ sc16is7xx_port_update(port, SC16IS7XX_IODIR_REG, BIT(offset), BIT(offset)); + sc16is7xx_port_write(port, SC16IS7XX_IOSTATE_REG, state); return 0; } From patchwork Fri Jul 21 16:18:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp331654vqg; Fri, 21 Jul 2023 09:43:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlEOFS/5ioFJfOlpqx3A8uE/WfEfvS3Ev3g5r0sfD1wpx04Fw8rIyfFXi6V5Tq6GuNH+ulsG X-Received: by 2002:a17:903:248:b0:1b8:2c2a:962e with SMTP id j8-20020a170903024800b001b82c2a962emr2923574plh.33.1689957826135; Fri, 21 Jul 2023 09:43:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689957826; cv=none; d=google.com; s=arc-20160816; b=tQ2H1og4o2pIWGG/ifVwOx4E3hBwcNbbPrretncf0YMnPsBcCncPt6U3VOU2+5SGvu 2mV/eF106rbDLVIOJHXCJBwdLBsOKu1ipSIeiuO16r5atuqmRVP6oEIAsIxFKqubTJTh pj/8Z+qb2MNYUC5Bx+Pr8HUDMs4FRCyBsyF6XD1tDuhgrhQndxHI1x/nRxn+PGlMGdhJ VnxuiDDLg4FVgO8IvU5Z2pMa/4nC/hoV+Yqd2LHpxB6fJk+Yui7fYcXMCYIneBRHtiP4 uJg50qhDA8lwzdE4jk+nvZJibghhriHkFvAZu+W/Emqh2YI7tLGqmce99ulBxQfHGuEC G0sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=CGELaf9iHFZKKMFhqnOQKxdW+WJUyHw8sFM+8NdBi0c=; fh=C0G+spVxDSoFERvffblhrfGksSnyZPiQD3AAjbYTJNc=; b=QcnfztYRtZXq7jfuc1vLxqmc3NtTUkPzXNVso5tMu7jQj037xQwbUWIt1QqG6WLPl+ lkWLJ1bawemJdvJE9ocTA1N3co/GrDD2Azr6SiI2O6MQ5IbJvp9IAM29hfEqNNRUuEEN ROtN8VaMfzor9q+bOeHbKrHTQO4608RL6YBCCX10okpgGTCPgWsvp3OSuG6f2En0MdSM Ro/wiTVhF2lhu5vbUMif2YHi5R/YzdUgjXvpTz3d4uBVjIrYd5wH8Lk+L2wAbuk0PYyt QvvmqnS8TT1DUDqwzhwHbXo6rz/D9rKKoq/9SZIPJkhjr8zLswCbN2EE7Dm0matq9vMR PRvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=GE62ZNnN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b4-20020a170903228400b001b041591a5fsi3647040plh.459.2023.07.21.09.43.32; Fri, 21 Jul 2023 09:43:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=GE62ZNnN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232518AbjGUQVO (ORCPT + 99 others); Fri, 21 Jul 2023 12:21:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232302AbjGUQU0 (ORCPT ); Fri, 21 Jul 2023 12:20:26 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE29946AB; Fri, 21 Jul 2023 09:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:Content-Type:MIME-Version: References:In-Reply-To:Message-Id:Date: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=CGELaf9iHFZKKMFhqnOQKxdW+WJUyHw8sFM+8NdBi0c=; b=GE62ZNnN4fg6fOn7SnYctmhzcp BYtrMtVqfSn8MyI1gotmVkoaFpHMNkeo5KoFYM+TJpL36JwlcUVmqqlkqNRTlj/HzRiG4ALE+cSHq o97UCzmFC5ha9gfmacADXta8HaQFY6WaADOZtoRNBLeOP9d3B/8D2PALIwUH6g4U9Sek=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqM-0003IO-5d; Fri, 21 Jul 2023 12:19:02 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Lech Perczak Date: Fri, 21 Jul 2023 12:18:38 -0400 Message-Id: <20230721161840.1393996-9-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 08/10] serial: sc16is7xx: add call to get rs485 DT flags and properties X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772049217813471953 X-GMAIL-MSGID: 1772049217813471953 From: Hugo Villeneuve Add call to uart_get_rs485_mode() to probe for RS485 flags and properties from device tree. Signed-off-by: Hugo Villeneuve Reviewed-by: Ilpo Järvinen Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 07ae889db296..49213be60baf 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1549,6 +1549,10 @@ static int sc16is7xx_probe(struct device *dev, goto out_ports; } + ret = uart_get_rs485_mode(&s->p[i].port); + if (ret) + goto out_ports; + /* Disable all interrupts */ sc16is7xx_port_write(&s->p[i].port, SC16IS7XX_IER_REG, 0); /* Disable TX/RX */ From patchwork Fri Jul 21 16:18:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp341310vqg; Fri, 21 Jul 2023 10:01:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlE4O77cRQy+WzzluZW5A9vCzthQvfniwuDDOfsH6958NW+ddg3j9DM8opdH2i1G3joDIJIs X-Received: by 2002:a05:6512:1084:b0:4f8:5905:8e0a with SMTP id j4-20020a056512108400b004f859058e0amr1897269lfg.6.1689958900100; Fri, 21 Jul 2023 10:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689958900; cv=none; d=google.com; s=arc-20160816; b=Ch2ktK3MdNxryu6fcUEfDlk+tSkGuc6VB0e2YW3VIhcy7J5X8uAmUTBJgdU3aTCFeL QuzK6mKfguRI9Pn4nKz7X3gfRpMK5lgcyW4eQefQVvfcb2vnPg8CixsYP+og9zbo0SDt C+N3Oj8gzXPThEvxfRrJyf8vDuts9zZdCij0azrzlnrS46azcENhwPDFe2XjWo9qMuJw YOLUTo9aM3rv5sfhoNwzkQgPCzxOtXJkiaKfQ80iDi2v/fWYcj5E877x8f+mOKkSa5SH Dnp9JNC5eYv/ibAiod3INmetFMu3sO1tUqchDvRMIwhOSqAjUG6ZfqSou0LVr8OP9Unr vYWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=hJjkp3frl86bgh+fvqfTcebGX6hsjlqpFUYax05mOtQ=; fh=8lgP9Q7yUti3QJsgyDqXJNhUNHaf4UcodBK5t7Tk2ug=; b=Ybudtc4778+XiXD08TK7pLqSnRJxOpTN1PrXHFywTGWWeRScHwusMmTw+lIENRvx8K xCdwZGKNvGg+oIrf1/9O+YSz/hJ9YyYKz+pk558Rbogyr0gMshRdL8HEelyPaUZB6zxi He7+WDUw5/yZOEbo7t3VQVxyj9F5KLd7Tra5Ae0lzhwh4n8tpjR//nmpgqy2qyS0gPlq GTfLIZFcEtDnJYcGg/Gg4+yQaUE2EuqJ4zN6FDwVT7BTZgNIPBP+HjNTd+nmbkJ3Hq0C sXdt97p8tmYZSmT6ucBwDqcnRshkntLG1Jva9thWZydhdo5ssxIk/j35oQ+R7l7ut/36 hySw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="ypsF/qq+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a23-20020aa7d757000000b0051da4f1bea9si2453933eds.383.2023.07.21.10.01.05; Fri, 21 Jul 2023 10:01:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="ypsF/qq+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232634AbjGUQVR (ORCPT + 99 others); Fri, 21 Jul 2023 12:21:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232673AbjGUQU1 (ORCPT ); Fri, 21 Jul 2023 12:20:27 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85B4046AD; Fri, 21 Jul 2023 09:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=hJjkp3frl86bgh+fvqfTcebGX6hsjlqpFUYax05mOtQ=; b=ypsF/qq+jJnj0QmZBE0ROJx5eP GyhCcLwBj1QEuypxztfcIsTGgOU0U8hOxeq+J6uFiD8XWE7guAT46grPzJ+yXv7ek9sGCBHuoFrf4 8m3CUUeA1mznOZr/d7mP7KZVhJku1AqYfrBirnviQ3nBnLutZeAv0ZdhRRb5MUjMR0fQ=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqN-0003IO-IM; Fri, 21 Jul 2023 12:19:04 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , Lech Perczak Date: Fri, 21 Jul 2023 12:18:39 -0400 Message-Id: <20230721161840.1393996-10-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 09/10] serial: sc16is7xx: add post reset delay X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050343360622056 X-GMAIL-MSGID: 1772050343360622056 From: Hugo Villeneuve Make sure we wait at least 3us before initiating communication with the device after reset. Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak Tested-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 49213be60baf..718e982e1efe 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1526,6 +1526,12 @@ static int sc16is7xx_probe(struct device *dev, regmap_write(s->regmap, SC16IS7XX_IOCONTROL_REG << SC16IS7XX_REG_SHIFT, SC16IS7XX_IOCONTROL_SRESET_BIT); + /* + * After reset, the host must wait at least 3us before initializing a + * communication with the device. + */ + usleep_range(5, 10); + for (i = 0; i < devtype->nr_uart; ++i) { s->p[i].line = i; /* Initialize port data */ From patchwork Fri Jul 21 16:18:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 123970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp338603vqg; Fri, 21 Jul 2023 09:57:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlFGVMu2LYiKgkvYZajNQEQPi5csISxobm24GM6nwOpNny7jPkk4msaFXsKLihpKbZLQ1qNr X-Received: by 2002:a05:6402:4303:b0:521:946d:8280 with SMTP id m3-20020a056402430300b00521946d8280mr9524847edc.9.1689958640678; Fri, 21 Jul 2023 09:57:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689958640; cv=none; d=google.com; s=arc-20160816; b=bvwvlqhUj9yRmZFNwWcw/QS0+HS2BHsiF6VChM6Z01mLzDptCYy22QZcJ7WDL3DYRs fo8VY34q7WnFD0bZBsOJCx1MGLBt1BUooavN3ItktpuMjRbVeU5KZ6VWh2K7ZuTFu+CX xmpXVoG/k2nHoEuY4kaJd7XYSudsMRqiHdCX1a1xKAlrWUYkhaCOKrB1vkK/Q04Ngk/E 8rtetN0djL+hAKHZo+hzqb+q3DHdBpZvzRRUiv2lxsylK5ztl4Ugr7K54pnRyiKC2awC 3WX/lsSwyfUg7pOcXckS477/qeGI+FTnDZ9XpIUENXToxYaVKf6ejXms9CHK+fmICUjl zBmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=9yfW8mHRhmt1BZssK5Nqf/xXTWUgDfzvBAsuQ90MFC8=; fh=8lgP9Q7yUti3QJsgyDqXJNhUNHaf4UcodBK5t7Tk2ug=; b=DpcaqCw/SdoRgQZuS7S50o1uCF5hduYd75gdPhqpIeb5likLzS+QqCRgqTFKYRI8pf MYdztBDV8nOf2MGX7ZxihJ0XT3vCl0++HlMAHOeGXxtqZf94yCIXLyVypq2LN8Px0wHi AnBMP9bcgrR0y95crWyAH0jxcOnKhzy6IRECc7UksTf0kPAzFY11fhz/c2IFeKwnKu5M PNgQMuWHrQBj5+iPehyBVbJriFGftDAQNN96SJ8UsyYMi/bnFhwAXFvyrCNSq4EaeT2/ APxUSao3tu6yCHtihIClYvf9NAbI0/wjYOHkGrixlukSxVFWPQoZVBZVj95eo2nps7aS o/iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=ALbbEmSJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o22-20020aa7d3d6000000b0051df118addasi2681064edr.230.2023.07.21.09.56.50; Fri, 21 Jul 2023 09:57:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=ALbbEmSJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232799AbjGUQVV (ORCPT + 99 others); Fri, 21 Jul 2023 12:21:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232661AbjGUQU1 (ORCPT ); Fri, 21 Jul 2023 12:20:27 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 865AA46A9; Fri, 21 Jul 2023 09:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: 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=9yfW8mHRhmt1BZssK5Nqf/xXTWUgDfzvBAsuQ90MFC8=; b=ALbbEmSJ1RENtwHraobo8ese4C 1fESJIbYgHFz+SPqgyaAi9y+yO43fDDr+jjfCuUtpOowutm411OXUXtMDUizT2xK2qWr9Sr4bdn4l 7m+zYDRXY8NYt+jdojaoyjyoFPHxgP7082EmrlBdHokMRSAoiAUXwql0cZmFP9Rl7uTU=; Received: from modemcable061.19-161-184.mc.videotron.ca ([184.161.19.61]:50368 helo=localhost.localdomain) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qMsqO-0003IO-Pl; Fri, 21 Jul 2023 12:19:05 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, jirislaby@kernel.org, jringle@gridpoint.com, isaac.true@canonical.com, jesse.sung@canonical.com, tomasz.mon@camlingroup.com, l.perczak@camlintechnologies.com Cc: linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, linux-gpio@vger.kernel.org, Hugo Villeneuve , Lech Perczak Date: Fri, 21 Jul 2023 12:18:40 -0400 Message-Id: <20230721161840.1393996-11-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230721161840.1393996-1-hugo@hugovil.com> References: <20230721161840.1393996-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 184.161.19.61 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Subject: [RESEND PATCH v8 10/10] serial: sc16is7xx: improve comments about variants X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772050071642202380 X-GMAIL-MSGID: 1772050071642202380 From: Hugo Villeneuve Replace 740/750/760 with generic terms like 74x/75x/76x to account for variants like 741, 752 and 762. Signed-off-by: Hugo Villeneuve Reviewed-by: Lech Perczak --- drivers/tty/serial/sc16is7xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 718e982e1efe..d6851360ef7d 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -223,7 +223,7 @@ * trigger levels. Trigger levels from 4 characters to 60 characters are * available with a granularity of four. * - * When the trigger level setting in TLR is zero, the SC16IS740/750/760 uses the + * When the trigger level setting in TLR is zero, the SC16IS74x/75x/76x uses the * trigger level setting defined in FCR. If TLR has non-zero trigger level value * the trigger level defined in FCR is discarded. This applies to both transmit * FIFO and receive FIFO trigger level setting. @@ -234,7 +234,7 @@ #define SC16IS7XX_TLR_TX_TRIGGER(words) ((((words) / 4) & 0x0f) << 0) #define SC16IS7XX_TLR_RX_TRIGGER(words) ((((words) / 4) & 0x0f) << 4) -/* IOControl register bits (Only 750/760) */ +/* IOControl register bits (Only 75x/76x) */ #define SC16IS7XX_IOCONTROL_LATCH_BIT (1 << 0) /* Enable input latching */ #define SC16IS7XX_IOCONTROL_MODEM_A_BIT (1 << 1) /* Enable GPIO[7:4] as modem A pins */ #define SC16IS7XX_IOCONTROL_MODEM_B_BIT (1 << 2) /* Enable GPIO[3:0] as modem B pins */ @@ -249,9 +249,9 @@ #define SC16IS7XX_EFCR_RTS_INVERT_BIT (1 << 5) /* RTS output inversion */ #define SC16IS7XX_EFCR_IRDA_MODE_BIT (1 << 7) /* IrDA mode * 0 = rate upto 115.2 kbit/s - * - Only 750/760 + * - Only 75x/76x * 1 = rate upto 1.152 Mbit/s - * - Only 760 + * - Only 76x */ /* EFR register bits */