From patchwork Thu Sep 1 08:56:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 602481 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 A56B6ECAAD1 for ; Thu, 1 Sep 2022 08:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234293AbiIAI4a (ORCPT ); Thu, 1 Sep 2022 04:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234294AbiIAI4R (ORCPT ); Thu, 1 Sep 2022 04:56:17 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36C1012D50C for ; Thu, 1 Sep 2022 01:56:13 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id v26so13189724lfd.10 for ; Thu, 01 Sep 2022 01:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=7mCanjn29Z/rrHV7lcGYwLLR3hfJpckAbbzYP2xrGHY=; b=WPhWWn/baRHPBIBTEDEdWZ2nx+15sKff267S+Q6FCaFGh8NLGl2u2ZdG+7cQs30JKD zfdalCK+Wf2le44fT7f5mk6UFHaaBnAqj0tb98hVhWSvrS1NZ4OVKHnuUThrlq1Qmo52 7FTUtGY4cwW8+K82DVBHc0ZHgG8B/FZKZonMgktGavPLOqgB8vHjkHk400bGLRzLmsb3 Db5ffWVKuGlL9BByhao1ceTrKIIxqPctrXMrphcxCNApQgg2/rZwnQSRTFKXAtyJBoRi s9wT7Ip5/U6xvY3Vjx6bpXyzUOtf2ZX6333qshrxiSYAwMWZTGa5v0k8bqYKV2/DVp8u 5xjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=7mCanjn29Z/rrHV7lcGYwLLR3hfJpckAbbzYP2xrGHY=; b=jwVnVY2VGF7E8RSSOBT4hwnDohlrbKEENjqdRlc9aTUsHcYS1ZlQixomawZPmJKmkw xPM8ghcA21bjD5z9R8NEREFdwbhijXuTvpaGKkhmeXAHwq7pySZ2TxRm663WqxLlBYnz /SQbN5tqai4a03FS242feT3Qv7qA9qjGB/fPgynYhGa5JRGi9Sk8EhGg2Si3Pp3UJ1p9 FY5au7w5FVuQoVopTaNuJPz7niAAZPOdbYXNXeUfOo0dO4ASqBepQeyh0aeC5Vd8UisV n3GkRuholI8FTjEK/MaMzD5KwJNDvvA5P5f4OGoeCw1V5EnHpH+dCjpfDyRqWgU3TurB b+rw== X-Gm-Message-State: ACgBeo23VUn4P6px6l5IimsDMh3HwVWKFT3UAo6xphpJuk2bnIyB0Pvk JIZHgv9LJgTYgVied1lAsN6fgw== X-Google-Smtp-Source: AA6agR7z1Q9kJzKNUjrW5qttM4Ya/9QfDlxxbWpVIibldU9XBDwYcNl6KP/AHntIAF9zWQCYSFv1VQ== X-Received: by 2002:a05:6512:ad3:b0:492:d78f:2c09 with SMTP id n19-20020a0565120ad300b00492d78f2c09mr9793826lfu.99.1662022571822; Thu, 01 Sep 2022 01:56:11 -0700 (PDT) Received: from krzk-bin.. (balticom-73-99-134.balticom.lv. [109.73.99.134]) by smtp.gmail.com with ESMTPSA id c20-20020a056512075400b004947984bc78sm883856lfs.188.2022.09.01.01.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 01:56:11 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH RFT 1/3] dt-bindings: soc: qcom: smd-rpm: add PMIC regulators nodes Date: Thu, 1 Sep 2022 11:56:07 +0300 Message-Id: <20220901085609.95624-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The Qualcomm RPM over SMD contains devices for one or two PMIC regulators - already used in several DTS files. Signed-off-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml index 09d5bfa920f2..deccc637b6d4 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml @@ -61,6 +61,11 @@ properties: items: - const: rpm_requests +patternProperties: + "^regulators(-[01])?$": + $ref: /schemas/regulator/qcom,smd-rpm-regulator.yaml# + unevaluatedProperties: false + if: properties: compatible: From patchwork Thu Sep 1 08:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 601854 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 9AE41C54EE9 for ; Thu, 1 Sep 2022 08:56:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234294AbiIAI4b (ORCPT ); Thu, 1 Sep 2022 04:56:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234258AbiIAI4U (ORCPT ); Thu, 1 Sep 2022 04:56:20 -0400 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80CF512D539 for ; Thu, 1 Sep 2022 01:56:14 -0700 (PDT) Received: by mail-lj1-x236.google.com with SMTP id q16so17156607ljp.8 for ; Thu, 01 Sep 2022 01:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=R4lf3dEer0vPud9r0M9Q82OVYzKOE4VmrHcOQ1wXewU=; b=N/znKsmHhXm8bYuzkx7yNjeWw0Oi6XeU762er+IZu9W6tiNsBzNyQfyFOL76Rsxm9c ShBUs1cfSvNVZNqAm8KXXWYkZLE5090R/kbXlX4+Ck5mQeu+gYkQUdaSAqAQmak3GJoA j8hm1kip0Tgs5FMnCt27aw7IYIBl9gnn7Ml/U/mgmS3dn1pboJt2ZFzCcY6IKlUmC9Dr 0ce16921KHz/g/vYWfLUnoRaUia+uS3L17pRbbmS1BDnlNmay/+jEV64e5TtF3ITkHBy wBUsmZ3BOTcCYsp8DZijqWZY6ltdRUtyRdVIhdirhvVXAgcSqdk79qad8mosV80ltSWi 9Vyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=R4lf3dEer0vPud9r0M9Q82OVYzKOE4VmrHcOQ1wXewU=; b=mlGJZHO0pK6IfbGBsdFVs6j4Rd5DM7eTL4ZEeioyJTwMKGPHLRRfonR9QejGNsvgSF eQfeZr2PVEePfdqvlkb1eMbfh/87PgDCgG22Qf9WipoGlmY+QVF+cDl2FDF73ijSzP9v iKTPNkvNv1jqGUMcBNFv09KdcNcn0pZpn5+HoCI2JNsKJW4Gxd8b/eAlPg2zMcFhiXEU IgPLOXNvv45ZPLAIAYUVUPPhOxZtIkVZJF5nDXn9Zqu49ghQg+VesSnSG9MRlcu8jvFC R1ZtyMutCyxxkUjJ49POdgjy8olN/2/L69dMU4TLEWnlLiZAywEYcwzi9FFRDk7l0NXz fV/Q== X-Gm-Message-State: ACgBeo2DeqdLL2eS/S/YI+BsnHZhGMS8nmuF9yJQbs5jGS2D29LTrSBB POTidIjhem4BztlI32mpwBm1/w== X-Google-Smtp-Source: AA6agR5ghEOC5Hw7ojJWwRLshH/M7n8/BroyBqdzk6lEMoo0vYUdFuTf37vST1Qd0mqSzGjceBzDdA== X-Received: by 2002:a05:651c:1953:b0:268:983a:c6de with SMTP id bs19-20020a05651c195300b00268983ac6demr1763841ljb.218.1662022572998; Thu, 01 Sep 2022 01:56:12 -0700 (PDT) Received: from krzk-bin.. (balticom-73-99-134.balticom.lv. [109.73.99.134]) by smtp.gmail.com with ESMTPSA id c20-20020a056512075400b004947984bc78sm883856lfs.188.2022.09.01.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 01:56:12 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH RFT 2/3] arm64: dts: qcom: align RPM regulators node name with bindings Date: Thu, 1 Sep 2022 11:56:08 +0300 Message-Id: <20220901085609.95624-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220901085609.95624-1-krzysztof.kozlowski@linaro.org> References: <20220901085609.95624-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Node names should be generic and new DT schema expects RPM regulators node to be just "regulators". Rename them while keeping similar naming style within PMIC families on different boards, e.g. pm660l-regulators -> regulators-0 pm660-regulators -> regulators-1 which creates in few places big diff. Signed-off-by: Krzysztof Kozlowski --- Not tested on hardware, but I do not expect functional impact. --- arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 2 +- .../dts/qcom/msm8996-sony-xperia-tone.dtsi | 2 +- .../boot/dts/qcom/msm8996-xiaomi-common.dtsi | 4 +- .../boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- .../boot/dts/qcom/msm8996-xiaomi-natrium.dts | 2 +- .../boot/dts/qcom/msm8996-xiaomi-scorpio.dts | 2 +- .../boot/dts/qcom/msm8998-clamshell.dtsi | 2 +- .../boot/dts/qcom/msm8998-fxtec-pro1.dts | 4 +- arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 4 +- .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 +- .../dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 4 +- .../boot/dts/qcom/sda660-inforce-ifc6560.dts | 166 +++++++++--------- .../dts/qcom/sdm630-sony-xperia-nile.dtsi | 4 +- .../boot/dts/qcom/sdm660-xiaomi-lavender.dts | 4 +- 14 files changed, 103 insertions(+), 103 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi index 539823b2c36e..8cac23b5240c 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi @@ -47,7 +47,7 @@ &usb_hs_phy { }; &rpm_requests { - smd_rpm_regulators: pm8916-regulators { + smd_rpm_regulators: regulators { compatible = "qcom,rpm-pm8916-regulators"; /* pm8916_s1 is managed by rpmpd (MSM8916_VDDCX) */ diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi index e165b5e890a0..9c74c3b7b08c 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi @@ -629,7 +629,7 @@ &pmi8994_wled { }; &rpm_requests { - pm8994-regulators { + regulators-0 { compatible = "qcom,rpm-pm8994-regulators"; vdd_s1-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi index 627649979891..60f13da46ada 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi @@ -370,7 +370,7 @@ &wcd9335 { }; &rpm_requests { - pm8994-regulators { + regulators-0 { compatible = "qcom,rpm-pm8994-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -555,7 +555,7 @@ vreg_lvs2a_1p8: lvs2 { }; }; - pmi8994-regulators { + regulators-1 { compatible = "qcom,rpm-pmi8994-regulators"; vdd_s1-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts index 25f30ec277c1..3d84bab35f78 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts @@ -218,7 +218,7 @@ &venus { }; &rpm_requests { - pm8994-regulators { + regulators-0 { vreg_l17a_2p8: l17 { regulator-name = "vreg_l17a_2p8"; regulator-min-microvolt = <2500000>; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts index ff4673ee9e81..7526f8f473b5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-natrium.dts @@ -164,7 +164,7 @@ &venus { }; &rpm_requests { - pm8994-regulators { + regulators-0 { vreg_l3a_0p875: l3 { regulator-name = "vreg_l3a_0p875"; regulator-min-microvolt = <850000>; diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts index 30a9e4bed4af..8937d0c1b649 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-scorpio.dts @@ -196,7 +196,7 @@ &venus { }; &rpm_requests { - pm8994-regulators { + regulators-0 { vreg_l3a_0p875: l3 { regulator-name = "vreg_l3a_0p875"; regulator-min-microvolt = <850000>; diff --git a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi index 7928b8197474..63413e39572c 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-clamshell.dtsi @@ -137,7 +137,7 @@ &qusb2phy { }; &rpm_requests { - pm8998-regulators { + regulators-0 { compatible = "qcom,rpm-pm8998-regulators"; vdd_s1-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts index 429ba57e20f7..a7a79ddd3bea 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts @@ -390,7 +390,7 @@ &replicator1 { }; &rpm_requests { - pm8998-regulators { + regulators-0 { compatible = "qcom,rpm-pm8998-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -588,7 +588,7 @@ vreg_lvs2a_1p8: lvs2 { }; - pmi8998-regulators { + regulators-1 { compatible = "qcom,rpm-pmi8998-regulators"; vdd_bob-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dts b/arch/arm64/boot/dts/qcom/msm8998-mtp.dts index a3ca58100aee..abea3ffa0094 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dts @@ -168,7 +168,7 @@ &replicator1 { }; &rpm_requests { - pm8998-regulators { + regulators-0 { compatible = "qcom,rpm-pm8998-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -366,7 +366,7 @@ vreg_lvs2a_1p8: lvs2 { }; - pmi8998-regulators { + regulators-1 { compatible = "qcom,rpm-pmi8998-regulators"; vdd_bob-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi index 62bda23791bb..3af6deed2e86 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi @@ -288,7 +288,7 @@ &qusb2phy { }; &rpm_requests { - pm8998-regulators { + regulators-0 { compatible = "qcom,rpm-pm8998-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -477,7 +477,7 @@ vreg_l28_3p0: l28 { vreg_lvs2a_1p8: lvs2 { }; }; - pmi8998-regulators { + regulators-1 { compatible = "qcom,rpm-pmi8998-regulators"; vdd_bob-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi index d08639082247..47cd3caa6927 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi @@ -375,7 +375,7 @@ &qusb2phy { }; &rpm_requests { - pm8998-regulators { + regulators-0 { compatible = "qcom,rpm-pm8998-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -538,7 +538,7 @@ vreg_l28_3p0: l28 { vreg_lvs2a_1p8: lvs2 { }; }; - pmi8998-regulators { + regulators-1 { compatible = "qcom,rpm-pmi8998-regulators"; vdd_bob-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts index 28050bc5f081..02dfcece7d69 100644 --- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts +++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts @@ -231,89 +231,7 @@ &qusb2phy1 { }; &rpm_requests { - pm660-regulators { - compatible = "qcom,rpm-pm660-regulators"; - - vdd_s1-supply = <&vph_pwr>; - vdd_s2-supply = <&vph_pwr>; - vdd_s3-supply = <&vph_pwr>; - vdd_s4-supply = <&vph_pwr>; - vdd_s5-supply = <&vph_pwr>; - vdd_s6-supply = <&vph_pwr>; - - vdd_l1_l6_l7-supply = <&vreg_s5a_1p35>; - vdd_l2_l3-supply = <&vreg_s2b_1p05>; - vdd_l5-supply = <&vreg_s2b_1p05>; - vdd_l8_l9_l10_l11_l12_l13_l14-supply = <&vreg_s4a_2p04>; - vdd_l15_l16_l17_l18_l19-supply = <&vreg_bob>; - - vreg_s4a_2p04: s4 { - regulator-min-microvolt = <1805000>; - regulator-max-microvolt = <2040000>; - regulator-enable-ramp-delay = <200>; - regulator-ramp-delay = <0>; - regulator-always-on; - }; - - vreg_s5a_1p35: s5 { - regulator-min-microvolt = <1224000>; - regulator-max-microvolt = <1350000>; - regulator-enable-ramp-delay = <200>; - regulator-ramp-delay = <0>; - }; - - vreg_l1a_1p225: l1 { - regulator-min-microvolt = <1150000>; - regulator-max-microvolt = <1250000>; - regulator-enable-ramp-delay = <250>; - regulator-allow-set-load; - }; - - vreg_l6a_1p3: l6 { - regulator-min-microvolt = <1304000>; - regulator-max-microvolt = <1368000>; - regulator-enable-ramp-delay = <250>; - regulator-ramp-delay = <0>; - regulator-allow-set-load; - }; - - vreg_l8a_1p8: l8 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-enable-ramp-delay = <250>; - regulator-ramp-delay = <0>; - regulator-system-load = <325000>; - regulator-allow-set-load; - }; - - vreg_l9a_1p8: l9 { - regulator-min-microvolt = <1804000>; - regulator-max-microvolt = <1896000>; - regulator-enable-ramp-delay = <250>; - regulator-ramp-delay = <0>; - regulator-allow-set-load; - }; - - vreg_l13a_1p8: l13 { - /* This gives power to the LPDDR4: never turn it off! */ - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1944000>; - regulator-enable-ramp-delay = <250>; - regulator-ramp-delay = <0>; - regulator-always-on; - regulator-boot-on; - }; - - vreg_l19a_3p3: l19 { - regulator-min-microvolt = <3312000>; - regulator-max-microvolt = <3400000>; - regulator-enable-ramp-delay = <250>; - regulator-ramp-delay = <0>; - regulator-allow-set-load; - }; - }; - - pm660l-regulators { + regulators-0 { compatible = "qcom,rpm-pm660l-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -398,6 +316,88 @@ vreg_bob: bob { regulator-ramp-delay = <0>; }; }; + + regulators-1 { + compatible = "qcom,rpm-pm660-regulators"; + + vdd_s1-supply = <&vph_pwr>; + vdd_s2-supply = <&vph_pwr>; + vdd_s3-supply = <&vph_pwr>; + vdd_s4-supply = <&vph_pwr>; + vdd_s5-supply = <&vph_pwr>; + vdd_s6-supply = <&vph_pwr>; + + vdd_l1_l6_l7-supply = <&vreg_s5a_1p35>; + vdd_l2_l3-supply = <&vreg_s2b_1p05>; + vdd_l5-supply = <&vreg_s2b_1p05>; + vdd_l8_l9_l10_l11_l12_l13_l14-supply = <&vreg_s4a_2p04>; + vdd_l15_l16_l17_l18_l19-supply = <&vreg_bob>; + + vreg_s4a_2p04: s4 { + regulator-min-microvolt = <1805000>; + regulator-max-microvolt = <2040000>; + regulator-enable-ramp-delay = <200>; + regulator-ramp-delay = <0>; + regulator-always-on; + }; + + vreg_s5a_1p35: s5 { + regulator-min-microvolt = <1224000>; + regulator-max-microvolt = <1350000>; + regulator-enable-ramp-delay = <200>; + regulator-ramp-delay = <0>; + }; + + vreg_l1a_1p225: l1 { + regulator-min-microvolt = <1150000>; + regulator-max-microvolt = <1250000>; + regulator-enable-ramp-delay = <250>; + regulator-allow-set-load; + }; + + vreg_l6a_1p3: l6 { + regulator-min-microvolt = <1304000>; + regulator-max-microvolt = <1368000>; + regulator-enable-ramp-delay = <250>; + regulator-ramp-delay = <0>; + regulator-allow-set-load; + }; + + vreg_l8a_1p8: l8 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-enable-ramp-delay = <250>; + regulator-ramp-delay = <0>; + regulator-system-load = <325000>; + regulator-allow-set-load; + }; + + vreg_l9a_1p8: l9 { + regulator-min-microvolt = <1804000>; + regulator-max-microvolt = <1896000>; + regulator-enable-ramp-delay = <250>; + regulator-ramp-delay = <0>; + regulator-allow-set-load; + }; + + vreg_l13a_1p8: l13 { + /* This gives power to the LPDDR4: never turn it off! */ + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1944000>; + regulator-enable-ramp-delay = <250>; + regulator-ramp-delay = <0>; + regulator-always-on; + regulator-boot-on; + }; + + vreg_l19a_3p3: l19 { + regulator-min-microvolt = <3312000>; + regulator-max-microvolt = <3400000>; + regulator-enable-ramp-delay = <250>; + regulator-ramp-delay = <0>; + regulator-allow-set-load; + }; + }; }; &sdc2_state_on { diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi index 09c07800793a..f9e1d599466a 100644 --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi @@ -260,7 +260,7 @@ &qusb2phy0 { }; &rpm_requests { - pm660l-regulators { + regulators-0 { compatible = "qcom,rpm-pm660l-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -394,7 +394,7 @@ vreg_bob: bob { }; }; - pm660-regulators { + regulators-1 { compatible = "qcom,rpm-pm660-regulators"; vdd_s1-supply = <&vph_pwr>; diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts index a3559f6e34a5..fea2c3e416e5 100644 --- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts +++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts @@ -111,7 +111,7 @@ &qusb2phy0 { }; &rpm_requests { - pm660l-regulators { + regulators-0 { compatible = "qcom,rpm-pm660l-regulators"; vdd_s1-supply = <&vph_pwr>; @@ -206,7 +206,7 @@ vreg_bob: bob { }; }; - pm660-regulators { + regulators-1 { compatible = "qcom,rpm-pm660-regulators"; vdd_s1-supply = <&vph_pwr>; From patchwork Thu Sep 1 08:56:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 602480 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 8C614ECAAD1 for ; Thu, 1 Sep 2022 08:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234318AbiIAI4d (ORCPT ); Thu, 1 Sep 2022 04:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234298AbiIAI4U (ORCPT ); Thu, 1 Sep 2022 04:56:20 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81EFF12DA1B for ; Thu, 1 Sep 2022 01:56:16 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id s15so12027523ljp.5 for ; Thu, 01 Sep 2022 01:56:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Jy+Nx5e1wupR0KzXVzggqv8qHhtxj0ywC7sePqykO6s=; b=cpJLrjHLKTid6qkNL+p/FQKdSQ6xfVk28iz7axyGk8I9DbR7rqm4XUBl4sGWTK36mG v1LlB6E6BcMDdmrIypMdIZ9vxbcPq0whVOSG+519HQRRjeHI/VLMivWQ1l6PPGyS9WH9 TFQpLsAkhUwN2P58dCXeUjh9yxMeXyYdNMB7/cDHqtLgMFsvOUNMtWhzZoEumHlqAo7k PiiWag83yNGYIE07Xr/eEplE94+KAFcLPn2fGFDXA86KzgVH9+T+Yc8SFzzYMxGwBRJL LydO4IPTkWn4wHMc0dGbc9gyKZ9mH1E6ugqusW2r85MVxn6bZBF2OZwqaTaGWVLhgFsg E8ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Jy+Nx5e1wupR0KzXVzggqv8qHhtxj0ywC7sePqykO6s=; b=N9b+e7W0HYei2eIriJDoCoMvuCWn2uLTnjEtDviXwL66GKjTdHrv4bsxfDY1LJFb1q jnqrMS5GxZnCm6bTv0rW00UgrdN/EDYoRMYSPEYeCkR7f6HNENaPL50DtlAWb/mhhwQQ wgisxkULgI4c7zD6WEsI9Z3YnVEv0w7fP+Ko3P+jqixQQGroMK19K/wTL5MjmR+p9/5E QXazeG1gzEWdxrMTrtF/nLb//Ex6QYQssrTE9qfBjQSvTbcO7mEanfpFJmpMfKdMIY+I B23Ni59zyYUjZRYvQ1msf9smDNdP6OKenkd5Q8/qNFBPDgfntbdDMIxmhyX++cj1wnrQ SoIQ== X-Gm-Message-State: ACgBeo1Mv6Gv16hZ8sKahULjiSval+CVJv/YnY7T2bAydmuHhdYOuFMP aZbRsEpG7H3A4fb2sOXRD3qLPQ== X-Google-Smtp-Source: AA6agR4SzbwimpRvnEDcVRpNXMzxY+xQNigfkYzUlA95yqrR9gR/a2LSxZyVtcanXaMR5LdXdpioMw== X-Received: by 2002:a2e:9d8b:0:b0:265:b87d:b43b with SMTP id c11-20020a2e9d8b000000b00265b87db43bmr5196954ljj.531.1662022574317; Thu, 01 Sep 2022 01:56:14 -0700 (PDT) Received: from krzk-bin.. (balticom-73-99-134.balticom.lv. [109.73.99.134]) by smtp.gmail.com with ESMTPSA id c20-20020a056512075400b004947984bc78sm883856lfs.188.2022.09.01.01.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 01:56:13 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH RFT 3/3] ARM: dts: qcom: align RPM regulators node name with bindings Date: Thu, 1 Sep 2022 11:56:09 +0300 Message-Id: <20220901085609.95624-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220901085609.95624-1-krzysztof.kozlowski@linaro.org> References: <20220901085609.95624-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Node names should be generic and new DT schema expects RPM regulators node to be just "regulators". Signed-off-by: Krzysztof Kozlowski --- Not tested on hardware, but I do not expect functional impact. --- arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 2 +- arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 2 +- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 4 ++-- arch/arm/boot/dts/qcom-apq8084.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 4 ++-- arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 4 ++-- arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts | 4 ++-- arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts | 2 +- .../boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts index ace8cea27949..2908a8a8a3d0 100644 --- a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts +++ b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts @@ -81,7 +81,7 @@ &pm8226_vib { }; &rpm_requests { - pm8226-regulators { + regulators { compatible = "qcom,rpm-pm8226-regulators"; pm8226_s3: s3 { diff --git a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts index 2b7e52fda6a7..e5bdc12123ce 100644 --- a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts +++ b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts @@ -102,7 +102,7 @@ bluetooth { }; &rpm_requests { - pm8226-regulators { + regulators { compatible = "qcom,rpm-pm8226-regulators"; pm8226_s3: s3 { diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts index 3051a861ff0c..86ba9165c2b3 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -57,7 +57,7 @@ phy@b { }; &rpm_requests { - pm8841-regulators { + regulators-0 { compatible = "qcom,rpm-pm8841-regulators"; pm8841_s1: s1 { @@ -81,7 +81,7 @@ pm8841_s4: s4 { }; }; - pm8941-regulators { + regulators-1 { compatible = "qcom,rpm-pm8941-regulators"; vdd_l1_l3-supply = <&pm8941_s1>; diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi index c2e22bf3260d..2f4e4ac686a5 100644 --- a/arch/arm/boot/dts/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -479,7 +479,7 @@ rpm-requests { compatible = "qcom,rpm-apq8084"; qcom,smd-channels = "rpm_requests"; - pma8084-regulators { + regulators-0 { compatible = "qcom,rpm-pma8084-regulators"; pma8084_s1: s1 {}; diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts index ec5d340562b6..8a3761ed9655 100644 --- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts +++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts @@ -344,7 +344,7 @@ led@5 { }; &rpm_requests { - pm8841-regulators { + regulators-0 { compatible = "qcom,rpm-pm8841-regulators"; pm8841_s1: s1 { @@ -368,7 +368,7 @@ pm8841_s4: s4 { }; }; - pm8941-regulators { + regulators-1 { compatible = "qcom,rpm-pm8941-regulators"; vdd_l1_l3-supply = <&pm8941_s1>; diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi index 5a70683d9103..320c9bf397f8 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi @@ -214,7 +214,7 @@ &pm8941_wled { }; &rpm_requests { - pm8841-regulators { + regulators-0 { compatible = "qcom,rpm-pm8841-regulators"; pm8841_s1: s1 { @@ -238,7 +238,7 @@ pm8841_s4: s4 { }; }; - pm8941-regulators { + regulators-1 { compatible = "qcom,rpm-pm8941-regulators"; vdd_l1_l3-supply = <&pm8941_s1>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts index ff6e0066768b..9107bc6f24db 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts @@ -190,7 +190,7 @@ &remoteproc_mss { }; &rpm_requests { - pm8841-regulators { + regulators-0 { compatible = "qcom,rpm-pm8841-regulators"; pm8841_s1: s1 { @@ -209,7 +209,7 @@ pm8841_s3: s3 { }; }; - pm8941-regulators { + regulators-1 { compatible = "qcom,rpm-pm8941-regulators"; vdd_l1_l3-supply = <&pm8941_s1>; diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts index 983e10c3d863..156023204c1e 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts @@ -470,7 +470,7 @@ &remoteproc_mss { }; &rpm_requests { - pma8084-regulators { + regulators-0 { compatible = "qcom,rpm-pma8084-regulators"; pma8084_s1: s1 { diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 3f45f5c5d37b..e4580ed996e6 100644 --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -319,7 +319,7 @@ led@7 { }; &rpm_requests { - pm8941-regulators { + regulators-0 { compatible = "qcom,rpm-pm8941-regulators"; vdd_l1_l3-supply = <&pm8941_s1>;