| Message ID | 20230627-topic-more_bindings-v1-8-6b4b6cd081e5@linaro.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8330822vqr;
Tue, 27 Jun 2023 09:41:37 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ7qrz4agHHoKxJYVTwbV8zudZbKaLH0q3mcymVlMBedAyeZK9e+fNC2LNXhIsp7f6nZw6hT
X-Received: by 2002:a17:90a:1057:b0:262:cb1c:a782 with SMTP id
y23-20020a17090a105700b00262cb1ca782mr6063575pjd.37.1687884096591;
Tue, 27 Jun 2023 09:41:36 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1687884096; cv=none;
d=google.com; s=arc-20160816;
b=rUbm00UzfXcE5PYjjFoFbJZfgKWZy8Y7hm8spXCPs2VpQiv1AbhIpvNHZytfltr18w
2iIV1wglJbB1XrNm6sqd9o1Op00eKiSeDcmPZBH8hDEbhBCMP/r7TTLs7vdHbNwDvzjN
YjPlI4Lv6bREp0n3wRdZIkyGn9r4bvGF2dxWh824bMstBtOim1KYmtow+t2ophrTmsZu
CZ6AFiDcuuTBdT4AhXLxZcNR19o1KJiXq92AJaivTson4TaVNdwjg+XD1bOE5TJEmqgZ
fVDVWtzHaLHo3G9cARCmTprBC6aS6yu7AVbV6anNi3mNYyuDB7q8tzXBCFhCkoTD3N45
CvEQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:cc:to:in-reply-to:references:message-id
:content-transfer-encoding:mime-version:subject:date:from
:dkim-signature;
bh=ZSIrkDXpbBJJF79TNwbHEzUtRhMGVG0zQuOGkk3fmhI=;
fh=BdXWhCLYHoLnZB3p1ID/7OfEQhg1SSFfw7f+7JR49ls=;
b=Jw9mZ5IwNwjI9sCI9eVer+hVLBbR8q9bEIc3UG8X2le29yr6vtLIK0HjCtMEwNiwCj
+J0UGs7MjjfsrI9hnJGqFKSnA6//ZEtkreGsNlo5Gs6SXYTLoJH9aTmYMwiJ0zi7s4Wq
oIrVz57D0gL2v6L5Q42rB38huOcLdu7SbuqE+SMg3MomlOytGB2oCvCsIOZoHxxuBO9/
TUJSmrb3nNBiQ+wmeTltpnK2raLhrSX4dlugWFsYLqPu3UjhASt4qKaxP5ez5KgklCTE
ShgUNtMJccLAIgUqQtaLTbhK8NWTghDDJRP5qUNaIiv7gZ2Dx6GiMQdgWsE0qe+AqLa7
hZtw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=IoddTkfO;
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=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
n18-20020a17090ac69200b00252779bf264si9871054pjt.52.2023.06.27.09.41.22;
Tue, 27 Jun 2023 09:41: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=pass header.i=@linaro.org header.s=google header.b=IoddTkfO;
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=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S232490AbjF0QZc (ORCPT <rfc822;nicolai.engesland@gmail.com>
+ 99 others); Tue, 27 Jun 2023 12:25:32 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46524 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232316AbjF0QZA (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 27 Jun 2023 12:25:00 -0400
Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com
[IPv6:2a00:1450:4864:20::12e])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29AC630F1
for <linux-kernel@vger.kernel.org>;
Tue, 27 Jun 2023 09:24:59 -0700 (PDT)
Received: by mail-lf1-x12e.google.com with SMTP id
2adb3069b0e04-4f95bf5c493so6339933e87.3
for <linux-kernel@vger.kernel.org>;
Tue, 27 Jun 2023 09:24:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1687883097; x=1690475097;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:from:to:cc:subject:date:message-id
:reply-to;
bh=ZSIrkDXpbBJJF79TNwbHEzUtRhMGVG0zQuOGkk3fmhI=;
b=IoddTkfO5tyJTW4sBdG96yKju/2zkdaz8Ih6r1OgbZyFYIGnFb9FgdojUCQbNDpsC2
CSDG1Y9IvFn0LGAkBT/zzvqbcU6oi0jFv3gJWgTtUrZ9OtczoQWBftZWtafS0go4jEhe
uTdrSVkI5P2pU8jdHjBaNe7LbovRankNV5OBrCNbN8bts3hxbXbCCted9KSZ4btQFE4Z
QxmC96DVoK0JJ2+wcl0s76bxFn6GyhL5tFD4rQsq+Nj+zPK4kMs/6lDlUINp9JGbJNqo
cBhatXQ00E1GUSGawoBVzZCeOV0Ubb0Aa5ewYLXSP4z+8f7pPOhaKvSXo5RYGAjInEmp
d2LQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1687883097; x=1690475097;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ZSIrkDXpbBJJF79TNwbHEzUtRhMGVG0zQuOGkk3fmhI=;
b=D+0c8E+ueHjZSX3ekb6c0DpW0g/rfggL+YXaRxl3dnDwibxDx4Ncd+OWTcufk4RrFD
E+/9+edFZYEaTZaHjfrpVgrazNr+I91hr7XNO71fxgIzxp1gVl3GCxx6oMqseyfsmGLG
XCOkr6Xn9TemjqhSQilTf+VmwGI6zEYxmqFKjkPZNLgYTREZ9Hwv3m3Ho/Mm4m31o6Dw
yiJEfozm4RdAY+hUPtTBgpFcJCXuz7geiRYw9O/j/NR5HtZz8xpPmbr+QoejOpjypS63
j9pkWVVDW/iSsnX+/TA5DuXNT5xIInC6gNGYJ95lbMnFQlMyeqjmRR/6rFufbO2e4SkW
ujeg==
X-Gm-Message-State: AC+VfDx92XKbLnzurjAOEBQv5M1LhxRIyCDWS3XFl+HOMGfGZH4K+dCP
aNRicItb78obKRKS+GUwLMCEvQ==
X-Received: by 2002:a19:915d:0:b0:4fb:8aeb:d9be with SMTP id
y29-20020a19915d000000b004fb8aebd9bemr731320lfj.30.1687883097444;
Tue, 27 Jun 2023 09:24:57 -0700 (PDT)
Received: from [192.168.1.101] (abxj103.neoplus.adsl.tpnet.pl. [83.9.3.103])
by smtp.gmail.com with ESMTPSA id
g7-20020a19ac07000000b004fb259a5589sm1190508lfc.104.2023.06.27.09.24.55
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 27 Jun 2023 09:24:57 -0700 (PDT)
From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Tue, 27 Jun 2023 18:24:24 +0200
Subject: [PATCH 08/11] dt-bindings: usb: ci-hdrc-usb2: Fix handling pinctrl
properties
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230627-topic-more_bindings-v1-8-6b4b6cd081e5@linaro.org>
References: <20230627-topic-more_bindings-v1-0-6b4b6cd081e5@linaro.org>
In-Reply-To: <20230627-topic-more_bindings-v1-0-6b4b6cd081e5@linaro.org>
To: cros-qcom-dts-watchers@chromium.org,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Benjamin Li <benl@squareup.com>,
James Willcox <jwillcox@squareup.com>,
Joseph Gates <jgates@squareup.com>,
Stephan Gerhold <stephan@gerhold.net>,
Zac Crosby <zac@squareup.com>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Banajit Goswami <bgoswami@quicinc.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Lee Jones <lee@kernel.org>,
Stephen Boyd <sboyd@kernel.org>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Xu Yang <xu.yang_2@nxp.com>, Peng Fan <peng.fan@nxp.com>,
Christian Marangi <ansuelsmth@gmail.com>,
Wesley Cheng <quic_wcheng@quicinc.com>,
Jun Nie <jun.nie@linaro.org>, Max Chen <mchen@squareup.com>,
Shawn Guo <shawn.guo@linaro.org>,
Vivek Gautam <vivek.gautam@codeaurora.org>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vincent Knecht <vincent.knecht@mailoo.org>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Konrad Dybcio <konradybcio@kernel.org>,
alsa-devel@alsa-project.org, iommu@lists.linux.dev,
linux-usb@vger.kernel.org,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Leo Yan <leo.yan@linaro.org>, Rob Herring <robh@kernel.org>,
Andy Gross <andy.gross@linaro.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>
X-Mailer: b4 0.12.2
X-Developer-Signature: v=1; a=ed25519-sha256; t=1687883074; l=1843;
i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id;
bh=vuI+abY7emKvxqxwg2J7Vf5U+QSl3xD3cylxKBp47QM=;
b=cA//QEaEi/GzH/ZTEpwNhEiym+hD656nG3IixPCS0Yi7t2cIiwxXA4DNzeydmsOVFuKJMXujb
YnsymIapOVCBidELFNlYPj1ztQ+aNTLBST/+567mWks3T4NqajGgjOd
X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519;
pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms=
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
autolearn=unavailable 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1769874754393617595?=
X-GMAIL-MSGID: =?utf-8?q?1769874754393617595?=
|
| Series |
Even more msm bindings fixes
|
|
Commit Message
Konrad Dybcio
June 27, 2023, 4:24 p.m. UTC
Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention
to handle the different pinctrl combinations.
Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
.../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++----------------
1 file changed, 7 insertions(+), 20 deletions(-)
Comments
On Tue, Jun 27, 2023 at 06:24:24PM +0200, Konrad Dybcio wrote: > Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention > to handle the different pinctrl combinations. > > Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- > 1 file changed, 7 insertions(+), 20 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml > index 782402800d4a..24431a7adf3e 100644 > --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml > +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml > @@ -199,17 +199,6 @@ properties: > In case of HSIC-mode, "idle" and "active" pin modes are mandatory. > In this case, the "idle" state needs to pull down the data and > strobe pin and the "active" state needs to pull up the strobe pin. > - oneOf: > - - items: > - - const: idle > - - const: active These are no longer valid values? The description still mentions them. > - - items: > - - const: default > - - enum: > - - host > - - device > - - items: > - - const: default > > pinctrl-0: > maxItems: 1 > @@ -357,17 +346,15 @@ allOf: > - const: active > else: > properties: > + pinctrl-2: This should be implicitly allowed. Is it not? I'm reallly at a loss as to what problem this patch solves. > + maxItems: 1 > + > pinctrl-names: > minItems: 1 > - maxItems: 2 > - oneOf: > - - items: > - - const: default > - - enum: > - - host > - - device > - - items: > - - const: default > + items: > + - const: default > + - const: host > + - const: device > - if: > properties: > compatible: > > -- > 2.41.0 >
On 29.06.2023 17:23, Rob Herring wrote: > On Tue, Jun 27, 2023 at 06:24:24PM +0200, Konrad Dybcio wrote: >> Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention >> to handle the different pinctrl combinations. >> >> Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") >> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> >> --- >> .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- >> 1 file changed, 7 insertions(+), 20 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml >> index 782402800d4a..24431a7adf3e 100644 >> --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml >> +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml >> @@ -199,17 +199,6 @@ properties: >> In case of HSIC-mode, "idle" and "active" pin modes are mandatory. >> In this case, the "idle" state needs to pull down the data and >> strobe pin and the "active" state needs to pull up the strobe pin. >> - oneOf: >> - - items: >> - - const: idle >> - - const: active > > These are no longer valid values? The description still mentions them. I believe allOf: now covers them all? > >> - - items: >> - - const: default >> - - enum: >> - - host >> - - device >> - - items: >> - - const: default >> >> pinctrl-0: >> maxItems: 1 >> @@ -357,17 +346,15 @@ allOf: >> - const: active >> else: >> properties: >> + pinctrl-2: > > This should be implicitly allowed. Is it not? No, it errored out for me. > > I'm reallly at a loss as to what problem this patch solves. Specifying all 3 pin states is impossible with the current state of this binding, even though it's a supported configuration (check qcom/apq8039-t2.dtb). I should have been more clear in the commit message. Konrad > >> + maxItems: 1 >> + >> pinctrl-names: >> minItems: 1 >> - maxItems: 2 >> - oneOf: >> - - items: >> - - const: default >> - - enum: >> - - host >> - - device >> - - items: >> - - const: default >> + items: >> + - const: default >> + - const: host >> + - const: device >> - if: >> properties: >> compatible: >> >> -- >> 2.41.0 >>
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml index 782402800d4a..24431a7adf3e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml @@ -199,17 +199,6 @@ properties: In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin. - oneOf: - - items: - - const: idle - - const: active - - items: - - const: default - - enum: - - host - - device - - items: - - const: default pinctrl-0: maxItems: 1 @@ -357,17 +346,15 @@ allOf: - const: active else: properties: + pinctrl-2: + maxItems: 1 + pinctrl-names: minItems: 1 - maxItems: 2 - oneOf: - - items: - - const: default - - enum: - - host - - device - - items: - - const: default + items: + - const: default + - const: host + - const: device - if: properties: compatible: