From patchwork Thu Jun 1 20:18:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp590888vqr; Thu, 1 Jun 2023 13:20:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5O5rukMqZdNaBCrX6JA6tlOZRQt+etBIru1UDLLiNmgpvolPWJsR86X4ideiU1CC0BoeOG X-Received: by 2002:a05:6a20:4322:b0:10b:bf2d:71bb with SMTP id h34-20020a056a20432200b0010bbf2d71bbmr3301951pzk.27.1685650804976; Thu, 01 Jun 2023 13:20:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650804; cv=none; d=google.com; s=arc-20160816; b=FMj32kYqURhgWQ3HLb2JLg4kM9CBqWT5xgmXsrPiICc59un6tG41lzczz3ueVJGXdJ Uhki3T+KUghRH5Hkq0kUVgRSQaTcpWzhZUCb9+e5Oazj6UwLrfzUq0UobWyxRKuvQije r71/jPuIvAXaGanQv5M6sn1AoIQacJMXKoZ6XEQADco7RUi83sWn2CvlSx6wFz67HV3Y XGczVDhhcCtF7HRQDkzR575kRMvFh7FZi+cNCkaefHNejVUvqXf/fU6gej4GvUYtPIzg zfr4pWJQaK7iCSM6sS2iFUpAHfNYNhdlGZqKytmIOovpRvK3kXfDCtLEV9NpJe55aK/L 0/zA== 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=vlvSfJ7BB6pGJBxrOhJ5IMJLf95UIyksZ/69U1YnCu4=; b=zsufXWPA6N9ygSJ5102QegqZFQ4mBVrXBNzyZ8hkUiUxepveSeHh/DSv9yJzKpeF1I Cda843Ody7xZCc3iwjP6VwszW78ruW6UWGEOYhn+XaW/BxawP6vpD8GDGukwtanlmR+W EDxJqwE766ilEFRtk9oXbnYs8Ih+LSqGEKe8Ho0wMh84aay9godPAkJwIKCyUdnTUrW/ bOgDCzqolkYxQQZ0TzFSumUGVZB1K/0GiermiuHdDsQw56amTPucoqEYY2kxYsIhAtjS d/A/heTywxCUF866FhGaflv+uWOwZnMdHwgYyBtYs+fYPMbQBE0q5sWvMWpsSJMirb1Y 8LVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=NR4k24b2; 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 194-20020a6219cb000000b00650c6fd4a07si1094721pfz.152.2023.06.01.13.19.49; Thu, 01 Jun 2023 13:20: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=NR4k24b2; 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 S229524AbjFAUTC (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231213AbjFAUS6 (ORCPT ); Thu, 1 Jun 2023 16:18:58 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBFFC128; Thu, 1 Jun 2023 13: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=vlvSfJ7BB6pGJBxrOhJ5IMJLf95UIyksZ/69U1YnCu4=; b=NR4k24b2NLfmmqYMLtFGjBx5nS vRCBp6cbBxBSuTivEsG++AtkkoRSKudtkj8STFjr1yWMToj9hurlV7+NTy8m73a/7A2EDYvoGgS0D i5r6tpZ/8cmBw8seAuJs4dzayJT4PKaUF41f2ZdMCtzbJ49mzX3MoK3tw6GxKJeCANE4=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4oky-000686-QQ; Thu, 01 Jun 2023 16: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, 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: Thu, 1 Jun 2023 16:18:36 -0400 Message-Id: <20230601201844.3739926-2-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 1/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767532978561511250?= X-GMAIL-MSGID: =?utf-8?q?1767532978561511250?= 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 abad091baeea..faa51a58671f 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 Thu Jun 1 20: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: 102184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp596828vqr; Thu, 1 Jun 2023 13:32:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7NcCHm/SigNyzE0iVcOaopIk28QCgaibPxAyLxk2oTaDjx98nsIfjeRtA2QGD7dNdBOcSf X-Received: by 2002:a05:6a21:32a2:b0:110:f65a:139d with SMTP id yt34-20020a056a2132a200b00110f65a139dmr8832163pzb.44.1685651572643; Thu, 01 Jun 2023 13:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685651572; cv=none; d=google.com; s=arc-20160816; b=jzSet83pQyajhn3sw82h2slsL8DdqoJ5HTa6ShScgYnV6iPND/1KAXdnlFiZFIZ+qv e1qk+M+WLvKMdk++TFLt71CNZIhoDSIRTnC3XWXfim+m8Rt9uTwneZnC0mhHEIThy4Xb VwqFwZdfyAWvqU+1/Osk2HVV+wTgTwetmnXRPkgOQXL71S1JlBiTI5GB8yipzMHTwBdH i2Fg9FddrssuNo9yLuljLnbKQrDOa6vpbj0J4Rh0gKe1A4df/Gc+uMT+4jGMI/yjBnqr d8wymhvwqIj4lixOQeexOK5s/x6PpXCeartuJHfzUMBOYUeMkBZTxW6hvuWE58PO3rYv XZ3A== 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=T/ybH+luXFJtRUNLsANdxNj5MlosRcBXIwuB3tKL/mQ=; b=yhfLG7qO5NjeQFZJ8m9nNtm7JMLo5qaaeXGQDnfJ/CQEXwCw2GfOFwylrQ1LJ60VuK vFVzWew4WK2/AH2XT+FbMdFqobeRwRIA0jevhqoEAh+6aTB0MubTYI2/eqnh6sVLir0b budrzX6dbLj3OwxGj3KsREOv8wNWVQt4tyHlXMHPiilLhALhzJeu2/RlFBiz+eFhf+oz lrUKe5vLUhha8ZE09yhY967vguRxoG7A45pXgvLYqgZEiMag1QmBjjq81b/nX6VGOWqV /oXyh3lYTt8cCfzI3kUbkzjbV+Btr/B77aDg0nwCpgMBYvvWPN0SVMje99vEvcEyZulm se0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=XBVYQPn5; 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 b5-20020a63eb45000000b005346bd7dee9si3390134pgk.682.2023.06.01.13.32.40; Thu, 01 Jun 2023 13:32:52 -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=XBVYQPn5; 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 S229884AbjFAUTH (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbjFAUS6 (ORCPT ); Thu, 1 Jun 2023 16:18:58 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBF65D1; Thu, 1 Jun 2023 13: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=T/ybH+luXFJtRUNLsANdxNj5MlosRcBXIwuB3tKL/mQ=; b=XBVYQPn54+UaXJWMEcflRq65nw X1YXvZHzNzS78BamaYD7NhzYDX+Sl0Kr16oGgpC0ETGhgH3ppum1Q6V+GagI+qxUjQysjs9SkzSXm skLeYA9l2lRGkkUXNMMQIbY1gz0BN+mvrGMAJ/6K7pEeXKGGix2b8xb5eaBHnYQ7LKYA=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol0-000686-4g; Thu, 01 Jun 2023 16: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, 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: Thu, 1 Jun 2023 16:18:37 -0400 Message-Id: <20230601201844.3739926-3-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 2/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533783176317065?= X-GMAIL-MSGID: =?utf-8?q?1767533783176317065?= 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 faa51a58671f..0c903d44429c 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 Thu Jun 1 20:18:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp596483vqr; Thu, 1 Jun 2023 13:32:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BAmrXg5z1yDzkbUc1+e6LWT4L7YlSOjBECKnr3BCkGl52BU9i+SU/4KP7WxsYx3OS+zd2 X-Received: by 2002:a17:90a:9cb:b0:258:b676:59 with SMTP id 69-20020a17090a09cb00b00258b6760059mr414973pjo.19.1685651529960; Thu, 01 Jun 2023 13:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685651529; cv=none; d=google.com; s=arc-20160816; b=yxDOLH+bd3Dsud9gjH7PqtPmg730SD5S3VFIdbDlANrJMG5zNTFCaaZuctrub4u6St Ibrx3FrOju+lu7g8XBMA6FRG8dSLu4XNWf9DzXOcKFro9x021ya4zwow9SMAERxodPfL F+3YFZ0nsbppz/9KpyCs6+OWWJU5FoBb3euMbA3xDBZ/QJ69IjjNYYzs2f6IsM06ooAT pWNyA/wSrAMxfhSBQm+moQrjKbPzyIlZeucKN93NHqbIzuQ01wHIQlCwjNWhU1lKKN0m NgBJNMFwqxRwGr22ON+1VPsUxszh/GQku9AMfmIQf8A9hf/V62hPki0Pf2SaJtsUtkaX Vzxg== 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=PvKU1KZMqnBynFfs1LyL8913fUHPvhHtVoFLTU7Udeg=; b=B63Cgi1/7jN2ptfrF4kVF5vRJbdH4i7NBg3ebNqdUqBJpqq1awW+VmNTl8HGd4nRNU CBT8IPb1tBQiHBEA68udFjQBLwkxJN0QDXSy5gqKV4WKlbPXG5SGVNTgSxsQAW821uQM dlf5tCP/5o78NGBNsljlmHED9y5N3aM3Wqz+Stws+pltdQ8wyQRIEnGOanNwFbZo7ta2 84Mc3KOJyrRl2LKDQ1AghiflGCeCAMo9tQNFHjtcvIjpXXprtk3+maLJKJMH6BJNCNXB 3aUwUKSVH9ruwf4d7IbK01qRIEDghT7jMyNt4CjB6CpbIggkKbbdCdlLl37aAoeW5xLo qVfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=p04ZgL+m; 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 m6-20020a17090a414600b00256933298absi1565203pjg.84.2023.06.01.13.31.56; Thu, 01 Jun 2023 13:32:09 -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=p04ZgL+m; 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 S232056AbjFAUTN (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231718AbjFAUTA (ORCPT ); Thu, 1 Jun 2023 16:19:00 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 297CB18D; Thu, 1 Jun 2023 13: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=PvKU1KZMqnBynFfs1LyL8913fUHPvhHtVoFLTU7Udeg=; b=p04ZgL+mCMnU7bmy0qq0MHsqW/ ztu0zrwLOOCWWaunMKTI7ul61nx+6vuFTo4+KUrA8Hi+zqSDSU1BrKWAQOwTzsdRfcIJV54WR3caz yIw/G320ytQLvKZkX31sIkPHGstYyTjC8HeKCR4hhBNrWbNiJo239Oh/GgwXVMFNkpZ8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol1-000686-Cn; Thu, 01 Jun 2023 16: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, 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: Thu, 1 Jun 2023 16:18:38 -0400 Message-Id: <20230601201844.3739926-4-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 3/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533738952042529?= X-GMAIL-MSGID: =?utf-8?q?1767533738952042529?= 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 | 39 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 0c903d44429c..7d50674d2d0e 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1349,6 +1349,26 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } + +static int sc16is7xx_setup_gpio_chip(struct device *dev) +{ + struct sc16is7xx_port *s = dev_get_drvdata(dev); + + if (!s->devtype->nr_gpio) + return 0; + + 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 = 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 = { @@ -1502,22 +1522,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_thread; - } + ret = sc16is7xx_setup_gpio_chip(dev); + if (ret) + goto out_thread; #endif /* From patchwork Thu Jun 1 20: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: 102179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591195vqr; Thu, 1 Jun 2023 13:20:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lBdgHsSoz55nwu+m7Gj/o8v/LK0RTRLCmArj5pGF/w7mCvEyblU8oGzLg7f2e8+k4t60p X-Received: by 2002:a05:6358:4315:b0:123:3ea3:2bd2 with SMTP id r21-20020a056358431500b001233ea32bd2mr6936268rwc.32.1685650842492; Thu, 01 Jun 2023 13:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650842; cv=none; d=google.com; s=arc-20160816; b=HtmR8xoqr8oF5/MzVUpiN/ZT18CXbl0En5ypceL964/fkrc3mXn3VA5/RkzXm/hdqD OSyq7AtcxrujljnT+ZnzvaIxhuHK6nCxs/c29YECVxJgWv8v8aY9sbGcH3UCwno66nCb FQHMY7OKS7SBEWi1sxEOdQEcotk03krqddcpzGONE0Ox9eEbHTHkV/wiSqbo+Qwxf+4F ovlujODsO+/6kKs0cb5l59liGC7D0G1RAoqAwFAfXh1UFIsZg2puAHMLe6dxxe1ZdvOF dfvK4k3EwKruYpyK1j0WJOd4vk2oNmBv/d537LRBIumDbw9+TPHV7hbLYXNL5KvjBWy4 Wbgg== 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=; b=n/6CBFHGm27fX1xhKLHdsJHyMuMoG9WjnPZ2+SrR9ciZvuzJlrgyfg5S5kuBy/jzkO 48mrCwsD8B3m+9cXnzffbK3DK23TorE6Lr5ADmjIVayQbxiwiatM8GPvlKn8sa68aPet xoxPzKhGswYPl3qzgfReW6tRT3XpfT+zq+eehH/FKWZLHo8YLQMvbvh/GyPMiocjtj5w 0yRSwNVvjh1MD0DrsBy0HuId8eLnLgcNZaV2bApKxSVXkG8X4JHfNPdL5LVjcFmo5iMb HXhpsuB8PnCgNUg/yeYVnW2PM0iH1L7wxt3KjWdX7GW3GvyAUdaZVy1btCsWC3KEkdpK 5jhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="Oa5D2/22"; 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 v11-20020a17090ac90b00b00258996c09e4si1618413pjt.22.2023.06.01.13.20.26; Thu, 01 Jun 2023 13:20:42 -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="Oa5D2/22"; 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 S231890AbjFAUTS (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231545AbjFAUTC (ORCPT ); Thu, 1 Jun 2023 16:19:02 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CCC7D1; Thu, 1 Jun 2023 13:19:00 -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=Oa5D2/22yJ/hGuV1pAfsP/G9NZ MtZ7RpKRGlablVyof1pn52zeRLIRvXdaGjcYzWq7S/e8g1SxLOUkLrj1N+h5bbzj/wIztPsaRjwJx 2RdAuLhLiEFwMq9OJPUhY8kqEcDp1K6LCKtJ4kmlb4G0PwYevwU27SUSdhappaxYKlq8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol2-000686-S0; Thu, 01 Jun 2023 16: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, 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: Thu, 1 Jun 2023 16:18:39 -0400 Message-Id: <20230601201844.3739926-5-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 4/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533017781192623?= X-GMAIL-MSGID: =?utf-8?q?1767533017781192623?= 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 Thu Jun 1 20: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: 102178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591191vqr; Thu, 1 Jun 2023 13:20:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ777lUs93Id5IW6JpbQ5BqYo5n23Y1eZlxm9ckwHEbUpdTbTKdPbB95E6tlaTFCx3pajQNh X-Received: by 2002:a05:6a20:9597:b0:10b:b9b3:3c9d with SMTP id iu23-20020a056a20959700b0010bb9b33c9dmr6448952pzb.49.1685650842007; Thu, 01 Jun 2023 13:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650841; cv=none; d=google.com; s=arc-20160816; b=YgWvm9VRx47+E/RKe7v97lbHV/HF0aC8mW+XenPijd5kkLqSSfMvarlL5eUWw0gI6n nANMRLWZ2iumXlGOl+quIpjCDUU51htqW19hi70vWwN9C/y0eHOhi1yo3cwUe/TBF8+A uU33KBh6z5CQFzexWFDuerU+/OvWvlHJBZS7omw5L8I9HFi2bi1QoyRIgf5byFY4l5gc md2M85uWlO38pmRmL5nABiyX8DnF3e50zd7iIqshpBh7FRSKwDiJm1+yfsLnAvy0hPO6 PwNCGEhIHJGK3vWWExRvlUyJyCN1bCKbwffF+/PvVk+4nHKIwGB4uu40JSHQe+/9yLAr xwNQ== 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=hEflR0XEH91vm7nnoLolEjlsR6byylaX01ee4kA2NTI=; b=W7kN1yE6naGTc94ktWJ31lkB1ZTE/74k6JUkOJEaYVPl2SAIRZWULhO1+db+0MK3BU Cm44eRUBhBxD8moOVMNEIWYVbyIfcpfs3OKMFXuzMqASdvJrFsmS+9e00Fae3a8frpwR HBwnY6fHm9a5/3iMtRFzSNfznIxpEG4+9D4daAv2TzxZBdBY6SIytwH/OuffR/GRKnAW SzzgMdwgnTi0ykF21iXjtrUdbrJkuxhcIKKfXyAvscYllfa+iV7a9ijbp8FbNIvdEGnv eGvckvDY8n9YWnqA/mPtuA0sPZBW1VyEI+r9cN5PlHPtLP7RQQcnV5VMlgZS5yg05LWZ zWbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=spAxrHkv; 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 c21-20020a624e15000000b0064cc2c0c815si4742730pfb.396.2023.06.01.13.20.27; Thu, 01 Jun 2023 13:20:41 -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=spAxrHkv; 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 S232496AbjFAUTo (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231926AbjFAUTF (ORCPT ); Thu, 1 Jun 2023 16:19:05 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 192FF198; Thu, 1 Jun 2023 13:19:04 -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=hEflR0XEH91vm7nnoLolEjlsR6byylaX01ee4kA2NTI=; b=spAxrHkv2w5dfiy7LfhQd6dwyt eUgqDoFFlZpfZCqRS21GV4ZFuvfCdgdiKIWKMHWryWoR4y2p5aW0UuBurzaVeYEVvbeUan2zV9IBl iodwQYZXy9S9sYqJ1oMssFUNDG7y2szWrU9ZqoU/0rBNa78Wclb5vXMXwmd3RIRAN3iE=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol4-000686-Eg; Thu, 01 Jun 2023 16: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, 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 Date: Thu, 1 Jun 2023 16:18:40 -0400 Message-Id: <20230601201844.3739926-6-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 5/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533017246394328?= X-GMAIL-MSGID: =?utf-8?q?1767533017246394328?= 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: 35210b22 dt-bindings: sc16is7xx: Add property to change GPIO function Cc: # 6.1.x: 7d61ca47 serial: sc16is7xx: refactor GPIO controller registration Cc: # 6.1.x: 322470ed serial: sc16is7xx: mark IOCONTROL register as volatile Cc: # 6.1.x: a0077362 serial: sc16is7xx: fix broken port 0 uart init Cc: # 6.1.x Signed-off-by: Hugo Villeneuve Reviewed-by: Andy Shevchenko --- drivers/tty/serial/sc16is7xx.c | 102 ++++++++++++++++++++++++++------- 1 file changed, 81 insertions(+), 21 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 7d50674d2d0e..ad6b9d613b33 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) @@ -336,6 +337,7 @@ struct sc16is7xx_port { struct clk *clk; #ifdef CONFIG_GPIOLIB struct gpio_chip gpio; + unsigned long gpio_valid_mask; #endif unsigned char buf[SC16IS7XX_FIFO_SIZE]; struct kthread_worker kworker; @@ -447,35 +449,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) @@ -1350,16 +1347,45 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } -static int sc16is7xx_setup_gpio_chip(struct device *dev) +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 device *dev, u8 mctrl_mask) { struct sc16is7xx_port *s = dev_get_drvdata(dev); if (!s->devtype->nr_gpio) return 0; + switch (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) + return 0; + s->gpio.owner = THIS_MODULE; s->gpio.parent = dev; s->gpio.label = dev_name(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 +1397,43 @@ static int sc16is7xx_setup_gpio_chip(struct device *dev) } #endif +static int sc16is7xx_setup_mctrl_ports(struct device *dev) +{ + struct sc16is7xx_port *s = dev_get_drvdata(dev); + int i; + int ret; + int count; + u32 mctrl_port[2]; + u8 mctrl_mask = 0; + + count = device_property_count_u32(dev, "nxp,modem-control-line-ports"); + if (count < 0 || count > ARRAY_SIZE(mctrl_port)) + return mctrl_mask; + + ret = device_property_read_u32_array(dev, "nxp,modem-control-line-ports", + mctrl_port, count); + if (ret) + return mctrl_mask; + + for (i = 0; i < count; i++) { + /* Use GPIO lines as modem control lines */ + if (mctrl_port[i] == 0) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_A_BIT; + else if (mctrl_port[i] == 1) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_B_BIT; + } + + if (!mctrl_mask) + return mctrl_mask; + + regmap_update_bits(s->regmap, + SC16IS7XX_IOCONTROL_REG << SC16IS7XX_REG_SHIFT, + SC16IS7XX_IOCONTROL_MODEM_A_BIT | + SC16IS7XX_IOCONTROL_MODEM_B_BIT, mctrl_mask); + + return mctrl_mask; +} + static const struct serial_rs485 sc16is7xx_rs485_supported = { .flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND, .delay_rts_before_send = 1, @@ -1383,6 +1446,7 @@ static int sc16is7xx_probe(struct device *dev, { unsigned long freq = 0, *pfreq = dev_get_platdata(dev); unsigned int val; + u8 mctrl_mask = 0; u32 uartclk = 0; int i, ret; struct sc16is7xx_port *s; @@ -1478,12 +1542,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); @@ -1521,8 +1579,10 @@ static int sc16is7xx_probe(struct device *dev, s->p[u].irda_mode = true; } + mctrl_mask = sc16is7xx_setup_mctrl_ports(dev); + #ifdef CONFIG_GPIOLIB - ret = sc16is7xx_setup_gpio_chip(dev); + ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask); if (ret) goto out_thread; #endif @@ -1547,7 +1607,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); out_thread: @@ -1573,7 +1633,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 Thu Jun 1 20:18:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591158vqr; Thu, 1 Jun 2023 13:20:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4xnWTEjwNo3J29meLN9OrhR3ActTuSEx9QfakMEoDDNk3AZXNJ1oNJze0k8CdCtc56/iVe X-Received: by 2002:a17:902:6506:b0:1b0:4bc7:31ee with SMTP id b6-20020a170902650600b001b04bc731eemr451963plk.32.1685650836152; Thu, 01 Jun 2023 13:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650836; cv=none; d=google.com; s=arc-20160816; b=yYe0RxhfEIKXFu1bqylhf3dNhX+BsqSFFJtwzYZw4bkPoYHCEF3Mo70u8dLPyEodEP 0xpYciIS/IiSJRzoQM9HnUEicIbDxov82rqiY2VylUZz4MwkdwaHkW2n0Ixq+wp7tfA5 x9Ef8P3FF5grvj/cACtkIvr/8YuvxUJ5ZrVVvUKvHnyF5p9RdlqcKhxMCvTwL2FBiduF C6zb/lcOm9AP7CMFcoVCVpXqbSHiJxjtD2BJXtfohgyvNfMLtcF1zb56BXx4XDHRgDVZ aQjWV9oX4BUOMoYG7UneUsmsybypsMtsTCH1ZLMXHvcYUcjXB9/OVyuD/fUiJvR/WO7o ZZtA== 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=ZiPCnMO76qB2BYRsvuFD+LhH0HMktcgnm3k8GmGktA0=; b=L0IUNf5GfZWoFFKHVEHI6u07O6XpZUfTYoAGk8XbSakrXp49gXH3MoHwKoFOmhNFe3 svqYav14ssZBpTnLtpvKZVuv+NikjT7todiEeMH+0/CgsJZDL4auHmCYxuVJt+1DAz/n 3bf7MQO94KBB0lsTbDWPZH8ter8pTUfw0VS10piLVxyTDaaw5Kvrv0fJMKQC1HCB6xCN 6i+T0sV3ZRb3jmCj4d785c32zi7EIDpX+hAJugHLjD+58OySzoBI8ZxZ3fOBcb9wvU4Z I6FLr7gmOyWbwFIf2vYv0ecTyHZ5zWWt19xUEc4VHrOua9eqD6OrSHmJfX3dVpDWETHY V5ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=gaQlY1Tp; 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 d8-20020a170903230800b001aaf5dcd774si3449468plh.173.2023.06.01.13.20.19; Thu, 01 Jun 2023 13:20:36 -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=gaQlY1Tp; 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 S232336AbjFAUT0 (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231883AbjFAUTF (ORCPT ); Thu, 1 Jun 2023 16:19:05 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9270318D; Thu, 1 Jun 2023 13: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=ZiPCnMO76qB2BYRsvuFD+LhH0HMktcgnm3k8GmGktA0=; b=gaQlY1Tpf826FLJhqZ0W/h8y3Y Q3pcsBMndgOTqToKTrhhmARqESXglDkRjHZogGUTT8eZAm4krxDGtMJbIhDTwZFrusXXAvICE6aTH VWndAG32nz4jnbEQDg/EZ0XEP+1NR1mDkswdczq99+Cp7LNbbMuY3vAJWKPMH279taXU=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol6-000686-8C; Thu, 01 Jun 2023 16:18:56 -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, 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: Thu, 1 Jun 2023 16:18:41 -0400 Message-Id: <20230601201844.3739926-7-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 6/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533011504313700?= X-GMAIL-MSGID: =?utf-8?q?1767533011504313700?= 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 ad6b9d613b33..2fa09baf28e3 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1340,9 +1340,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 Thu Jun 1 20:18:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591389vqr; Thu, 1 Jun 2023 13:21:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5n9qK+t0Fp7n4aghLR2FtJQ7jK1/+bDm8siNZdNGkMr6KFUzDTxDtL8Ke3vFvPdshRLgNM X-Received: by 2002:a05:6a20:3c92:b0:10c:ef7d:b0ca with SMTP id b18-20020a056a203c9200b0010cef7db0camr8901625pzj.15.1685650867945; Thu, 01 Jun 2023 13:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650867; cv=none; d=google.com; s=arc-20160816; b=0Wmw+26TTs3Slyi3yd9EWPBHznijjSJJ+JVTkomsb2MMwwoCvRhZsb+EEBen+h8NJX kwrcL4BXehbH7SpO3QzYiPSSOQp4RECTY4aqR75N90t83XsRm4rPLwI9CGiSB9DvEby2 lK95HrwNRlKHWlIOQKiDHD694xS6+D6r3yBTmaNdrJOB7i6Hlh7gdfPWWkcfJ12Zj+Vy Vnys2Oh5KTOm2J3SxnwnU500Roz8TLlqbrBJeql3e3Seo4Aqj77YuO6EFlT+TaZBgrB7 4JQKe+yR2Az/KlD/WRpNMMjj+74QBMY0r5u4gGxG4qhVdF31ecNM3QSNqceaOHzIeO0I Q+iA== 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=Z3WZIzncTr6MCeVd4lJqIf8LqUrhJSqs0YEKHbqWmt4=; b=SerR/DJQjunKl0kWRjWRhtXgKGC1gXJpu3OtQcTZ7H/Ba8hjosATT1g9kwqv083Aqu gRQmKXaROZVENuD9XsukXD7rB6XEqihmLGqXYZjK3hnJrXeb8j/q+KWgYCaVgXAJvEk6 QJb3jNsYDt0dzEp3bo1rp+g4ieqdSNZcjw7x2gx3ilvUDpJ90G7mas8zh8OKEvoO3MFz TI6TTM3USICrYlLzbeCgfnxunW+3ChCIOGhOgcKwZLflA7M6p/vupSiMqmB9D4yweRra iwkP91ESfA9h5XI6NLgVIQt3q2ClOw1oegb/fZOjF1FJMAVLdL+tPRHjqCVm3ztS/pt5 0sIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=ewTtSx28; 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 o25-20020a637319000000b0051b29733bc9si3168789pgc.715.2023.06.01.13.20.53; Thu, 01 Jun 2023 13:21: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=ewTtSx28; 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 S232210AbjFAUTa (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231917AbjFAUTF (ORCPT ); Thu, 1 Jun 2023 16:19:05 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 528B1199; Thu, 1 Jun 2023 13:19:04 -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=Z3WZIzncTr6MCeVd4lJqIf8LqUrhJSqs0YEKHbqWmt4=; b=ewTtSx280ca34pgvpp2dulWLc7 tRAP34fe2jcuK/B/hLKKkfJKRb4m1s8wqymlOMzXUOG8HCHapT7XHO8vAxD4DF0Ku9twvAxGjSnjC XP4Bn5aMMAaj7HGCSh96iLiIcI22f4/tBE5ygVg/8EOHXk3fJETPZhNxq3lmbKwak96Y=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol7-000686-K5; Thu, 01 Jun 2023 16:18:58 -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, 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: Thu, 1 Jun 2023 16:18:42 -0400 Message-Id: <20230601201844.3739926-8-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 7/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533044368778187?= X-GMAIL-MSGID: =?utf-8?q?1767533044368778187?= 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 2fa09baf28e3..388c1d490853 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1544,6 +1544,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 Thu Jun 1 20:18:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591167vqr; Thu, 1 Jun 2023 13:20:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7WgGE1MkKZeej0ksBjgOgF1dsfyBrx5APNtGqjqEeshj1GI5L/qU72mnoJWxltuBuPXlrQ X-Received: by 2002:a05:6358:2929:b0:123:99a:1778 with SMTP id y41-20020a056358292900b00123099a1778mr5187114rwb.10.1685650838566; Thu, 01 Jun 2023 13:20:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650838; cv=none; d=google.com; s=arc-20160816; b=EnQ9uSo6Lotm41uiGnNYpfES64qKoriV5YdebWEI11Pk7kaf3P3ZzlL3a5r8PMduO4 ZKCdkuOwwAWo/Rk/I0Pjj2IpnHVxvaDr/ieSScqqvZSSMnnurbtBJYp95sgrTYpfmlwz vdpmli9bxnfFcxPkVneqjOtq9va9NYFUMidyP+QbDJAXAb7sODmvosrFoIFZgmyxZfMu e9s8TrshBVcjryzkw+42wsWvqIVrjdoiB2ffs5hkAy/V4LKMkRPR5oyrQ0lCkU1sxXB6 xU++blGL3/W84/kPVvHIbaH/lSdL2LEhCukGZH/xn636ZQtwdAqqxlPEVgzMHGPg5urT MQ/g== 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=fISA+M83zRFEgKAdJUAq2HgGHBk9L99uymCON8uLsVo=; b=fTJQLVM2Q04uCivv8DoCK+eB/BvukgINLciGCFYDqOMEH7+67BaflgxdwO7wTlRuX4 NzUAvrMOQ948+rDoqaRVU5d9aQFpFaq/Kn5gxwhEyuR746FOylLdL6n44ShP8pBUXo54 bWScd8WkZLZK4ahZ1osJEmXe7U7zuIbYdV6/PfOEcqLCNi+kW4zVYkt26sn4dl7MprAf 4YxIFurCbWF9IACSoRInsbiSQsxLhURN1yuAUnTLLKQn0n7s1YJpwZdHT5LGY1CY/PKo ERAh2sEH4IuvZvhG1kZQQjrj7zoDG+owVxu1aB6Do9cVrbnVa0rVxD/RiTNkmEUgC1hd 7lnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=FYMQTKBj; 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 h4-20020a633844000000b0052c8d7a08a4si1501807pgn.8.2023.06.01.13.20.24; Thu, 01 Jun 2023 13:20:38 -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=FYMQTKBj; 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 S232084AbjFAUTV (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231856AbjFAUTF (ORCPT ); Thu, 1 Jun 2023 16:19:05 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C908189; Thu, 1 Jun 2023 13: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=fISA+M83zRFEgKAdJUAq2HgGHBk9L99uymCON8uLsVo=; b=FYMQTKBjoNVaDM9a+tAIAyrw1X mMUS0palNJwjZcR42ck977uBOFvJQDnK8jSByhkWjnwB3/LIiTWmoupP6Tv/D6PX+I6QeHlgurJDm Nq5qkKQd3KXYkmNnFhMYy8f35yiJk7ynfq1vLE8mGSVlb+GhU+3CJ/tMSmAjAjMtuUuQ=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4ol8-000686-Qz; Thu, 01 Jun 2023 16:18:59 -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, 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: Thu, 1 Jun 2023 16:18:43 -0400 Message-Id: <20230601201844.3739926-9-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 8/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533013547480143?= X-GMAIL-MSGID: =?utf-8?q?1767533013547480143?= 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 388c1d490853..9b2d58023c55 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1521,6 +1521,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 Thu Jun 1 20:18:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 102180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp591265vqr; Thu, 1 Jun 2023 13:20:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4++8a/DzwruUmE893DHwKHNFQsH8SWmYhIEgVDgnT6f+wh/QsWLANDidxQOR0lvXuFijP8 X-Received: by 2002:a05:6a20:4284:b0:10c:322:72d5 with SMTP id o4-20020a056a20428400b0010c032272d5mr3126016pzj.23.1685650853784; Thu, 01 Jun 2023 13:20:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685650853; cv=none; d=google.com; s=arc-20160816; b=s/LqRd0cEc2glpKhqUnQsM9W5OMOhfIhpWoztgaHcu+0iA5q3rGEKTmfsKWIfFr+Pw FdI+x64i193wVa4FrKTPMBHqSV9i6bUxQsn4OuDRPL6oyPydCPRTfY/0G0wA/xGaxup2 uDZnWxTB2y30x2zsaIjEHESgD0R4hj2dl+t6yqkeRFwSqGdPGFrS49kJOwqK6XGiz8GM divvgTUEiAnpgQKTMX88R8Fqm7bbIVzZwAkAnnhm3FHaErC/2cYr33AsWQ/e9BXuVKoq 3RYerwDM0nJpnlzzdvbRdvKB5WQohJ2YZidfLHIo/uN3fclmhlKh5zONmR6Wr3g9/se9 SMTg== 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=Vpxb2SEuweBhIUfqr9sMJSgr1YIceBLIzWJb0gIKyDM=; b=v4OBDQJY4CQpH9UC9ZuXjkvcy7VupfVQF76J12sYRsVYvNwH93Xv4nUtarLbZgPPmo eio1JcUiIEwXnp7QrublUH8bkd8boc5tJ7+yQ+BTvVZ/Y+HioRIjSzCKtL2bfUeuqZoA 6Yt9DEp8w5TrI2MRDD0xITaKDM1Wpg+WkqwvQSqMAKrrJHTCfnC9b8UrLZe7Rmyi8rTh vPBbvesfWeex5b3OPOouEJvSlz8AyUez0Nio4FuzE7GWuhSV/euLnJRk19M7Lv5Fzcxl 2wyZHn++0aiV+x4Ex9u1siyDKBtIWpen+l1i1qpHHnvMxMi5RhokPGLZ6MC3keZs+qBi 9uPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=BIUmMmAr; 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 b72-20020a63344b000000b0054290efc1d8si281523pga.504.2023.06.01.13.20.30; Thu, 01 Jun 2023 13:20:53 -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=BIUmMmAr; 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 S232250AbjFAUTk (ORCPT + 99 others); Thu, 1 Jun 2023 16:19:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232067AbjFAUTN (ORCPT ); Thu, 1 Jun 2023 16:19:13 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8436BD1; Thu, 1 Jun 2023 13:19:04 -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=Vpxb2SEuweBhIUfqr9sMJSgr1YIceBLIzWJb0gIKyDM=; b=BIUmMmAr9GatHdMUUcSz5PzXSd dsfinzY59MdfFVWTE+oEuxHNswWjlwG6DSsTg2Vmricbgb1eJeCzugwycHYrih9V0kTGraFAYXu4/ dh3Motr5UdhBFH1k6+PGsRZzOyK8uX7Xuf0skzZWwTmEyz0eZOdhJVQj5YCUWxPqGe3w=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:39204 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q4olA-000686-2c; Thu, 01 Jun 2023 16: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, 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: Thu, 1 Jun 2023 16:18:44 -0400 Message-Id: <20230601201844.3739926-10-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601201844.3739926-1-hugo@hugovil.com> References: <20230601201844.3739926-1-hugo@hugovil.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 70.80.174.168 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 autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v6 9/9] 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767533029740116224?= X-GMAIL-MSGID: =?utf-8?q?1767533029740116224?= 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 9b2d58023c55..59338f5ca180 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 */