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: 674731 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 F27E7C77B71 for ; Tue, 18 Apr 2023 07:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230514AbjDRHRm (ORCPT ); Tue, 18 Apr 2023 03:17:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229706AbjDRHRl (ORCPT ); Tue, 18 Apr 2023 03:17:41 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C501FC3 for ; Tue, 18 Apr 2023 00:17:39 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id sz19so13577835ejc.2 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=BW+xCO0d5oeXoToXXtWfQvI/CW69zGYEyZ/FQAluXpQisyfp5LCqokX0cB8H3Maxv9 6RUcjKvIfFVUBLxFA0saM5IosVErxrGUzqNLopWLo1K6BjemxqAW/ay0Ggl8iTSe6Ohp geeGb4n7EWuG2eE3Q2W+McPliGbO/f8Nq+fcMH567+GzEimk1bzl/F70f8NZUkeOwGe2 HnVq+y0r86mPkBX2qc5HlPypntKtycfzZ2l0t4nx7fQ1bsde6bFvTFvNTRtflp3cEIay 8HkAaDmZQm7sxA3S9NpJR4yiUqQT5DX0Zwh4E5mYb3zUVrHsowDOpynx4mO01rF1eMg3 R0gQ== X-Gm-Message-State: AAQBX9fKqTei8PcVMpFFlT5Bs0Cdon80G8O98xN8s1k7gcKmBwCZQL47 WgDLHhWgsh1JAxqyX9umjniMAw== X-Google-Smtp-Source: AKy350ZivXzRdJZcpojlARNjZs9Qe41S0IfKv/saw9jPQIExwEZD8rBQvFdVgIFe7ATV0aWwZm1tBA== 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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: 675391 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 34ABAC77B76 for ; Tue, 18 Apr 2023 07:17:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230526AbjDRHRn (ORCPT ); Tue, 18 Apr 2023 03:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230384AbjDRHRl (ORCPT ); Tue, 18 Apr 2023 03:17:41 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 385A22107 for ; Tue, 18 Apr 2023 00:17:40 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id dx24so26628025ejb.11 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=S6OKWYCx+SERjvCeNEhh/nsCEion211Uq6vqzixc0FSjPhpGf/6LYYwS8kgFopGGvK 808VDljqWlFGbhGuqmH/2vQTRedIEnEuIE//q87bhiubm7xgNsQvyHHpCJK3uEyQtZEb FU+LeOoZrtC1uULPIN7FPLvTHBH0IE/7fzoMl0lfn1HD6/NoQiDkvQqpzbxyDVzpQqTz fh+64c7BOuL961ltsn3EDAqZdv3a7XEjQNA+J0VUew+QEKhkgQa/etKIHWVJwYkezzU1 ESYGNjo7Er/sAJtwGmn53bwYpPg184146zXiQw5r8Hn9R7/ZW3iPiNbiXpmKMbndz9bI MxMQ== X-Gm-Message-State: AAQBX9eDxsKXqCnxXh6XKMmbxwdiYAsVMqPUn2wgX4yYcXXFQQ2iCwPE DmADSPJ1fEjoMERjfjGCddodXw== X-Google-Smtp-Source: AKy350bAkWVl+XYvxmriffnnb74UY1uIU97uVqnXr+WVguAl9Pts7pqYHINrsGBnvP5Bw/Ypam3jgQ== 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 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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: