From patchwork Wed Sep 20 15:20:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugo Villeneuve X-Patchwork-Id: 142527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4285553vqi; Wed, 20 Sep 2023 10:01:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUXeRNXxkbNdZsTrmEg+FzQUNR3Bl9fRAW5LrOuDXFROH5A6VlJzeCywjYuajB2kqmm0Oa X-Received: by 2002:a05:6358:9913:b0:143:3845:e6fb with SMTP id w19-20020a056358991300b001433845e6fbmr3901331rwa.27.1695229289136; Wed, 20 Sep 2023 10:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695229289; cv=none; d=google.com; s=arc-20160816; b=T/sDJGHqE3HlkPNulxkB5uzs/fVYLTtvT6dtTvzKxe1Y6QJV7PDgeOhYQv83gS/yWZ Vg4mZZyw8VuOYHGTyjbmd1aq9VO/GA8RqI/T/jST59cdULJLrguEMoOpZLTZHP4K3ori 5Rv1LDdD+heALK1PgiRyFCCzSOuClxb+lY4GIobWbvYP6i3NdpexOS21vPVzX4h9Ct/s 4qSjRtcMFxcacBXscZwauMLH1nf21Qr2H16OzspbMSYNKYXrzBkeQlWQ7QmurYrBzKT8 mN3pGK3uKORt+Ko65NHP5ZRLcdhPEyUQ0Pbfcas9u/tj3JoHA5HG3/1nnsjVuGi1bDU+ xVgw== 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=r8HOyZrFylpADN6kIAcsYM4Dj9Wj63S1uN+Rn+MZbHU=; fh=VMCZnIQaCU4pkoBwVmskDKaTUsCNxL1ek+dzim0+uzY=; b=A7kECKVpt53iCB3sDP9enZy4Ly95tQn/0dD7MegDUNxwicw2nRagRSyVFIEz5a1BSx otNsXjcNFnwZfmwAfgxDON0V0LfwSr7Zu5Y9VS2ywBe/quDtNkJBuhV4NKnQDzXbAKmA zY2a5ikwpREPjyxqP+4hnteB2Aw/LosEQChzgBoGS/QYiZpVkbYOD+5yHEzwKrDuQfD7 D/HO39l6haihxvxEcHMVPIz2BD3C9Q9UuNRdhwoAmphobPzMTZLipbBDHDwXOExQqsE/ 8fl6nSQXKy0AckB4QbmXWQgTgFPBUdCMB0gEyvYKMCJ9+VAiIhVNp94UrkrX5FaYAEo2 175A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hugovil.com header.s=x header.b=qChrI1ss; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 195-20020a6300cc000000b00565f76f86d8si12013523pga.818.2023.09.20.10.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 10:01:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@hugovil.com header.s=x header.b=qChrI1ss; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2F29E8033DE4; Wed, 20 Sep 2023 08:20:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235429AbjITPUk (ORCPT + 27 others); Wed, 20 Sep 2023 11:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235376AbjITPUa (ORCPT ); Wed, 20 Sep 2023 11:20:30 -0400 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D73E1A3; Wed, 20 Sep 2023 08:20:22 -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:Message-Id:Date:Cc:To :From:subject:date:message-id:reply-to; bh=r8HOyZrFylpADN6kIAcsYM4Dj9Wj63S1uN+Rn+MZbHU=; b=qChrI1ssVNXGOANauihMgDmiJR 40kdHfuVJaerR3Bj1PgbADwQXjm517yN/tQU7VyRf09dAwZ5i4FZqIonDgvKf8wjKw5KXMcKvP4E6 4j/7HuqMMHD5jJq3RG1IeSVg54KXEb0EVlDmIqFG8SLfeXDJfZ9tOxGSrz+UJBwXfkoY=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:43190 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from ) id 1qiyzz-0008Co-Hk; Wed, 20 Sep 2023 11:20:20 -0400 From: Hugo Villeneuve To: gregkh@linuxfoundation.org, jirislaby@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, hvilleneuve@dimonoff.com Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, hugo@hugovil.com Date: Wed, 20 Sep 2023 11:20:13 -0400 Message-Id: <20230920152015.1376838-3-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230920152015.1376838-1-hugo@hugovil.com> References: <20230920152015.1376838-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 agentk.vger.email X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Subject: [PATCH 2/4] serial: sc16is7xx: recognize "nxp,irda-mode-ports" DT property 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 20 Sep 2023 08:20:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777576747292923374 X-GMAIL-MSGID: 1777576747292923374 From: Hugo Villeneuve Vendor prefix "nxp," will be added in an upcoming commit to DT binding property "irda-mode-ports". Prepare to recognize this new property "nxp,irda-mode-ports" and retain backward compatibility with old DTBs by falling back to "irda-mode-ports" when needed. Signed-off-by: Hugo Villeneuve --- drivers/tty/serial/sc16is7xx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index db2bb1c0d36c..b0154e901358 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1415,13 +1415,19 @@ static void sc16is7xx_setup_irda_ports(struct sc16is7xx_port *s) int count; u32 irda_port[2]; struct device *dev = s->p[0].port.dev; + const char *prop_name = "nxp,irda-mode-ports"; + + count = device_property_count_u32(dev, prop_name); + if (count < 0) { + /* For backward compatibility with old DTBs. */ + prop_name = "irda-mode-ports"; + count = device_property_count_u32(dev, prop_name); + } - count = device_property_count_u32(dev, "irda-mode-ports"); if (count < 0 || count > ARRAY_SIZE(irda_port)) return; - ret = device_property_read_u32_array(dev, "irda-mode-ports", - irda_port, count); + ret = device_property_read_u32_array(dev, prop_name, irda_port, count); if (ret) return;