From patchwork Mon Nov 7 20:49:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 16705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2297512wru; Mon, 7 Nov 2022 13:10:29 -0800 (PST) X-Google-Smtp-Source: AMsMyM6RR/HsYUy8C8j8pv6NFFFxndqlQp7jP9TTj6DwV34IAJopgqJjHy0ISdg46FF9dVV6eEfO X-Received: by 2002:a17:902:c14d:b0:187:337b:ad9c with SMTP id 13-20020a170902c14d00b00187337bad9cmr38382478plj.35.1667855429280; Mon, 07 Nov 2022 13:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667855429; cv=none; d=google.com; s=arc-20160816; b=VvHqm9Do3TuPLEXeJRJaD55IFDuH0L2XgyxUs/ItkcPq6hw3s4HMh5YAk5kfTsg+hG SrQlblPW2CToeG7LEldb1eSMrkSaGGmyVk3m7mECQp8g24SC2QCYfnG1qUpvghz4xdxd shH26xEq8IFcVnJNP4+0OCDbFOXLAN0S65rVvKfdI4WE2390GAiFUdbeNUEcXfCpBkyw MS4TLDMGmc6hRy91R3kzu+ZK7chgDufGn3wnvEip/K9Xpd3xeYfKEalE8QEVT30yzCaP nF4ZwHm3JiT1Cu/Br2LQfpV9YOFIgcu63j4BWtATtifRMM/dFcZ4Pcfp0CEcgCZV4BaG Gueg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9pc+uO48qTRseDpObedSM5lSyDBxNyFglvKX03R3tfE=; b=dE7ozqi2clJnwR3q5RTreC7DEflFQannWOMj8j7MdhcqhNHS5k21HhL7Chq5WEO/jZ iDDHmzmqjDkS/LVqKdCIpLedzTQIlZMgffb+4W7LGheJIt7zDOPBfSOeXBJCnDcwnBwy GHQzqyrJWL7sgLqNzyIenY3XI8mdPaLQn+JuHPvfK/QMo+F15MPa9kw3I3KXub2UDkm5 MRR9ISNicRQOK3aLISGYWbHa7BijmAVfOmcmxb019pnNYc0nWZH35fVAX86knezjt+dZ erRboxo65G7YELEf/x+KxXea7octB3xWEEK7YrFL3mdvweeKgD/rGt4f2apbt4nBjWJ5 3crA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baikalelectronics.ru header.s=post header.b="gN8I/UNN"; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=baikalelectronics.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d14-20020a63734e000000b0043bd8452080si12039232pgn.313.2022.11.07.13.10.16; Mon, 07 Nov 2022 13:10:29 -0800 (PST) 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=pass header.i=@baikalelectronics.ru header.s=post header.b="gN8I/UNN"; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=baikalelectronics.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233269AbiKGVJP (ORCPT + 99 others); Mon, 7 Nov 2022 16:09:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233331AbiKGVIp (ORCPT ); Mon, 7 Nov 2022 16:08:45 -0500 Received: from post.baikalelectronics.com (post.baikalelectronics.com [213.79.110.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DC41631F8E; Mon, 7 Nov 2022 13:06:38 -0800 (PST) Received: from post.baikalelectronics.com (localhost.localdomain [127.0.0.1]) by post.baikalelectronics.com (Proxmox) with ESMTP id C6F5BE0EAF; Mon, 7 Nov 2022 23:50:05 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= baikalelectronics.ru; h=cc:cc:content-transfer-encoding :content-type:content-type:date:from:from:in-reply-to:message-id :mime-version:references:reply-to:subject:subject:to:to; s=post; bh=9pc+uO48qTRseDpObedSM5lSyDBxNyFglvKX03R3tfE=; b=gN8I/UNNp+vw qhbj2WZ2tAJbeh9zVaTbvrt9c4+8dVPheNT5jycKAMrU1sDkDJ1ugppObQhITR2L IJAuijbeqbdRTbIgULFDzccnkfbMeV/9PSE4lyAa6gw9opgmbaA0ipwRx+l5Mo7Z ZDanD9X23wyzmlGOkji52MskxNRxqQ0= Received: from mail.baikal.int (mail.baikal.int [192.168.51.25]) by post.baikalelectronics.com (Proxmox) with ESMTP id B7224E0E1D; Mon, 7 Nov 2022 23:50:05 +0300 (MSK) Received: from localhost (192.168.168.10) by mail (192.168.51.25) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 7 Nov 2022 23:50:05 +0300 From: Serge Semin To: Rob Herring , Rob Herring , Krzysztof Kozlowski , Bjorn Helgaas , Lorenzo Pieralisi , Cai Huoqing , Robin Murphy , Jingoo Han , Gustavo Pimentel , Richard Zhu , Lucas Stach , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team CC: Serge Semin , Serge Semin , Alexey Malahov , Pavel Parkhomenko , =?utf-8?q?Krzys?= =?utf-8?q?ztof_Wilczy=C5=84ski?= , Frank Li , Manivannan Sadhasivam , caihuoqing , Vinod Koul , , , , Alexander Stein , Subject: [PATCH v6 01/20] dt-bindings: imx6q-pcie: Fix clock names for imx6sx and imx8mq Date: Mon, 7 Nov 2022 23:49:15 +0300 Message-ID: <20221107204934.32655-2-Sergey.Semin@baikalelectronics.ru> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221107204934.32655-1-Sergey.Semin@baikalelectronics.ru> References: <20221107204934.32655-1-Sergey.Semin@baikalelectronics.ru> MIME-Version: 1.0 X-Originating-IP: [192.168.168.10] X-ClientProxiedBy: MAIL.baikal.int (192.168.51.25) To mail (192.168.51.25) 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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?1748873174699724024?= X-GMAIL-MSGID: =?utf-8?q?1748873174699724024?= Originally as it was defined the legacy bindings the pcie_inbound_axi and pcie_aux clock names were supposed to be used in the fsl,imx6sx-pcie and fsl,imx8mq-pcie devices respectively. But the bindings conversion has been incorrectly so now the fourth clock name is defined as "pcie_inbound_axi for imx6sx-pcie, pcie_aux for imx8mq-pcie", which is completely wrong. Let's fix that by conditionally apply the clock-names constraints based on the compatible string content. Fixes: 751ca492f131 ("dt-bindings: PCI: imx6: convert the imx pcie controller to dtschema") Signed-off-by: Serge Semin Acked-by: Alexander Stein --- Changelog v5: - This is a new patch added on the v5 release of the patchset. --- .../bindings/pci/fsl,imx6q-pcie.yaml | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml index 376e739bcad4..ebfe75f1576e 100644 --- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml @@ -16,6 +16,47 @@ description: |+ allOf: - $ref: /schemas/pci/snps,dw-pcie.yaml# + - if: + properties: + compatible: + contains: + const: fsl,imx6sx-pcie + then: + properties: + clock-names: + items: + - const: pcie + - const: pcie_bus + - const: pcie_phy + - const: pcie_inbound_axi + - if: + properties: + compatible: + contains: + const: fsl,imx8mq-pcie + then: + properties: + clock-names: + items: + - const: pcie + - const: pcie_bus + - const: pcie_phy + - const: pcie_aux + - if: + properties: + compatible: + not: + contains: + enum: + - fsl,imx6sx-pcie + - fsl,imx8mq-pcie + then: + properties: + clock-names: + items: + - const: pcie + - const: pcie_bus + - const: pcie_phy properties: compatible: @@ -57,11 +98,7 @@ properties: clock-names: minItems: 3 - items: - - const: pcie - - const: pcie_bus - - const: pcie_phy - - const: pcie_inbound_axi for imx6sx-pcie, pcie_aux for imx8mq-pcie + maxItems: 4 num-lanes: const: 1