Skip to content

Commit fd662c4

Browse files
committed
Merge branch '[email protected]' into clk-for-6.15
Merge SDM429 RPM clock controller binding update through topic branch, to make the clock constants available for the DeviceTree branch as well.
2 parents d81901a + ee9fdb4 commit fd662c4

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- qcom,rpmcc-msm8998
4545
- qcom,rpmcc-qcm2290
4646
- qcom,rpmcc-qcs404
47+
- qcom,rpmcc-sdm429
4748
- qcom,rpmcc-sdm660
4849
- qcom,rpmcc-sm6115
4950
- qcom,rpmcc-sm6125
@@ -123,6 +124,7 @@ allOf:
123124
- qcom,rpmcc-msm8998
124125
- qcom,rpmcc-qcm2290
125126
- qcom,rpmcc-qcs404
127+
- qcom,rpmcc-sdm429
126128
- qcom,rpmcc-sdm660
127129
- qcom,rpmcc-sm6115
128130
- qcom,rpmcc-sm6125

include/dt-bindings/clock/qcom,rpmcc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,9 @@
170170
#define RPM_SMD_BIMC_FREQ_LOG 124
171171
#define RPM_SMD_LN_BB_CLK_PIN 125
172172
#define RPM_SMD_LN_BB_A_CLK_PIN 126
173+
#define RPM_SMD_BB_CLK3 127
174+
#define RPM_SMD_BB_CLK3_A 128
175+
#define RPM_SMD_BB_CLK3_PIN 129
176+
#define RPM_SMD_BB_CLK3_A_PIN 130
173177

174178
#endif

0 commit comments

Comments
 (0)