diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2025-02-14 11:01:39 -0600 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2025-02-14 11:01:39 -0600 |
| commit | fd662c41caf5cce5aa9f7e56f5622082beaeaf4c (patch) | |
| tree | 392aefe84743ae056ef6446e4c13d83d000608c5 | |
| parent | d81901a5406eaf65a097b80ab48edc398de598a5 (diff) | |
| parent | ee9fdb415639032d1bb1b59b83f210958e29764f (diff) | |
Merge branch '20250212-sdm429-rpm-v1-1-0a24ac19a478@mainlining.org' 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.
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/qcom,rpmcc.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml b/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml index be3835e2e043..90cd3feab5fa 100644 --- a/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml @@ -44,6 +44,7 @@ properties: - qcom,rpmcc-msm8998 - qcom,rpmcc-qcm2290 - qcom,rpmcc-qcs404 + - qcom,rpmcc-sdm429 - qcom,rpmcc-sdm660 - qcom,rpmcc-sm6115 - qcom,rpmcc-sm6125 @@ -123,6 +124,7 @@ allOf: - qcom,rpmcc-msm8998 - qcom,rpmcc-qcm2290 - qcom,rpmcc-qcs404 + - qcom,rpmcc-sdm429 - qcom,rpmcc-sdm660 - qcom,rpmcc-sm6115 - qcom,rpmcc-sm6125 diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h index 46309c9953b2..1477a75e7f6d 100644 --- a/include/dt-bindings/clock/qcom,rpmcc.h +++ b/include/dt-bindings/clock/qcom,rpmcc.h @@ -170,5 +170,9 @@ #define RPM_SMD_BIMC_FREQ_LOG 124 #define RPM_SMD_LN_BB_CLK_PIN 125 #define RPM_SMD_LN_BB_A_CLK_PIN 126 +#define RPM_SMD_BB_CLK3 127 +#define RPM_SMD_BB_CLK3_A 128 +#define RPM_SMD_BB_CLK3_PIN 129 +#define RPM_SMD_BB_CLK3_A_PIN 130 #endif |