Commit 52ebee92 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

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.
parents 47820d32 672b584c

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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

include/dt-bindings/power/qcom-rpmpd.h

+9 −0
Original line number Diff line number Diff line
@@ -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