summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hansson <ulfh@kernel.org>2026-09-01 17:39:26 +0200
committerUlf Hansson <ulfh@kernel.org>2026-09-01 17:39:26 +0200
commit222deff437bc2bdb58a599c1ffdc20573f59bdf6 (patch)
tree51694ceb154687ffdbcd71e3edb41ee17266c9c1
parent034bc75d32e90df344aef4fca60c51cc40cb6080 (diff)
parente1d70a075a0335efcb254a3bdd1472f9687579dc (diff)
downloadlinux-next-222deff437bc2bdb58a599c1ffdc20573f59bdf6.tar.gz
linux-next-222deff437bc2bdb58a599c1ffdc20573f59bdf6.zip
pmdomain: Merge branch dt into next
Merge the immutable branch dt into next, to allow the updated DT bindings to be tested together with the pmdomain changes that are targeted for the next release. Signed-off-by: Ulf Hansson <ulfh@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/power/qcom,rpmpd.yaml2
-rw-r--r--include/dt-bindings/power/qcom,rpmhpd.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
index 0a45e1f55062..a70bfacbc5d1 100644
--- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
+++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
@@ -21,6 +21,7 @@ properties:
- qcom,glymur-rpmhpd
- qcom,hawi-rpmhpd
- qcom,kaanapali-rpmhpd
+ - qcom,kuno-rpmhpd
- qcom,mdm9607-rpmpd
- qcom,milos-rpmhpd
- qcom,msm8226-rpmpd
@@ -63,6 +64,7 @@ properties:
- qcom,sm6350-rpmhpd
- qcom,sm6375-rpmpd
- qcom,sm7150-rpmhpd
+ - qcom,sm7250-rpmhpd
- qcom,sm8150-rpmhpd
- qcom,sm8250-rpmhpd
- qcom,sm8350-rpmhpd
diff --git a/include/dt-bindings/power/qcom,rpmhpd.h b/include/dt-bindings/power/qcom,rpmhpd.h
index 07bd2a7b0150..92c8408dbc57 100644
--- a/include/dt-bindings/power/qcom,rpmhpd.h
+++ b/include/dt-bindings/power/qcom,rpmhpd.h
@@ -32,6 +32,7 @@
#define RPMHPD_GBX 22
#define RPMHPD_NSP3 23
#define RPMHPD_GFX1 24
+#define RPMHPD_NMXC 25
/* RPMh Power Domain performance levels */
#define RPMH_REGULATOR_LEVEL_RETENTION 16