From patchwork Tue Apr 18 07:17:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2647956vqo; Tue, 18 Apr 2023 00:31:01 -0700 (PDT) X-Google-Smtp-Source: AKy350a7N1rN0fZAhiMLj4r6gCgNZL8+TtD/soFT73PPLucu7eH9V8Kpa7SFkm6evSdqcNADHBYf X-Received: by 2002:a17:903:3293:b0:1a2:58f1:5e1d with SMTP id jh19-20020a170903329300b001a258f15e1dmr1124463plb.36.1681803061217; Tue, 18 Apr 2023 00:31:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681803061; cv=none; d=google.com; s=arc-20160816; b=aotQBOwcyUISg5B1rEJecIKBCDu9GOu9a4ltBxxdXgpcwkrBi1t3TVU9D3lz7RUyL5 zBWvBT6a/wpAj8ApLM21H4Nt1Qou3Zkq2Slr9hZjPWTWoxyy2eIxfuoKUakA8gzREF+Y Gydhx5vZzttzn9mN3Vfqh/6BY9tTrg7inMU/PAVXWCe9uQaRIK70ltcdsz02WDxJMl+V 8myh/jwYTk4f0ie2bBYoyh+kvQeEI8Pk+6PmpSwOqzxMD3D3Nql+E/AsnnAyogerXnkH iLuR2zUylKCV78gQW/7JpMWVAcZ/HsbJzRfLdsFq5XnsNLIE2mEW6G5yYyz/Xhm1SvAR A5PQ== 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:dkim-signature; bh=C+6PsgFBtmyPYaIe0XZckdwjOSZ48NdXVpZVusKrTfc=; b=E7Vyy29yyl9ubFqNqpYia2PQaydqF22FgnZk7wZRPrjgd4Btpg7s0uncRqb9GHK1Mx BPB2PSRCpjNiQmpH/2aC5DCjLtVfv8lUwRXjhhIpt8rcuHj2JFCrbCLR4EwWg0G4omax 6ujWk7d+KJMc7SSezKzQ6J8EAiSVZsKQTxFUehtQY5fKTXKU2GcfLuAl7m2MWze7IULE rB15J3s5Qkz6af+cFodoR98Q8NtUqyyFKdZ/D03g+GZ1wJOPEqlQN21B/NCVHjGK0Yo9 Cc3yCYS6xdgLBC1LFmL3XEnXN+6UwuDcXI5RDnqSX62CxEG9Z52PYl5LcO+ZSaPXN5Ew HZkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vh6iI2tS; 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 y6-20020a17090322c600b001a642057764si14330569plg.180.2023.04.18.00.30.48; Tue, 18 Apr 2023 00:31:01 -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=vh6iI2tS; 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 S229706AbjDRHRn (ORCPT + 99 others); Tue, 18 Apr 2023 03:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229631AbjDRHRk (ORCPT ); Tue, 18 Apr 2023 03:17:40 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 346201700 for ; Tue, 18 Apr 2023 00:17:39 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id dx24so26627938ejb.11 for ; Tue, 18 Apr 2023 00:17:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681802257; x=1684394257; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=C+6PsgFBtmyPYaIe0XZckdwjOSZ48NdXVpZVusKrTfc=; b=vh6iI2tS4ojXw0MIXA6w9eDsxCgsy/4aBR0Kh1uvuAXcAU3O+n5zQowfHQs2oP2tEX hG9IydbRVFcFYUkWwPrgOxUUZCUlAV0KCo3kVr3O5MJ0K8DMvc28xF9x2g7/ThWKNyse /mgPB644ZzyrwSPYHxDuhRTVtDrw6DNj8OYq9HZax4jaS5xVcDJEfQG7KWrwQ3L/yDQM A7S/CKFcowsAJZYwY7cGp+SIACozLTD/RAWC0FGWCoO9gS2GPr10MAfR/uH9HzLXFPci fNjnj6FJQscnrzrpZvNbyPx5ec+2btJCq05M04rB9/IN53Gv6MP5f9VQyb2g56OBpzZs fyrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681802257; x=1684394257; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=C+6PsgFBtmyPYaIe0XZckdwjOSZ48NdXVpZVusKrTfc=; b=CfZMQhn83rFWpt0ZS9EkDbFZBJUA3SD3+aPqIApDoqxm5AGGyDZuI0dHUEz0+Pf2ak s8aOEmEB49k+ww3zeSES+kTdQkWBOHeaIJ/Y684VvWFDh3xt/o8zixT9bPEwDVVAkrE9 lvmpOmJAaptnhFuFiD0mjyH2+E4lAfq+lAUJzYDTaTLmdtDbKOAy8dz0wRucQhVUI8eS 068mst02ZS4H8zUXKwrEpz9gA+pWDbvB1AO61jKNSKIDpemnATCpMm/xen+7x69F84hc UuOP2ODg2xiP/G3LV++U+/sBEUOgmqZo6SW3eJM7gTaLUTqBTqXx5AK6Emoy3G+/aThF MMNw== X-Gm-Message-State: AAQBX9fU8Fa/7ekbO6S8M9YPor1afis9jJJjTT8Bt6AyAzMXuLnoXWtv Gb6v6HPPp1G2SWrq3/TKwdZGPw== X-Received: by 2002:a17:906:fcac:b0:930:7d8f:15a4 with SMTP id qw12-20020a170906fcac00b009307d8f15a4mr9384333ejb.53.1681802257666; Tue, 18 Apr 2023 00:17:37 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id j19-20020a50ed13000000b00504ecc4fa96sm6641814eds.95.2023.04.18.00.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:17:37 -0700 (PDT) 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: Tue, 18 Apr 2023 09:17:33 +0200 Message-Id: <20230418071734.5706-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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=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?1763498326282122978?= X-GMAIL-MSGID: =?utf-8?q?1763498326282122978?= 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 --- Resending rebased patch. No other changes, except context. --- .../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 f879ccbb3767..5f9ae89a220d 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -329,19 +329,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 Tue Apr 18 07:17:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 84620 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2647915vqo; Tue, 18 Apr 2023 00:30:56 -0700 (PDT) X-Google-Smtp-Source: AKy350YNbx3NKUIC+9HgCFJlCo0FHORK2zRH1yOObN2aAbnj4cycyP6KxN7m+frgtnfGhLz3r86/ X-Received: by 2002:a17:903:290c:b0:1a0:5349:6606 with SMTP id lh12-20020a170903290c00b001a053496606mr1213381plb.56.1681803056484; Tue, 18 Apr 2023 00:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681803056; cv=none; d=google.com; s=arc-20160816; b=MR0/0U8P9GXSa686eu5F2KFwyfJt0FSoddDZoxwQyx/FB12Y6n168xbQRqdDvAsrXh v8G+exi6jbsWRpTGvM+6wQxdADlh/lvII9wSFj39R0fu9pCo6gfWHysojVBYtD/D2NWZ fTAX81gwbLhwoUnMEbGR9I542ai/B+XvmvxC2cXz8/XXpSe2SFy4mvDUmJ9gOtMPTCKT NRMQseWTz2htr1gizKNh0gM7Dat7p5bZmilTTKUysIEGcN8U2etB0Q7bn6mtWO/pmsHx rKbxlG7ZYehxGDVIHloj3Dlyo9tky4bpBRhCeuRnDdCMsjkXhV5DA5pAqXX5K8ZNWCqF 7U4A== 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=2L60ppviJ/50vCdK5BbqTY67oH9XUAxCh8grDDMg/4o=; b=GzHf90JFplru7c9p+RKZhnWLgT+0CsIUus1OKVrll1JTjOLPXJB0sFTytVRBOaxOoq cxf6wCAO3J0I6thC2A99OpRcmaWnfNNhC/tOYGUiL+Oa1HRiu1H0yIBUtoNtpdqKhu5V v2ITHHwYb0Qv1dzoPkT/xMfX2KA2YJN5RZ6Kp35yoI+NyqPK/zhlZYGX1AEFWd8BbGwf elowy28eINSw+72vT4p6WqVtPxTQbU7uOyis4HqFYYAlrigpfgpAQYuImJVtDZwCelf1 Ata+G5vyk+5yhDO3JU5D8ZZv+Hywwcv225eQyJHe7TZP4sJ2XwvdUIy7HCQhooNUwMgJ NvLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tn07g4Rx; 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 p17-20020a170902e75100b001a6527f6adbsi7229827plf.137.2023.04.18.00.30.41; Tue, 18 Apr 2023 00:30:56 -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=tn07g4Rx; 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 S231197AbjDRHRp (ORCPT + 99 others); Tue, 18 Apr 2023 03:17:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbjDRHRl (ORCPT ); Tue, 18 Apr 2023 03:17:41 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3897A2123 for ; Tue, 18 Apr 2023 00:17:40 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id sz19so13577943ejc.2 for ; Tue, 18 Apr 2023 00:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681802258; x=1684394258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2L60ppviJ/50vCdK5BbqTY67oH9XUAxCh8grDDMg/4o=; b=tn07g4Rx+XejhP3OQVZ4MisHY1szBRWs1+dke/23ZxejY+2eA/S0bvzT7QIOpfzC6H f4ax5DQwet6V8XdlFjOg8cU5v0WNXv613fswvkWl3NM8zwI46lYP+8dv5jG6p8/CfzwZ oCZLbesvDVpCL5qqavREJ+fxMhmcKEPRWp0wSZFYJMV7/KfBO3j9pm2vLrSnKBe0xydo 6r5YqYuYUBE6+3ZKvnbVp+D79Kirjw1wZ3AwyLr5+mTwvmiLcW1XEkDwl1UenALA8piI T4eGbPch0hufmFXSoK8uk6PD51LZheJIqbJqdPPO1iuNIvFAr4tbO28ZIzGqZ5FtLC72 uUug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681802258; x=1684394258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2L60ppviJ/50vCdK5BbqTY67oH9XUAxCh8grDDMg/4o=; b=RBVf9Cj03Isop7ap3CqrRAoJw9OX7V/jq9pExwGbECca4JoQhdqiweqjW6u1+/NDR+ YcXk1XAKU7s4uYwyWbME14tGSLZi1MbB1zQv6zYFsMHTwNuEzPUyabZQWiw38XU0GycJ 0CvnsbaESR975k7epnp2vzUUKj1tTfjVFZXOmuA7wz3tg5KAwUthfyLxhvNZJyVE74uX 9vy4V5zqJXBgUJU9wF0opS/StGj/L+CuW2QzM4NV/xHNpyA4jxRBV6qxol/nx9aFsYBp euF/oPvRMssiAiHdbZ5AdORgctoJYfMYllAtnLmo952bPMAsaQ9WQh+bK27oMLXNyEYU HI/g== X-Gm-Message-State: AAQBX9fweTISbBJNPvOQfjGimt1ikfGTfJ60zM6OUAyU950J+fPP7R0M 7zjx5lOkgbmf8SKoTvKZaLL36Q== X-Received: by 2002:a17:906:1c12:b0:94a:6a7a:52d8 with SMTP id k18-20020a1709061c1200b0094a6a7a52d8mr8584928ejg.71.1681802258652; Tue, 18 Apr 2023 00:17:38 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:a276:7d35:5226:1c77]) by smtp.gmail.com with ESMTPSA id j19-20020a50ed13000000b00504ecc4fa96sm6641814eds.95.2023.04.18.00.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 00:17:38 -0700 (PDT) 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: Tue, 18 Apr 2023 09:17:34 +0200 Message-Id: <20230418071734.5706-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418071734.5706-1-krzysztof.kozlowski@linaro.org> References: <20230418071734.5706-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763498321664174549?= X-GMAIL-MSGID: =?utf-8?q?1763498321664174549?= 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 Resending rebased patch. No other changes, except context. --- .../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 5f9ae89a220d..b9498504ad79 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -147,6 +147,8 @@ allOf: compatible: enum: - qcom,pm6150l-rpmh-regulators + - qcom,pm8150l-rpmh-regulators + - qcom,pmc8180c-rpmh-regulators then: properties: vdd-bob-supply: @@ -264,24 +266,6 @@ allOf: patternProperties: "^vdd-s[1-9]-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: