diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-10-26 17:21:46 +0300 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-10-26 17:21:46 +0300 |
| commit | 11cc498cf875c1242006f5b8028800c11673b8d5 (patch) | |
| tree | 4e031faf971e24ebe35bf002293c3501ed69b6c1 | |
| parent | 1df91d85f29f4f1bf34b74e63a5df4f5943f18c1 (diff) | |
| parent | c638b9516abd60aebccdbded5041a3e9d1c519f3 (diff) | |
| download | linux-11cc498cf875c1242006f5b8028800c11673b8d5.tar.xz | |
pmdomain: Merge branch genpd_dt into next
Merge the immutable branch genpd_dt into next, to allow the DT bindings to
be tested together with new pmdomain changes that are targeted for v6.7.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
| -rw-r--r-- | Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 2 | ||||
| -rw-r--r-- | include/dt-bindings/power/qcom,rpmhpd.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index d38c762e1280..da9c5846f4e1 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -39,6 +39,7 @@ properties: - qcom,sc7280-rpmhpd - qcom,sc8180x-rpmhpd - qcom,sc8280xp-rpmhpd + - qcom,sc8380xp-rpmhpd - qcom,sdm660-rpmpd - qcom,sdm670-rpmhpd - qcom,sdm845-rpmhpd @@ -55,6 +56,7 @@ properties: - qcom,sm8350-rpmhpd - qcom,sm8450-rpmhpd - qcom,sm8550-rpmhpd + - qcom,sm8650-rpmhpd - items: - enum: - qcom,msm8937-rpmpd diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h index 7c201a66bc69..e54ffa361451 100644 --- a/include/dt-bindings/power/qcom,rpmhpd.h +++ b/include/dt-bindings/power/qcom,rpmhpd.h @@ -26,5 +26,7 @@ #define RPMHPD_QPHY 16 #define RPMHPD_DDR 17 #define RPMHPD_XO 18 +#define RPMHPD_NSP2 19 +#define RPMHPD_GMXC 20 #endif |