From patchwork Tue Jun 27 16:24:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 696971 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32716EB64D9 for ; Tue, 27 Jun 2023 16:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232006AbjF0QZW (ORCPT ); Tue, 27 Jun 2023 12:25:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232323AbjF0QZB (ORCPT ); Tue, 27 Jun 2023 12:25:01 -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 28CC62115 for ; Tue, 27 Jun 2023 09:24:59 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f957a45b10so6392011e87.0 for ; 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=iBx+TbWTpTuQ2CZRfvso0G474hNMeHXi+vocUAVO123FNHq0fTR6csXsf4jHnKB1i3 7iXw3La19RbA5FeNU77a7HDp/xqRasTNvVqnh4ivwGs0D2AVR7lXyPObKiAd49SyxB8o oHSikbubvt/0xbGy5N+qDNzNBFTzKT6nhJ7UPmISAMSJbtqnwaJcJoPmoLl/1XcidhV9 ql7weq+Cd2ilXNk6UduNEh/l2XyvlhPkYkmPb4gwdRHpj/EaEZq0GTSR0K0dhhiPelHU FZqtBNcBFd1U85ks4GYokEVavj2lAasZ/vxIPpN+3+tXD0QO6w/zUTdZh5FId+yCdRu0 yksw== X-Gm-Message-State: AC+VfDxTdTfZR1oveOmbQMPYNgLlm5UXQq5pJci01KmcuJkjm+Md76qZ jVAp+pn22vgsBHPkfRmwtUwiVw== X-Google-Smtp-Source: ACHHUZ4r9irVoENkd8byj3320r8JiIAdEQ/lABEZXknA2fxdO6BKPyPCZg1djvkW496qNULbkbBgNA== 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 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 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 , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Dmitry Baryshkov , Benjamin Li , James Willcox , Joseph Gates , Stephan Gerhold , Zac Crosby , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Lee Jones , Stephen Boyd , Joerg Roedel , Will Deacon , Robin Murphy , Greg Kroah-Hartman , Xu Yang , Peng Fan , Christian Marangi , Wesley Cheng , Jun Nie , Max Chen , Shawn Guo , Vivek Gautam Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Knecht , Bryan O'Donoghue , Konrad Dybcio , alsa-devel@alsa-project.org, iommu@lists.linux.dev, linux-usb@vger.kernel.org, Krzysztof Kozlowski , Leo Yan , Rob Herring , Andy Gross , Konrad Dybcio 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= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- .../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 - - 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: