diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2023-05-25 06:39:16 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-05-25 06:39:16 +0300 |
| commit | 52ebee922b638c828d427345fadacc936fd2807f (patch) | |
| tree | 6b80627fcefd8ec306ce3a4b8df333c5eceffa9f | |
| parent | 47820d3263a4a7ba258fe2efe26ae5afb5b83036 (diff) | |
| parent | 672b584c68de309017cd2ce8938856c9b7c1b70e (diff) | |
| download | linux-52ebee922b638c828d427345fadacc936fd2807f.tar.xz | |
Merge branch '20230411-topic-hanaau-v2-1-fd3d70844b31@linaro.org' into drivers-fixes-for-6.4
Merge the RPMPD DeviceTree binding update through a topic branch, so
make the constants available to both driver and DeviceTree source
branches. Keep the two parts on separate branches to allow merge-back if
necessary towards v6.5.
| -rw-r--r-- | Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 1 | ||||
| -rw-r--r-- | include/dt-bindings/power/qcom-rpmpd.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index afad3135ed67..f9c211a9a938 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -29,6 +29,7 @@ properties: - qcom,qcm2290-rpmpd - qcom,qcs404-rpmpd - qcom,qdu1000-rpmhpd + - qcom,sa8155p-rpmhpd - qcom,sa8540p-rpmhpd - qcom,sa8775p-rpmhpd - qcom,sdm660-rpmpd diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 1bf8e87ecd7e..867b18e041ea 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h @@ -90,6 +90,15 @@ #define SM8150_MMCX 9 #define SM8150_MMCX_AO 10 +/* SA8155P is a special case, kept for backwards compatibility */ +#define SA8155P_CX SM8150_CX +#define SA8155P_CX_AO SM8150_CX_AO +#define SA8155P_EBI SM8150_EBI +#define SA8155P_GFX SM8150_GFX +#define SA8155P_MSS SM8150_MSS +#define SA8155P_MX SM8150_MX +#define SA8155P_MX_AO SM8150_MX_AO + /* SM8250 Power Domain Indexes */ #define SM8250_CX 0 #define SM8250_CX_AO 1 |