Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1544513ybh; Tue, 14 Jul 2020 00:09:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb5tUVxAdTDBZEAKr5sCgWiHk8qJf+1BB4JqoWh4zQgKjArTiZ83HBenQLIHX4GTIHFswN X-Received: by 2002:a17:906:f911:: with SMTP id lc17mr3376314ejb.330.1594710552367; Tue, 14 Jul 2020 00:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594710552; cv=none; d=google.com; s=arc-20160816; b=uISDXu+1sx8ER86P4SsgMKmSo2HomeZg+JijsoMDy0C7tA045wZoQL4bDBTV/VC6Yo gXDG0qOrYsOCC/uLeZHeLuBT8hjhW4zDmbCvJK+xF4ZFvhk+RLvG22OF/VOvV2dQji81 DQDmBB9mRwZtOto2Jq0efhsDmqdBDK8OgYe+P/AkvHhnVMCzBtQZUy9cfcySVBjZypbk GowgZkn1Ty1Z4hR8ct8aYQC9RMgdfZ/RAJc08EcEf5+3yqXvNimmDGyts+OaUO7RX9SA cWXKUwLcTDgI85cCuxA1gxjr/eNgJU+ouqsI+VITHJK++iu7CP9tzeIPlOEhUaKPuDzu jH9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TO+SQStJO2y+w1e7yo58DcCaJjqflC0R2W8qSHtU1ZE=; b=evnBEWS7+IpDGSrWrmrwfCIIwGBn8gofafy9FH2rkDwvVD58N4NUCvmXFrj6TSwMMY dWCjUWEp94geWWGrOekJZmzLORDZzH3QDf7Hij6tSGICAXDRSMKFT8NbNBonVDC9lRwz tNpe5fnrrKIPBcsbch+AT111E0hXvm2T9/HxogUhdQ2fN+2HN0ZuGh/QdfVl2IKz5ona DmJ4AcdinCNwx0T3gMiB4WwsCI9FC7RiB1yTvpB+HlZlcBTybJlrSNhaxPPFtC/RQ23/ 68nZyIBsck9qSx9fwZguw1RvRd2kDpAHtMIOejebK5XjBifnxxHIlah3HTTCPAwA4e3D RIwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bo3si4383774ejb.494.2020.07.14.00.08.50; Tue, 14 Jul 2020 00:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727886AbgGNHFu (ORCPT + 99 others); Tue, 14 Jul 2020 03:05:50 -0400 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:39093 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726778AbgGNHEI (ORCPT ); Tue, 14 Jul 2020 03:04:08 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.8989657|0.1165595;BR=01201311R991ec;CH=green;DM=|AD|false|;DS=SPAM|spam_other|0.913775-0.00286365-0.0833614;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03267;MF=frank@allwinnertech.com;NM=1;PH=DS;RN=12;RT=12;SR=0;TI=SMTPD_---.I1SwXGj_1594710240; Received: from allwinnertech.com(mailfrom:frank@allwinnertech.com fp:SMTPD_---.I1SwXGj_1594710240) by smtp.aliyun-inc.com(10.147.41.199); Tue, 14 Jul 2020 15:04:04 +0800 From: Frank Lee To: linus.walleij@linaro.org, robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: tiny.windzz@gmail.com, huangshuosheng@allwinnertech.com, liyong@allwinnertech.com, Yangtao Li Subject: [PATCH v4 03/16] dt-bindings: pinctrl: sunxi: Get rid of continual nesting Date: Tue, 14 Jul 2020 15:03:53 +0800 Message-Id: X-Mailer: git-send-email 2.24.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yangtao Li Rather than a continual nesting of 'else' clauses, just make each 'if' a new entry under 'allOf' and get rid of the else. Signed-off-by: Yangtao Li --- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 124 ++++++++++-------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml index 7556be6e2754..35a26abb02e7 100644 --- a/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml +++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sun4i-a10-pinctrl.yaml @@ -155,62 +155,74 @@ allOf: minItems: 5 maxItems: 5 - else: - if: - properties: - compatible: - enum: - - allwinner,sun6i-a31-pinctrl - - allwinner,sun6i-a31s-pinctrl - - allwinner,sun50i-h6-pinctrl - - then: - properties: - interrupts: - minItems: 4 - maxItems: 4 - - else: - if: - properties: - compatible: - enum: - - allwinner,sun8i-a23-pinctrl - - allwinner,sun8i-a83t-pinctrl - - allwinner,sun50i-a64-pinctrl - - allwinner,sun50i-h5-pinctrl - - allwinner,suniv-f1c100s-pinctrl - - then: - properties: - interrupts: - minItems: 3 - maxItems: 3 - - else: - if: - properties: - compatible: - enum: - - allwinner,sun6i-a31-r-pinctrl - - allwinner,sun8i-a33-pinctrl - - allwinner,sun8i-h3-pinctrl - - allwinner,sun8i-v3-pinctrl - - allwinner,sun8i-v3s-pinctrl - - allwinner,sun9i-a80-r-pinctrl - - allwinner,sun50i-h6-r-pinctrl - - then: - properties: - interrupts: - minItems: 2 - maxItems: 2 - - else: - properties: - interrupts: - minItems: 1 - maxItems: 1 + - if: + properties: + compatible: + enum: + - allwinner,sun6i-a31-pinctrl + - allwinner,sun6i-a31s-pinctrl + - allwinner,sun50i-h6-pinctrl + + then: + properties: + interrupts: + minItems: 4 + maxItems: 4 + + - if: + properties: + compatible: + enum: + - allwinner,sun8i-a23-pinctrl + - allwinner,sun8i-a83t-pinctrl + - allwinner,sun50i-a64-pinctrl + - allwinner,sun50i-h5-pinctrl + - allwinner,suniv-f1c100s-pinctrl + + then: + properties: + interrupts: + minItems: 3 + maxItems: 3 + + - if: + properties: + compatible: + enum: + - allwinner,sun6i-a31-r-pinctrl + - allwinner,sun8i-a33-pinctrl + - allwinner,sun8i-h3-pinctrl + - allwinner,sun8i-v3-pinctrl + - allwinner,sun8i-v3s-pinctrl + - allwinner,sun9i-a80-r-pinctrl + - allwinner,sun50i-h6-r-pinctrl + + then: + properties: + interrupts: + minItems: 2 + maxItems: 2 + + - if: + properties: + compatible: + enum: + - allwinner,sun4i-a10-pinctrl + - allwinner,sun5i-a10s-pinctrl + - allwinner,sun5i-a13-pinctrl + - allwinner,sun7i-a20-pinctrl + - allwinner,sun8i-a23-r-pinctrl + - allwinner,sun8i-a83t-r-pinctrl + - allwinner,sun8i-h3-r-pinctrl + - allwinner,sun8i-r40-pinctrl + - allwinner,sun50i-a64-r-pinctrl + - nextthing,gr8-pinctrl + + then: + properties: + interrupts: + minItems: 1 + maxItems: 1 additionalProperties: false -- 2.24.0