From patchwork Mon May 29 14:07:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1545647vqr; Mon, 29 May 2023 07:13:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5hcOr0RLUs3Yc8WJyRbvT4TJhh0GcGvaAIT3TEMr+bkLLQME5f+WZ+yEAFSxrfOAEaQfc9 X-Received: by 2002:a17:90a:1283:b0:256:2efc:270e with SMTP id g3-20020a17090a128300b002562efc270emr11106050pja.5.1685369605134; Mon, 29 May 2023 07:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369605; cv=none; d=google.com; s=arc-20160816; b=gGT+1OwE6c4zIzehM3vDGA6U5DLyr9isDl1BYP9OexlmrgH3CVoGe/7eRrswHW/qs3 uAqyO43lX0UIgM9hhTgYmOjwTfmR7ZfBsVf12U9qsUMhIVoGOEbmzYhYLkckOxrKSg3r UEGOhJHw/B7srTRX2KmruwtslLVwOePP9C1AL9U29rWXte86ckwEW20jaoa2bbFaz9fI XdS2caMsaU5H029z8qsLj2znqZqFOmFDPhmNxSjmgj2gRFi/hVNCmHcwH5TENqWyOVuR kLaosGfEGxps6kn69NzjxH0uoBVQuU+MzfOofpVqFGW/8sPZyV48RTxOSSjCEAP9DO6H CJ6Q== 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=JjwtWGYCgdakg501584h93E/CCeikIpomzeTdJTVJDs=; b=iqQlgjh04kPnU32NrxrsFkwvgQjIcx4EVvmdYRG8vShoCAXDpGU4uYgftNw9VzNCdK xLuOiVaaiYkrM473nzk26W4DKrXNis0/2rSuYZ8PVmf8zLT6eGviFg3BuEr7rW/0IKac t75OzfvQ9tdAry8+aCpyV9FloQ5gW+x7gXrgHVjOv+8WR6xIEYjZ1EHE2q4ZP4m7kVTA cEaf6JuCEY8i/+F7WQ2z5YzVKsQAIsRm8wi+84YYgYpKHFapYiFsbA+0a/D4QtcVVIe1 jX6zbsmOBey/c0QpkC944gLrmqfW5tUG/dQ2T6pHWcdk4zKXE/vJR6SmVYIM3uid00e7 6hkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="Q4tVd/5D"; 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 x4-20020a17090abc8400b0024981e98175si1576557pjr.75.2023.05.29.07.13.13; Mon, 29 May 2023 07:13:25 -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="Q4tVd/5D"; 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 S230283AbjE2OHe (ORCPT + 99 others); Mon, 29 May 2023 10:07:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230248AbjE2OHd (ORCPT ); Mon, 29 May 2023 10:07:33 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1305A7; Mon, 29 May 2023 07:07:31 -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=JjwtWGYCgdakg501584h93E/CCeikIpomzeTdJTVJDs=; b=Q4tVd/5D0ZGOD6ETwfikevNU0u 0VJP8PAxuhUc/Lyiz1y0f5171T6OwnFWeUEBYAtsTafFME9qsRNhV5+1qf2T1nfw89ZkbpPAAer8J N6/eHoSM+FLvfq3mcwRI89KZwDPFCK7cYw6dvYc662K9KuAV9Qsq7eKT7/ce8KqF+twQ=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWp-0004Ht-6N; Mon, 29 May 2023 10:07:19 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:03 -0400 Message-Id: <20230529140711.896830-2-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 1/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?1767238118860614464?= X-GMAIL-MSGID: =?utf-8?q?1767238118860614464?= 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. Therefore mark IOCONTROL register as a volatile register. Signed-off-by: Hugo Villeneuve --- 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..fbaadec557d8 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 Mon May 29 14:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1557926vqr; Mon, 29 May 2023 07:32:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ779CgQu7sHqoKg4FsebIy+hErooSKFNsXci//3wJF3pBdtkZzPE8BbXgWcHWQv4P9QHYzP X-Received: by 2002:a05:6a00:2e13:b0:63f:120a:1dc3 with SMTP id fc19-20020a056a002e1300b0063f120a1dc3mr17332609pfb.0.1685370725085; Mon, 29 May 2023 07:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685370725; cv=none; d=google.com; s=arc-20160816; b=VtiPxu0IcUuPKStnTAUTOs5wC4K7wxPTyX+mYb+AkDEOUZ4u5Q18JHohSe8KbJ+Xfv 7KaHGZKk6ff0gegDVOdj9rr9sOWrX1f917Y+vaJT4WYzzD0Tn31ByipGBM0ySfZmfKZ+ vR2AGrxDDvriRaVu4zYkdoiYsfFkgqtUqCuRS9u8ZOr0u3qr4OnxfEIsWccKv0yjtalH K9gLDAyAfnbIqUJMkmICNS2XqUMCbLOOcsOehRIxpv6YizJD0Xke+zVrf6IVBEpJeOZH GIefbP8CUXMtKUVhJqg1+SbXLS0gRr3h2bjN8cNMXlyUiyUp5d2hgHqrxDKrdvBEcR1G Qa+w== 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=j06j0xxAnTBWbm+RR07Ahwjb4COk2ZLwxArCeTG3Zrw=; b=G5lHH/Bt32/3jsHW1EDboh2r6HqOiKObaTJwJS236+fGCPBih5vWsXkoxoCRcsUOgE tppyEuDpcQ6Bt4Xqh4+vhaq2JOo2SPtKhm+Oi53vQ6yFgT3ks3hcH4KmbqICSEYz7oex 4IjorI1E0CQICTftYPwykftiCEKRdhArVBj4P2+VkmXz3S8f70m89QZadizZ/Y3WPvV5 suUoRf0M/kdHgGzVsJs3v9bq9NaDCMEcWnk/Ls7KcPw4l5RH3Xmrtvtm1DA5oqBKMX++ 8JXERQiLjDSV7tCD/2db9A0WdxZ7cbf4oUtzRdAhG/rVIFivYg+kSbur8q0/LFDpk4OC hAog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="FK/zyz5j"; 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 k10-20020a637b4a000000b0052c9e45cb3fsi9528077pgn.384.2023.05.29.07.31.49; Mon, 29 May 2023 07:32:05 -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="FK/zyz5j"; 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 S230305AbjE2OHn (ORCPT + 99 others); Mon, 29 May 2023 10:07:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230273AbjE2OHe (ORCPT ); Mon, 29 May 2023 10:07:34 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23C20A8; Mon, 29 May 2023 07:07:31 -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=j06j0xxAnTBWbm+RR07Ahwjb4COk2ZLwxArCeTG3Zrw=; b=FK/zyz5jag1Oy1osJK5trnHLQv 131njOxu9Pw+MPoeXBq0qYCpBW3PXRcd9e3Z7NCv0VsWNC9MrLGzudi2cHD7qRONDOyFDp2Lgahi+ rP0ZOWekuepnjJtBIoqi+RyJczMdAHsE+EFprDPI1j0coDhQuM3JjfusJ/6WK/kzo8vI=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWq-0004Ht-Gu; Mon, 29 May 2023 10:07:21 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:04 -0400 Message-Id: <20230529140711.896830-3-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 2/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?1767239293530024705?= X-GMAIL-MSGID: =?utf-8?q?1767239293530024705?= From: Hugo Villeneuve Make sure we wait at least 3us before initiating communication with the device after reset. Signed-off-by: Hugo Villeneuve --- 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 fbaadec557d8..24c9336f6ab2 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1428,6 +1428,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 Mon May 29 14:07:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1554214vqr; Mon, 29 May 2023 07:26:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79yJBmmBor5YHfQdIZRL3AlPrzLoAuu5pimuWHolPZQMWbEnOOpRHqvWPG5uaT2N4OvIts X-Received: by 2002:a05:6a20:a110:b0:101:73a9:1683 with SMTP id q16-20020a056a20a11000b0010173a91683mr9511067pzk.33.1685370377545; Mon, 29 May 2023 07:26:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685370377; cv=none; d=google.com; s=arc-20160816; b=B5bMGyim2K7i/t/4WNK9DA2EmAdW7N0TkjG9iGQADYUescYXapMD6/4/ZfqKgegMuu BFyRsW3aTbKBWEM8hNKexOi9/aKq9qiGzvbBoekvzJaaT5izaPJ89Elg8g0GmIbLCBPd RL1DvGMl63yqmh2zIfLUqkf7grTSzGLUBP89usBq2o8Ei985JqdNQaJEHQf93QLf/Ing cwW8HapIMAWk+5Y75r1J2YoU8PJsTuQa3V+rE0biOCp1pb7Uq0+Hun0KBslsX+nW8oge hMzoTtP9VR2ImddaIC/eE0fFTLQEOwS6Yw0Ma4EVETNTFghhIXTGKbNJJKLI1rAv9gli PEmw== 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=pHysw7ljZh9N+tWRFFgX01/iKvbeS5p8bGDIrNtFgKs=; b=jinDeiW6SNNXA89CZ3WKTDYVo07NH6iH/wnzfpv1rbCGSLGFpoPYYGEUa6OeM+SGtC 5kB2eDud/yI0PqgNpGzMoYHoY8K4WWtVBVEIqKbh/KMS9zRyAtG4iJEXoyj0+jNSfI0H IABvNXlQlqJ2KwdDXIiSm/Uq2TN7AaT65ZKV2sr8VgUYIahagKZajbBF3V4CKI+5xMwT RZfPVBUhd1/OZlpKi78x1SMeEPNoD7N2cOzOq/SKoQg8cV5khU9L5XeFfx1HESR+AHVP +PpMnJ/eWlqkGJmTg5tbuEYCAnXBkrXdr49JaVT9YD/fgoZVS0aBIO7+kVI2rVuhDnnn G0ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=mExC7gWj; 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 p20-20020a637f54000000b0052c4e3dafa4si8680678pgn.395.2023.05.29.07.25.51; Mon, 29 May 2023 07:26:17 -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=mExC7gWj; 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 S229752AbjE2OHh (ORCPT + 99 others); Mon, 29 May 2023 10:07:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230257AbjE2OHd (ORCPT ); Mon, 29 May 2023 10:07:33 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC47BDC; Mon, 29 May 2023 07:07:31 -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=pHysw7ljZh9N+tWRFFgX01/iKvbeS5p8bGDIrNtFgKs=; b=mExC7gWjMc26KAtHRU5GO35bzk RoT9LIvgx6DyVzJQRWLebOsIZuGFWFxsQcx0bGDaS8VjcqOkXqQMc0c2/Dz8xrsXKf3mk0RZzvG0e 06x8IGaMCh6jLLkJ+bylJ52d97+Rhr0JWLgKISa6RLWaE6b5XrV/eIruqqqyikgmqpi8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWs-0004Ht-IY; Mon, 29 May 2023 10:07:24 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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?= Date: Mon, 29 May 2023 10:07:05 -0400 Message-Id: <20230529140711.896830-4-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 3/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?1767238928872083421?= X-GMAIL-MSGID: =?utf-8?q?1767238928872083421?= 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") Reviewed-by: Ilpo Järvinen Signed-off-by: Hugo Villeneuve --- 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 24c9336f6ab2..fdf18add1c49 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1443,6 +1443,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 Mon May 29 14:07:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1545841vqr; Mon, 29 May 2023 07:13:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ69O+HbH3xw0ZiJVDH1gIKDFgOSkJIu3EKPlMW4KYzK9pI+QqcJOAoH3NVEAaEMriExHtTI X-Received: by 2002:a17:902:ac97:b0:1af:fbb6:23b7 with SMTP id h23-20020a170902ac9700b001affbb623b7mr10363567plr.3.1685369619116; Mon, 29 May 2023 07:13:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369619; cv=none; d=google.com; s=arc-20160816; b=Lln8nbH9fj4wQesBFfJMORf/9Ydw3RLFpUYzKoEBcbiEJ3SZNgqYxJOrO7dzX4oWDn qGnlGz9e9IKBzGrtYMlB1hYQ1PNTCkG9/X8eRd1D9sLPGG4MX96G7eijT/7ly5pCxpAE 7xEb8jN3zO/yNoeRiP4ezaiDY7BkucXpE6qdM/31tuHAHAUeQ6fAiWTBjUbe56uBmi72 UiWGfFxl4k26lhQ5Ai37VgTmsXofVQTb7k0qoA8XI1NA3Y2kWPHPzj6uxPyOAKyUeLhh LJCJammhKc5VEIMZvaRmhSF0fI0UkMnkNKvP8GBTipWwPCYKvJx3Um7WPReIQz2j4KJo Cv6A== 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=Ja7xTMPsVPo8tfSr8w84gjwQWmZk45wAkgaQdbX9Sus=; b=TXsxWQMDkCFtcx+5zgmS83pNq1Qg9RLhKaTn04c2CiU/biGi/qyzSGsi3Cw0+gGVvw Gsod3Z6p3rROCBRW2ZAktjVTLNGYswtREX5qZNzC91L7SjmJ9u8GBMzfjwpcL9pUtYSj HafmE3yxm83a212PtEco2Ruj4hQV+0nnASKEMQzbmKz70LKpK/W9fv7C4XFCFP2G5ARE Le7BpSanq0RNGNtHbHJZf2bNaMOhVu7wpA/x2V0w8pgGcuYmHLpfMONrqH8UyYws4+VX Cjrm1elFmm0x6liTUuU7B3qPyFwuFAxeyktveByqv7T7qdi3SID0bTgso+Jm8yRE/19K p+ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=TiMjtby+; 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 j12-20020a170903024c00b001aaeed1a0e3si389331plh.487.2023.05.29.07.13.26; Mon, 29 May 2023 07:13:39 -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=TiMjtby+; 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 S230340AbjE2OH7 (ORCPT + 99 others); Mon, 29 May 2023 10:07:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbjE2OHg (ORCPT ); Mon, 29 May 2023 10:07:36 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35403D2; Mon, 29 May 2023 07:07:33 -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=Ja7xTMPsVPo8tfSr8w84gjwQWmZk45wAkgaQdbX9Sus=; b=TiMjtby+69WZNStXM0ZQQPT3f4 3dc9H2kA++rCAAKbeEDiY5Lkr/zVQT8/UkKY61gnhaLGx9GlIid6JJ8nonc8sMgYZmfi6oqFcw1JA /uByz1zhiyMXV+rFvLOn4GFOh1FLyEXVaWWYAO7LULeM7zaz0FXaGT4Ub8Xa0gxbQTRQ=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWv-0004Ht-1e; Mon, 29 May 2023 10:07:25 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:06 -0400 Message-Id: <20230529140711.896830-5-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 4/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?1767238133846512638?= X-GMAIL-MSGID: =?utf-8?q?1767238133846512638?= 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") Signed-off-by: Hugo Villeneuve --- 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 fdf18add1c49..06be1daa733a 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1343,9 +1343,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 Mon May 29 14:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1556424vqr; Mon, 29 May 2023 07:30:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5EdrGQKcvIH36OZgKgCzd7/Xr3R0TceWr6K1m2U1YGO81n882jECIzEsyTqCnaXjIuJIOk X-Received: by 2002:a05:6a00:1a8e:b0:64b:f03b:2642 with SMTP id e14-20020a056a001a8e00b0064bf03b2642mr14100542pfv.23.1685370600755; Mon, 29 May 2023 07:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685370600; cv=none; d=google.com; s=arc-20160816; b=wMMAVf3Y8iHED43n0nGh5aQlFhMfmk4BPFFqVt3Gk2fCFg5iCLZc/hta0t+1OTxcmh KwPJodYx6dTOpgj8zqHA61JjdYrn1MQWSmseonDgE2LH7HrBQd39sUWehaftO/ogf4jd OgxIHqDFUvUNT26paviKr9jDiaWl3mh2mfvN3opKrv+PrfVqPo+tWXoqhqo6fXqgqvmA Cng3TpZjEdTTIBneTc10X+4650Y39PxjQz7stRXBryRUF2PlPcECGlicQ1YZCqh2M7I8 6wESbOlGDy7+UG7FqOdogqVNrGp5xXG6b+9fAXL4LZ7AU90XAVu9wgCDvYJGAsGdU8um +QEQ== 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=fnoPVvoDbKnCVpqeYuYhmBuue3U9tzCbLMDvkdsYgMQ=; b=Hjf2ekPuM4+JG2LyGqXjHo5aYnnADszpC3DtcAJWksR+Rd7+7Kt/jKCY1hrDqfAOIf +NQweugEa3HnUtH2rgaEjtSQhqM6XpD24Yf9a+sT8rRmE11iYVLbxfMknX20tdjrTg8k gWhk+DpubXetbKl3Zq/RafuHlfaLvOCg8tiOZ7lZAz4wJccpFz+nIBR/pGvAolRj9ju+ KUDTPVHi1/MZAA95oOFvAUbNlti5myknSAuCBjoUJX5bjBWFq3w9wmZhBg723fS9xK9u yTe6nwcegfiGUGppoD6SCbaUTLv5GHAydVlDvq70DD1MfOJdZqM2eXcGBYDbxwKZWQsB JDUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=FzPd29W+; 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 a18-20020a637f12000000b0053f0d8ac4b0si9226419pgd.825.2023.05.29.07.29.46; Mon, 29 May 2023 07:30:00 -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=FzPd29W+; 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 S230292AbjE2OIC (ORCPT + 99 others); Mon, 29 May 2023 10:08:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbjE2OHg (ORCPT ); Mon, 29 May 2023 10:07:36 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 479B09C; Mon, 29 May 2023 07:07:34 -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=fnoPVvoDbKnCVpqeYuYhmBuue3U9tzCbLMDvkdsYgMQ=; b=FzPd29W+ywwYVBGyiO7mWWQy6b 35Aiu8D2x6oD1ZE0zZm8Vl2X+yYmjMOAcsteugL71v94nwDkFIQf86LyHelRPgwUGoIr5qnQ26vH9 +WGN+4Q1kMogtpqOmQUeP8WOb3X7uVq8Tb8Ob3XDlL+HcELGWwp+Wx9MJPHA86Ll2kG8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWw-0004Ht-KH; Mon, 29 May 2023 10:07:28 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:07 -0400 Message-Id: <20230529140711.896830-6-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 5/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?1767239163185232227?= X-GMAIL-MSGID: =?utf-8?q?1767239163185232227?= From: Hugo Villeneuve In preparation for patch to fix GPIO regression. To facilitate review and make code more modular. Signed-off-by: Hugo Villeneuve --- 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 06be1daa733a..7a993add3f04 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1358,6 +1358,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 = { @@ -1517,22 +1537,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, mctrl_mask); + if (ret) + goto out_thread; #endif /* From patchwork Mon May 29 14:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1545886vqr; Mon, 29 May 2023 07:13:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6gl4OQSmvXNcvpwhNl8Fy5mOHofPWNbQDzQRhzQeRMV+9yakXCnoMfjfap/RgxtiCT10kp X-Received: by 2002:a05:6a20:4406:b0:105:53:991 with SMTP id ce6-20020a056a20440600b0010500530991mr11161922pzb.0.1685369622519; Mon, 29 May 2023 07:13:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369622; cv=none; d=google.com; s=arc-20160816; b=PqjRmc42UK6y7TXOdcujxC+K87gcG/U1WRZujeM+1eTv8pt59OmBjFFIbD9gN1l4vS 2ZnX87+SPRLnloOmAPc+VrXhpDvV+OEZJwwAFyPHXn/a/CENB73rkEMV4/7l1YJQNt4K K3KYgFXyK0rSntuhnwlUXq++RrsXCX9smsqvKkkKWItuGzAZrPWD8B/a5B7UgGkY96Jy b0ydOgAlqi01TzOGOj3n3aJPXeqAliCv9HUMWEFwFi7c6QgG+9umQOfYVnrvylKbzOX8 H1X87qLlS30n4UVBCTuyWHcSzIqoXKOPrYW8EufC/y/xOopAE3tUVLe9mlqCzr0QUCoj MKKQ== 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=2DqpomnNRfiIUofIOKhW7Ekx3g5xp5pGoKMlORViQNc=; b=ffn+HKZea6ucJzrSBFP0uKM13F31TDe/Y+cC1tnaGTC35mPCwUN0HeaOOk33lqy3F8 Wl+I1Oqa7hsV8xarcHMVy99g+DjLa958x4m1yxi9b376RQVx/DsL5Z4oRqexmncLegH4 EmkpHc6PqoHG4hQgjBp2tICO6CicYoF4X4fnJRBdZPQaz13t6Gcld6/BwkR9PUS2WJiZ Gki+KP4Dg72MdOqU7u1oSby24ibpQ2Uqr7ZVu54Fkq/RjTOu4vv6ddzTbgyhxzBuGqB+ rqJ8VlT8Cq1IGhUW4cLrHv2sr336xfrfusKNg5CgKyB5QSSzdwBQdZjVZOIUSeHNdsv3 7C6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="0IceE/ix"; 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 k7-20020a635607000000b0053028c29b4dsi8385688pgb.92.2023.05.29.07.13.30; Mon, 29 May 2023 07:13: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="0IceE/ix"; 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 S230356AbjE2OIF (ORCPT + 99 others); Mon, 29 May 2023 10:08:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbjE2OHo (ORCPT ); Mon, 29 May 2023 10:07:44 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF9BDE4; Mon, 29 May 2023 07:07:36 -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=2DqpomnNRfiIUofIOKhW7Ekx3g5xp5pGoKMlORViQNc=; b=0IceE/ixk+iTk4GM2Ghqy9GCFm x7HX+VQupJQNuoAjxHgI7HNWI26KBA+tlvHE+0V3ioxeb6wiscB2pe2jbauEIpeA5hr8EgUu8soI1 8jatERhK7uXlgrCB91i+o6+fQVmeKPCi4nYLg14Mil14jynBgn22jyeQFYty4uoBpbzI=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dWy-0004Ht-Ro; Mon, 29 May 2023 10:07:30 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:08 -0400 Message-Id: <20230529140711.896830-7-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 6/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?1767238136934177227?= X-GMAIL-MSGID: =?utf-8?q?1767238136934177227?= 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. Signed-off-by: Hugo Villeneuve Acked-by: Conor Dooley --- .../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..74dfbbf7b2cb 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@54 { + compatible = "nxp,sc16is752"; + reg = <0x54>; + 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@0 { + compatible = "nxp,sc16is752"; + reg = <0>; + 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@0 { + compatible = "nxp,sc16is752"; + reg = <0>; + 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 Mon May 29 14:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1545920vqr; Mon, 29 May 2023 07:13:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ52dcT0H12kTueBOZLHa/DHFsO+TJRjgZp690JC/+R0igpTTjvMJYLzULjj2OIenBUmSz3t X-Received: by 2002:a17:903:32c8:b0:1af:aa36:14 with SMTP id i8-20020a17090332c800b001afaa360014mr13452190plr.11.1685369625392; Mon, 29 May 2023 07:13:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369625; cv=none; d=google.com; s=arc-20160816; b=HqPUZh/DrXrs1BeMCRWTjXy9ijPfw/gY5GvJV/mrf5om2lclc+HXCzVV/gX9KcZikT JwdDUzRz71BBD3cc5vrXGjJ+R1MWtyGnxfeiOd6qgI1f2n2Gn7wkGtTnDvWhXge3H053 tmthtb1XD08F+i/VHy/OeuA5Y7bnlPxesqigMhIt/ZAQ5VuxLv0LxsakisUqwn6U3NuL 79ilVeCZ07dbQkSVYNK77orpROKpviqgn0bRTkpkTnGSSZ8TRIHoTYr0iD9ZuaQ2CFQe tRUSgqTxuk/QvD49VNlZ41PvpvzTLqSw5N6NEgUnFm6rH288Du3/J7ioLl326BAgOATY a/Hg== 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=VMqTekeBuwHnutyixh5JvciqIBaAG1xicaZK9g7qLy0=; b=KHRj8uJabL9o2dLpyYbo+rHvUqEzxM7RyX19fmfJZnMRfp+caL7spFuP6Xh+VESoPg 6e9g70olu9rvqG6ZojoKlnK31R7ATqCx9vW/8H8j+eFLhmaXNadvfgR9XjboJieHA7q4 QHZtf0q9TFTwkWRf1BkKAXu3xQ8Z3Mg4yDSETxrL9EbGVuVXS1XA8auJDsE+J+T2xt6D bdk4Vl+yZlYMH9wBEuDz+zEOZaNtYe+Tk/jzS5ewLD8dvXEUhvTqEqtndbrtdjODrFEB LA8b6UdANKNEIhgRHcmncZJ+vSQK75nqmEc811v7mGkEBQWwMATB8QKeiuOE7cKADdx3 qJgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=R6vrE+PZ; 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 k8-20020a170902760800b001ab115a868esi9321127pll.49.2023.05.29.07.13.33; Mon, 29 May 2023 07:13:45 -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=R6vrE+PZ; 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 S229669AbjE2OIQ (ORCPT + 99 others); Mon, 29 May 2023 10:08:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230315AbjE2OH6 (ORCPT ); Mon, 29 May 2023 10:07:58 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33DE7121; Mon, 29 May 2023 07:07:41 -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=VMqTekeBuwHnutyixh5JvciqIBaAG1xicaZK9g7qLy0=; b=R6vrE+PZSl2amBujeGE6R+6d1P vm2OxmIe6DZhbMaA4SWS0FqX4EYzxS9yv6gQM/4p6KyeEr2q15y1/tB800B13wlDNn7P+1HkX+2Gd cWdx5IqxKyRQUfU4tTQX0CGqFm/5j0ztx+TVukfuo0cS9PIqMr+09VBLqMMt9YIZxfW8=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dX1-0004Ht-HJ; Mon, 29 May 2023 10:07:34 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:09 -0400 Message-Id: <20230529140711.896830-8-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 7/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?1767238140305470044?= X-GMAIL-MSGID: =?utf-8?q?1767238140305470044?= 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") Signed-off-by: Hugo Villeneuve Reviewed-by: Ilpo Järvinen --- drivers/tty/serial/sc16is7xx.c | 82 +++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 7a993add3f04..34739b31b44b 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) @@ -1359,16 +1356,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 = 0xFF; + break; + case SC16IS7XX_IOCONTROL_MODEM_A_BIT: + s->gpio_valid_mask = 0x0F; + break; + case SC16IS7XX_IOCONTROL_MODEM_B_BIT: + s->gpio_valid_mask = 0xF0; + 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; @@ -1392,6 +1418,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; @@ -1493,12 +1520,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); @@ -1534,6 +1555,27 @@ static int sc16is7xx_probe(struct device *dev, prop, p, u) if (u < devtype->nr_uart) s->p[u].irda_mode = true; + + of_property_for_each_u32(dev->of_node, "nxp,modem-control-line-ports", + prop, p, u) { + if (u >= devtype->nr_uart) + continue; + + /* Use GPIO lines as modem control lines */ + if (u == 0) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_A_BIT; + else if (u == 1) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_B_BIT; + } + + if (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); + } } #ifdef CONFIG_GPIOLIB @@ -1562,7 +1604,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: @@ -1588,7 +1630,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 Mon May 29 14:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1546054vqr; Mon, 29 May 2023 07:13:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ71TT+QxjD2SHmEuAv9aJYPNWQUZwfrzW4JbyTEa1+iXH6P2EpMNutkJbdGyQccnjCnilne X-Received: by 2002:a17:90a:d783:b0:253:86ed:9b0e with SMTP id z3-20020a17090ad78300b0025386ed9b0emr9590933pju.42.1685369639585; Mon, 29 May 2023 07:13:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369639; cv=none; d=google.com; s=arc-20160816; b=El6mIqpv4yN1uHRSrikSbwoDDNlcXQG9CzjCREWHgDxOSa4NPyNdoXIUALKib408Ua cw9CesAhiiSTGeYat5xkeymxEU8jzdApnLIUvgzu8nePBj+uE90QPj0hci8WS7upZ0pi n73UmkeNSLdveVrRV133WygvMe9Dbzkq5+0uZricWMEJQCA7fr3YIQPzz34rLAwO2HIL QW7q03BppfiSaxqqsY39p1g8laxz/g+wS/Jbxs3fHKRBfDQn568xsnSuqhS/IF+0sV8Q toaCWiJPD57IG4Q+neGBu8tkK8f7iGyOEWR7RMfNbQA5CYBfZ4eJE5CXfGNTWuUcSiTu WmUg== 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=fc4FhhujNpwaqbn8hNhuyb4eRPa/1T5Kc38omDT24E8=; b=iUj5OdrJPNFRuxizhmYLJp831lFP+0fchn8egrZPJisNMmkq7w+NYcohOfb/mvWwjj H81itAmkSEOh6LYGGPSkwgRIRAt3SajmdKWOQrUdyJiDScCGtK+TEWNBNWznawPO7yd2 97MXUOhw5Ns2AGs7fxBcFlLjAU92zeRRhyZLMOKXeHePAw4SjldtPY7xIVoNnVt8Jke4 hhOCU57gkDjgVbFAt2firM0FLGSjhtoE/p5CdN92YIscjoIWjL7mTBVY7javEvv6XVb/ 9+1Yrc08UvH1NoFEkfb5wU1tbs6rDNdi/1dcO6yX0a87rKxazZ4wmXJ45VsJSzbBmbfo wDuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=CEdfqXUy; 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 g6-20020a17090a714600b00250366a3a83si9392026pjs.188.2023.05.29.07.13.47; Mon, 29 May 2023 07:13:59 -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=CEdfqXUy; 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 S230345AbjE2OIS (ORCPT + 99 others); Mon, 29 May 2023 10:08:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbjE2OH7 (ORCPT ); Mon, 29 May 2023 10:07:59 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E19E212A; Mon, 29 May 2023 07:07:42 -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=fc4FhhujNpwaqbn8hNhuyb4eRPa/1T5Kc38omDT24E8=; b=CEdfqXUyP58G/d5VWU4r+OLwDb HmIyUfNkMT81zJuJxXOQ1Q1fcwq4HwGUez9ovSOfMpuGp20WeK6jOYrY1hHVIuzjUZSDMlbDrTo7n dN/1nLOMLBMHb/tynStuFkZcbkTEF9AxwejIDooH64PSLKxIo0HYDIiIMBchJywN9tFc=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dX4-0004Ht-UK; Mon, 29 May 2023 10:07:35 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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?= Date: Mon, 29 May 2023 10:07:10 -0400 Message-Id: <20230529140711.896830-9-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 8/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?1767238155402176502?= X-GMAIL-MSGID: =?utf-8?q?1767238155402176502?= From: Hugo Villeneuve Add call to uart_get_rs485_mode() to probe for RS485 flags and properties from device tree. Reviewed-by: Ilpo Järvinen Signed-off-by: Hugo Villeneuve --- 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 34739b31b44b..b305142e9e9c 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1513,6 +1513,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 Mon May 29 14:07:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 100304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1546935vqr; Mon, 29 May 2023 07:15:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5n7YCFcOEkc8fXym9Ea1B1eNvMA39NVoDjnxQuyNp5zY2Gmcqtd1gkIBcG7eaSACm3o1ta X-Received: by 2002:a05:6a20:5483:b0:104:a096:6ac7 with SMTP id i3-20020a056a20548300b00104a0966ac7mr10549527pzk.34.1685369712119; Mon, 29 May 2023 07:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685369712; cv=none; d=google.com; s=arc-20160816; b=qR/aYZJHoEz4ciCKsepQjkHBmDhOJeX08a+Z5Xt1OoFz4Ae2k10maDSIV9WhPESVuX VXswPpdXOKAhIrdlcEpl77g3SJWwQ1DLyIOODSm7/0L/l2a1RJesqruV7AVPMqcsv3pQ AM0YXYqMaVDZTeGDz4EMbeX6pL0oGADVx6/NE7P3hCk/8nhJnGIzNqP+2EKv5+pgQHJv YJkdgfKR0hek5GJAnlnhiFjdm7QWVu+Ncotknue8spDHdjqsvg9tJIQJCdGluOe8/ioE j3iS4srwxBGXDtfMXqi9hxE/4p6fXKvK8txZq1RuQQMdylLDthpaOGGzJnkQCH4KGqtD gmKg== 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=eViYZe+Ah3bMzoqPJTZMHhlx0pFo2OQ13wBWpQz/RHg=; b=OJYG33FiHOFE7A7gVKJoS7iuA4IYc/hJYRDtGLZfvJaPoqYdfQ1NSSYeW3nDfHjyW7 kpdPw4J+gF+8of9xe2EeagFZOTkzgrFwDwsFhSV2TbXUs2oY/6qNUVqPSjdmOZcs1deI IDggVodj/DpAwwx6d/aIs75Mdc2lSZtTAnejFwG7OJ2cQdz3qitP0lsQJ731tSit68Ub KPGRNyTLw8Gt3on7OaaLTrGNogS6ljLkNQda0ohQNw+UbL2oStbuUkwmTI+wwSou4aNn +iDrGBJNopLP/COqDAEvxMOA2i/RFZvpR8GqrmFloc2rvwGVHZspPxPuXbBofs/y6tie xYZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b="uA/zR+N+"; 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 g8-20020a636b08000000b005321c340960si9511905pgc.811.2023.05.29.07.14.59; Mon, 29 May 2023 07:15: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="uA/zR+N+"; 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 S230431AbjE2OIZ (ORCPT + 99 others); Mon, 29 May 2023 10:08:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230344AbjE2OH7 (ORCPT ); Mon, 29 May 2023 10:07:59 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77D97134; Mon, 29 May 2023 07:07:43 -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=eViYZe+Ah3bMzoqPJTZMHhlx0pFo2OQ13wBWpQz/RHg=; b=uA/zR+N++Ul4/VnzHOvS4UDWPs zWS4FJzo+SIbtKfyEVaV6o4GRBg01yr8eg2270DqF/Pj44xPU8O29N5KHsBAMREPOI+vyxQQhmw0D CniMppBGhakD1e6JBme5PkqwbTBcz6mH8VQNanSnMcnYPRjWKjQrULhaGOKFGhrEmQcE=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:50024 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1q3dX6-0004Ht-Hh; Mon, 29 May 2023 10:07:38 -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, l.perczak@camlintechnologies.com, tomasz.mon@camlingroup.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 Date: Mon, 29 May 2023 10:07:11 -0400 Message-Id: <20230529140711.896830-10-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230529140711.896830-1-hugo@hugovil.com> References: <20230529140711.896830-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 v4 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?1767238231124906522?= X-GMAIL-MSGID: =?utf-8?q?1767238231124906522?= 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 --- 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 b305142e9e9c..5e86d77e1229 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 */