Skip to content

Commit 57a9d4b

Browse files
committed
Merge branch '20230411-topic-hanaau-v2-1-fd3d70844b31@linaro.org' into arm64-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.
2 parents a14da61 + 672b584 commit 57a9d4b

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- qcom,qcm2290-rpmpd
3030
- qcom,qcs404-rpmpd
3131
- qcom,qdu1000-rpmhpd
32+
- qcom,sa8155p-rpmhpd
3233
- qcom,sa8540p-rpmhpd
3334
- qcom,sa8775p-rpmhpd
3435
- qcom,sdm660-rpmpd

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,15 @@
9090
#define SM8150_MMCX 9
9191
#define SM8150_MMCX_AO 10
9292

93+
/* SA8155P is a special case, kept for backwards compatibility */
94+
#define SA8155P_CX SM8150_CX
95+
#define SA8155P_CX_AO SM8150_CX_AO
96+
#define SA8155P_EBI SM8150_EBI
97+
#define SA8155P_GFX SM8150_GFX
98+
#define SA8155P_MSS SM8150_MSS
99+
#define SA8155P_MX SM8150_MX
100+
#define SA8155P_MX_AO SM8150_MX_AO
101+
93102
/* SM8250 Power Domain Indexes */
94103
#define SM8250_CX 0
95104
#define SM8250_CX_AO 1

0 commit comments

Comments
 (0)