github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch '20260922-maili_camcc-v4-1-87704b664dde@oss.qualcomm.com' into clk-for-7.4

Browse Source 
Merge the Maili camera clock controller binding through a topic branch
to avoid the merge conflicts with the DeviceTree branch that has taken
other changes to this same file.
This commit is contained in:
Bjorn Andersson 2026-09-29 14:39:28 -05:00
commit 104480aa66
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml
View File

@ -33,6 +33,7 @@ properties:
- qcom,hawi-camcc
- qcom,kaanapali-cambistmclkcc
- qcom,kaanapali-camcc
- qcom,maili-camcc
- qcom,nord-camcc
- qcom,sm8450-camcc
- qcom,sm8475-camcc
@ -43,6 +44,7 @@ properties:
- items:
- enum:
- qcom,hawi-cambistmclkcc
- qcom,maili-cambistmclkcc
- const: qcom,kaanapali-cambistmclkcc
clocks:
@ -95,7 +97,9 @@ allOf:
properties:
compatible:
contains:
const: qcom,hawi-camcc
enum:
- qcom,hawi-camcc
- qcom,maili-camcc
then:
required:
- interconnects