diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2026-08-31 15:11:45 -0500 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@oss.qualcomm.com> | 2026-09-23 18:24:29 -0500 |
| commit | 44acebc4e04fa29bfa770e108ffceee4d06b2e39 (patch) | |
| tree | 8802912d029ef4df664eb0c15b0262bc5e2900bb /Documentation/devicetree | |
| parent | e6739bdc9a0d2a94a4986552679aab9eabedd10d (diff) | |
| parent | 5897855b0cb5847747f2823dcbbe9b2812c7d0ce (diff) | |
| download | linux-next-44acebc4e04fa29bfa770e108ffceee4d06b2e39.tar.gz linux-next-44acebc4e04fa29bfa770e108ffceee4d06b2e39.zip | |
Merge branch '20260801-nord_videocc_camcc-v2-1-674d7718e41f@oss.qualcomm.com' into clk-for-7.4
Merge Nord video and camera clock controller binding update through a
topic branch, to allow making them available in DeviceTree branches as
well.
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml index b41247b257b1..f65380747220 100644 --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml @@ -18,6 +18,7 @@ description: | See also: include/dt-bindings/clock/qcom,kaanapali-camcc.h include/dt-bindings/clock/qcom,kaanapali-cambistmclkcc.h + include/dt-bindings/clock/qcom,nord-camcc.h include/dt-bindings/clock/qcom,sm8450-camcc.h include/dt-bindings/clock/qcom,sm8550-camcc.h include/dt-bindings/clock/qcom,sm8650-camcc.h @@ -29,6 +30,7 @@ properties: enum: - qcom,kaanapali-cambistmclkcc - qcom,kaanapali-camcc + - qcom,nord-camcc - qcom,sm8450-camcc - qcom,sm8475-camcc - qcom,sm8550-camcc diff --git a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml index 910c6d5672b8..e985a450451d 100644 --- a/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml @@ -19,6 +19,7 @@ description: | include/dt-bindings/clock/qcom,hawi-videocc.h include/dt-bindings/clock/qcom,kaanapali-videocc.h include/dt-bindings/clock/qcom,maili-videocc.h + include/dt-bindings/clock/qcom,nord-videocc.h include/dt-bindings/clock/qcom,sm8450-videocc.h include/dt-bindings/clock/qcom,sm8650-videocc.h include/dt-bindings/clock/qcom,sm8750-videocc.h @@ -31,6 +32,7 @@ properties: - qcom,hawi-videocc - qcom,kaanapali-videocc - qcom,maili-videocc + - qcom,nord-videocc - qcom,sm8450-videocc - qcom,sm8475-videocc - qcom,sm8550-videocc |