From patchwork Fri Apr 7 16:50:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 80908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp410984vqo; Fri, 7 Apr 2023 09:55:19 -0700 (PDT) X-Google-Smtp-Source: AKy350bTCt1Byxr0/IMF4UDROK3dip6NXR6SgtERPDrxBPqwHpYescJN4UpsZ519qfNweVtuXpHJ X-Received: by 2002:aa7:c151:0:b0:501:d52d:7f88 with SMTP id r17-20020aa7c151000000b00501d52d7f88mr3188463edp.10.1680886519532; Fri, 07 Apr 2023 09:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680886519; cv=none; d=google.com; s=arc-20160816; b=rY55XLQUAKRUBaSLJS/+/jjPwZRoHXhsPyHHXSP8Es3TZDS7NmCNLfl06LbWMffD61 q1uWo5hIA0eGwFrWmKkVMITU1FJLTpKLklm+gnwVSdeQVj2lLFePVYrlE34u4U6kOQXB L9dmYLhJllj062JzytyyhwUCwkRMGL3yU9Or0zj0cSOpxzmgSm9aZ/SoWOV4BYfaposl I6s188xljI+OhbWf3NvV+WyQIIUN6YTEAGzB46Smu0duwp/eZvhB7Gq9qsq/sFC2FnRT hK5hXIj2RKLYbshjQzaonuBLC5yvDI99ldLzkt5YUitB8ZDkMwCQo4dDlgvAzAl5EK+c 0cgw== 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 :message-id:date:subject:cc:to:from; bh=K4LEOuv8SIK3TXqCdVjxup7Uedv818mwCU2FXCwfY/Q=; b=DrrAYeh6O6d5jbEcCBTU9l/uTh44VSgYonpWcYCBRdpWOvCpYlsv18LhYirgd+Anr5 /3WuKuyXKrs82wJ+wmNS4rsYBrUiQ1WFaVCsHhlo/vE5F3vUJPLkffbodVMmDrEN0w4n gIOq6KW3kS7U7jamAheFUlMgqWCj1zRxvIKQRXwLoy4uWEVkSeZ1DYJLEl6Z7AuZBkyp b55Agp+/F3rIfqP0sCHBH4SDgI/e9WeMfqoTxmfHlQrzhU6etcXbslM+W7/I/7oQrzIo UnJzPVH7VGo8UTW79mlnZHeCLvIc6QEM342AWwvt1/r+1a+uoEO2R2nrA0M1Gt7Hrrpp oblg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (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 o13-20020a056402038d00b00502038c2d09si2980230edv.596.2023.04.07.09.54.55; Fri, 07 Apr 2023 09:55:19 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229890AbjDGQuj (ORCPT + 99 others); Fri, 7 Apr 2023 12:50:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjDGQuh (ORCPT ); Fri, 7 Apr 2023 12:50:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B810655B4; Fri, 7 Apr 2023 09:50:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4FC2A6491C; Fri, 7 Apr 2023 16:50:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A67EAC433EF; Fri, 7 Apr 2023 16:50:32 +0000 (UTC) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski , Abel Vesa , Rob Herring Subject: [RESEND PATCH 1/2] regulator: dt-bindings: qcom,rpmh: Correct PM8550 family supplies Date: Fri, 7 Apr 2023 18:50:28 +0200 Message-Id: <20230407165029.100305-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762537263289092722?= X-GMAIL-MSGID: =?utf-8?q?1762537263289092722?= PM8550 is different than PM8550VE/VS, because the latter has much smaller amount of supplies (l1-3 and s1-6) and regulators. The PM8550 has on the other hand one pin for vdd-l1-l4-l10 supplies. Correct the if:then: clause with their supplies. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Abel Vesa Acked-by: Rob Herring --- .../bindings/regulator/qcom,rpmh-regulator.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml index 7002d2654382..07bb54874d68 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -312,19 +312,29 @@ allOf: compatible: enum: - qcom,pm8550-rpmh-regulators - - qcom,pm8550ve-rpmh-regulators - - qcom,pm8550vs-rpmh-regulators then: properties: + vdd-l1-l4-l10-supply: true vdd-l2-l13-l14-supply: true vdd-l5-l16-supply: true vdd-l6-l7-supply: true vdd-l8-l9-supply: true patternProperties: - "^vdd-l([1-4]|1[0-7])-supply$": true + "^vdd-l(3|1[1-7])-supply$": true "^vdd-s[1-6]-supply$": true "^vdd-bob[1-2]-supply$": true + - if: + properties: + compatible: + enum: + - qcom,pm8550ve-rpmh-regulators + - qcom,pm8550vs-rpmh-regulators + then: + patternProperties: + "^vdd-l[1-3]-supply$": true + "^vdd-s[1-6]-supply$": true + - if: properties: compatible: From patchwork Fri Apr 7 16:50:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 80909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp411002vqo; Fri, 7 Apr 2023 09:55:21 -0700 (PDT) X-Google-Smtp-Source: AKy350aTuX12TkTBpv+ppkfPfa3ffsJ2lphoMgtxLvKXUyv1/LE2IbSAENJEcGcUMffBH4TBY4V5 X-Received: by 2002:a17:907:6a17:b0:930:3916:df17 with SMTP id rf23-20020a1709076a1700b009303916df17mr201481ejc.0.1680886521750; Fri, 07 Apr 2023 09:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680886521; cv=none; d=google.com; s=arc-20160816; b=XvOdOJOl8ZsBY2aMU53U37N8sSnSEqx/fTUMpS+7lWJm+astamJAsx2rZv8hyivAkT u9NDDBYWjxQXXh0/KhP2MsmNEpXj6ruNZEy9Zd0OnZZ2Sz11WnReLnWV2bncCps52CsF rcTWQoM+Q6RhKGpXRp5yOSMvcigzyc14RhtfyztyjForSGn/WV59Y3nA+xv3Do3b2y4C h0TbR0qBWFpabd3xR8ouNfHnIUd6oFnInbjbq2haUeuJ8EuJOwxd0n1FdWBY6v8D4Ib7 7EIulOdyMqhiNHJdPDNVI81G9qJYdgp7QxiK/tn/Mhtlf5LgSoO85UZARMSXVs5RHi04 iUhg== 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; bh=Kz9kWFDfeUHBCah3nUvDQGbMrvoepkh6EXKlV5MkxzU=; b=QeDjS1+BrgLJ3h1SgzJP0P2w9r7TFn53INAlzK2HF4lBuED4B5K/J1aueTwEl/vKzi w0AeYAqUQIRXIO7kwpT9qupX8I7rkTdXw+pxSCJBCZAbLPsrAOOXOhElkKMT+7+ZJTef oaZgpnjTUT6LSpMgqrxqg8TxN6txjyeXQHzzxLcoBZ8NN8qgHVHj94cHLCHthMMCQLTi Q7t66TqAj3FrbDSxqZsev/Y41METiJpLde9ZBHFvMCvm5H8/QAk45emDBhlJn50+bqGh qzT+DRwES0HtAz1+E7g6dQS9D6bZaPQzy4+GGDCcOEg4ntaJlFwSteeoMbAozRV2sHm1 3Irw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (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 hb23-20020a170906b89700b0093cda757bd8si3873419ejb.132.2023.04.07.09.54.57; Fri, 07 Apr 2023 09:55:21 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229938AbjDGQun (ORCPT + 99 others); Fri, 7 Apr 2023 12:50:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229916AbjDGQum (ORCPT ); Fri, 7 Apr 2023 12:50:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 550ABBBB5; Fri, 7 Apr 2023 09:50:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BC3516491C; Fri, 7 Apr 2023 16:50:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33EC3C433A4; Fri, 7 Apr 2023 16:50:36 +0000 (UTC) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring , Danila Tikhonov Subject: [RESEND PATCH 2/2] regulator: dt-bindings: qcom,rpmh: Combine PM6150L and PM8150L if-then Date: Fri, 7 Apr 2023 18:50:29 +0200 Message-Id: <20230407165029.100305-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230407165029.100305-1-krzysztof.kozlowski@linaro.org> References: <20230407165029.100305-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762537265489734427?= X-GMAIL-MSGID: =?utf-8?q?1762537265489734427?= The supplies for PM6150L and PM8150L are the same, so they can be part of one if-then block, for smaller code. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Cc: Danila Tikhonov --- .../regulator/qcom,rpmh-regulator.yaml | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml index 07bb54874d68..ac57162ea7be 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -146,6 +146,8 @@ allOf: compatible: enum: - qcom,pm6150l-rpmh-regulators + - qcom,pm8150l-rpmh-regulators + - qcom,pmc8180c-rpmh-regulators then: properties: vdd-bob-supply: @@ -247,24 +249,6 @@ allOf: patternProperties: "^vdd-s([1-9]|10)-supply$": true - - if: - properties: - compatible: - enum: - - qcom,pm8150l-rpmh-regulators - - qcom,pmc8180c-rpmh-regulators - then: - properties: - vdd-bob-supply: - description: BOB regulator parent supply phandle. - vdd-l1-l8-supply: true - vdd-l2-l3-supply: true - vdd-l4-l5-l6-supply: true - vdd-l7-l11-supply: true - vdd-l9-l10-supply: true - patternProperties: - "^vdd-s[1-8]-supply$": true - - if: properties: compatible: