From patchwork Mon Mar 27 08:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 75254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1350950vqo; Mon, 27 Mar 2023 01:22:30 -0700 (PDT) X-Google-Smtp-Source: AKy350YrjimEUuGoqUEeeUDbMIJwn2pRSAIng23m2ImUW8aID6wJpH7oCPhW4/YM7OaDZDK9HHp5 X-Received: by 2002:a17:907:1612:b0:931:88e8:d470 with SMTP id hb18-20020a170907161200b0093188e8d470mr13336186ejc.23.1679905350302; Mon, 27 Mar 2023 01:22:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679905350; cv=none; d=google.com; s=arc-20160816; b=O+9WGFXbsQe590Yu6fcsQ4J106onN7YCGJs972kbMzQ5SGoX5nsx6TMFOSSuRcD+tT ycvmpKsnF1j0P2yFL6fiIXVZSPKRa/ieS2vZSCCkecukmzywzzTiib1QBc8R4+igZFBy 8vmKMi43SqOO7MSPfFUGadz8nqUQ9T3MnjVagnWc7mGMlN+R+oOqB6QL4a3Jc4EwULVG FlDj7EQaI1zSX98MKRknhuPqi1FYTqehhFBLXZ+wQpEKUWJdfht3CZCzcNWp/f+X6S1A XcWzgazF4K60/R7pgG497MZfGb0zeZlnIeh4TQLBFkI7cGNKqxsTXL0Xyl30btCuJETT eAeA== 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=BiNqTeeVrWQOzoZkyp1Ne+Y+AeYFGXw/DSHUvZsNi9U=; b=WwEx03nbsv8BNQ5HyTGBfqHKNuym2u29qJQ6rhXFuixDPFyqjqjen/LM5hMcasMPXY q0LDEec1dN4CM1ODJTbrxhBkKdfwWJd1VIThjGHF7e0x4GA6fegZhPMRN0+IoVrEiw7U IGGEgW0ZFeQufKQ2s888jkx4uh/O4ykbLE/bnX42GSrPEPwfXFAvN+mj0CyfMMkUEPIS l+VNCb2j8v0LkK2zJ+g+2XaNDF/GAaSxoYF12yvL4Vk4iZdcfYrV1+3JHWoeumd2hO8G eHN4MYXa0g1FnEqfB4bKSoVNjzsPnWkzY0EVUTriAXFt/JjxdHQwpKsmehI6wv9TJAF1 QVVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=utB9KGwJ; 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 i13-20020a170906a28d00b00932dac6402csi23233452ejz.370.2023.03.27.01.22.05; Mon, 27 Mar 2023 01:22:30 -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=utB9KGwJ; 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 S232822AbjC0IGe (ORCPT + 99 others); Mon, 27 Mar 2023 04:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232600AbjC0IGc (ORCPT ); Mon, 27 Mar 2023 04:06:32 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AD5C49C6 for ; Mon, 27 Mar 2023 01:06:30 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id ew6so32180903edb.7 for ; Mon, 27 Mar 2023 01:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679904389; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BiNqTeeVrWQOzoZkyp1Ne+Y+AeYFGXw/DSHUvZsNi9U=; b=utB9KGwJVl/qvFQcQXspBeh++ITcLsDKWbbjzrzuwn/GC0zRL2hy7sGeyOnBYi/5lW DrRsnGJZfcnLQkp8hQORJditRaSdg6E6/cEKxRRBJ3laWqglnzjZry2m+dH8hd+iRYDb NEP9Rf11RdBQQv4pwTToD6ETSScvKCYbyPg84X7Yo50Y4h5DEv83QbKpsBtlZQQIdsqs uolsxwmg7mneol3mTflcsX+3fSrBjMv1uNuCvn38IWeyDvru2b6X2i+PXwyzkET6meYY +x7Sa1qDCYUj7Q0wjwS5FcUJRWnDUQmOo9VkNlfIWQTWVGSkAzz5/2MZD1ivHo7jofO4 DVMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679904389; 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=BiNqTeeVrWQOzoZkyp1Ne+Y+AeYFGXw/DSHUvZsNi9U=; b=714V5IdyS6Ye4xGkhMmxVkTmbQo+xQ9lJbTgs6X0IOx0+JCG3B/efmE8ypGNvARyXa 2TjFHf2ITjcvw3pcj9oqLkRe+VqXNEwv+DxjKc0l57qF3dOKDjeAdgr03AqYjrvOfSU4 BHMFmUrHcTZYVX7CBUTI0sLjanosMYs4tK3bXJV8nzhevjVlEzQueZjCEEDAHwpzUnap KPIkDsJ/f2KQVIyD3lq5mWbPr1CDgepoKPaUaecy4shXM98qgcy7iWXaRB6siy6WXDcu fylZMx/uXp22pUcpPss2u9WvZcQ0g2+ySzFH1pYfPCnEeneE9LqdX7SJwuvlyJXljbsA /SmA== X-Gm-Message-State: AAQBX9f5Y8fVwTtN5gdFJkxM0JEnI+M0vwiBt7ZiWVCEX+DPlUIhn1PV tEkITAYz9+W1gJIcUBJz/jb/SA== X-Received: by 2002:a05:6402:1002:b0:501:c547:2135 with SMTP id c2-20020a056402100200b00501c5472135mr10258056edu.36.1679904389024; Mon, 27 Mar 2023 01:06:29 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:198e:c1a5:309b:d678]) by smtp.gmail.com with ESMTPSA id f3-20020a50d543000000b00501d51c23fbsm9764527edj.6.2023.03.27.01.06.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 01:06:28 -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: Mon, 27 Mar 2023 10:06:25 +0200 Message-Id: <20230327080626.24200-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,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?1761508432855575874?= X-GMAIL-MSGID: =?utf-8?q?1761508432855575874?= 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 a765837dc069..74e3acf92d21 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -308,19 +308,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 Mon Mar 27 08:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 75251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1346365vqo; Mon, 27 Mar 2023 01:11:45 -0700 (PDT) X-Google-Smtp-Source: AKy350YAzVeJYZ4KUUlvnxAvdGwhgm6HZSS76Tt/beP3IfKI9XyLguZK5+18kivPrpm9ieedDTTg X-Received: by 2002:a17:907:3e09:b0:93e:82d1:9ae0 with SMTP id hp9-20020a1709073e0900b0093e82d19ae0mr11784080ejc.49.1679904705677; Mon, 27 Mar 2023 01:11:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679904705; cv=none; d=google.com; s=arc-20160816; b=kNitkBo6zFc78blzydX1Oh7QqUyTuIYaMeGi9eHlIUzgpSYhh48gnz65DCGoCqliNR du93PWBDL1K5QpB9cQ/6b/qmFiZ4gM0CDP0dvsYaWGAh3dh4fMJmjWbJSmCCVYlvB/Nw 52aCjIwv5MJZNgA6Ap2sdS7e268PLN7rmj7ErXapnI3BlUgyTpXruqm9y6r6h4eRF/yv GBhrRnbHo9R3dDQdI+aZ1kSuoPFBEbkZS2DCjbN2Bb0NSkqsW7OM3lKVfYCJxjovbG12 aDUMHIO/RHRuEIK2+0ma8t0ecHFvW0TL7RZhkC7Sjlncqe44B2cznSSEPr4jb7u9n4Ck EGcw== 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=UUp4ngzJiF6qfcN7UPDBFASGOZPeVqu/C7g0vbL0LJA=; b=PjteWwUHCx8t9Zip1XJv6jSt/8ahoLjc1Af9axjxQz7SJ4Q040D6BfxUZw8LwAWkVp SJWKfVbDOMEW11BiVIR+Pqz//iq+RsXATP/AcTT0uxqKui4yHB6fK7fJym3je8qyaIg7 R+zS6S4xr7LxTxqCNTAKwXLaoipEyOhfSx+AyrdQ8KGx38gBa4Hp39QZEv+OHYyiWdO9 jnTvRsnFzDav9QTnIrE7DeJ0ZWtnco4OY1CGUPoYvBobHqrNoYHz3ruq+MZdBjbyuTuR wcXm5tbdGOuXVv9my7v7Z7Nev5p0vh9iXUXsjN5RfgxXP1AczfnpPicBukDm0t8AsmAK TVwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wLSueBVp; 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 vi11-20020a170907d40b00b0093ddb15d3bbsi8958990ejc.183.2023.03.27.01.11.22; Mon, 27 Mar 2023 01:11:45 -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=wLSueBVp; 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 S232880AbjC0IGg (ORCPT + 99 others); Mon, 27 Mar 2023 04:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232590AbjC0IGc (ORCPT ); Mon, 27 Mar 2023 04:06:32 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85FE749CA for ; Mon, 27 Mar 2023 01:06:31 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id t10so32125212edd.12 for ; Mon, 27 Mar 2023 01:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679904390; 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=UUp4ngzJiF6qfcN7UPDBFASGOZPeVqu/C7g0vbL0LJA=; b=wLSueBVpXjyMaDwQPzr4dLeOIPMasQNmGaI6jO2YpyhzzZDlX/mBC06donWSsJPnK1 05qqAeXx1iPsPP565uvbyT1aLeGaBfS1J5iLxR+u8yYU4gu23Cp0YOwMEOeKE5/o5rga gk0wasJVjb4DXrBFNQEGz2pEEMAN0RPxDmhcNkA3kpx4dSIH2YH1xnWFj7gm21yQQ6F8 GWxbB1P8a0Vtt2mDAWRJbBa83OQ2IjBe8uyZlIXKpDc6qn19PEFH0VgjmtZbA6dL34HG M5Jazvsu6JLEeLBrhV7YZ7nj/cHQBVJW24NAzYGmMpiHn+DEXcpaiYoR4A6BrddWTpOR kDdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679904390; 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=UUp4ngzJiF6qfcN7UPDBFASGOZPeVqu/C7g0vbL0LJA=; b=t6Fl1Ax7/f+jIJ+asP9EBsZiN0GpbEF4o8+op5q0gQ+Xeak/Hq8hWKRdGzj8A9aO+f G01o9ZTRqJL+0KuM0/TnuKpWjtSNAyMMtCs0y5TqGVEWcD4SxE51467z4gF4JZ+LHP7g f8XJxxHRlOoDZDGsXmF37X3IItXemFjQ66mzxsWMuE/3auFQT8qnWOSfDV6YWeHyJ8BN h9OTpwS1fpkzibyZ3OdH4KAlonZDWHZAUpbSALf2giLaTlQt7kAcYsYx9OXa9HcohfUx TdSb30m9OA2xn1PLT+Ha+A4RgMBjn/7izR4klOfdTaA03A/MUdOu5yEvJWX0JWci6F5O tkDg== X-Gm-Message-State: AAQBX9cB4HnoSRW2EM/In+2ZsFBXtk4K8NxHz15SkCk5SilW8HoQ9JUM QVvLfmNHRrGov82Laa0izMtuEw== X-Received: by 2002:a05:6402:5146:b0:502:1cae:8b11 with SMTP id n6-20020a056402514600b005021cae8b11mr12905714edd.23.1679904390019; Mon, 27 Mar 2023 01:06:30 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:198e:c1a5:309b:d678]) by smtp.gmail.com with ESMTPSA id f3-20020a50d543000000b00501d51c23fbsm9764527edj.6.2023.03.27.01.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 01:06:29 -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: Mon, 27 Mar 2023 10:06:26 +0200 Message-Id: <20230327080626.24200-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327080626.24200-1-krzysztof.kozlowski@linaro.org> References: <20230327080626.24200-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,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?1761507756765349079?= X-GMAIL-MSGID: =?utf-8?q?1761507756765349079?= 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 | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml index 74e3acf92d21..dd52cc9f1846 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -144,6 +144,7 @@ allOf: compatible: enum: - qcom,pm6150l-rpmh-regulators + - qcom,pm8150l-rpmh-regulators then: properties: vdd-bob-supply: @@ -244,23 +245,6 @@ allOf: patternProperties: "^vdd-s([1-9]|10)-supply$": true - - if: - properties: - compatible: - enum: - - qcom,pm8150l-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: