Skip to content

Commit 0519714

Browse files
committed
Merge branch '[email protected]' into clk-for-6.13
Merge the SM8475 clock bindings in through topic branch, in case we need to make them available for DeviceTree branches as well.
2 parents 9852d85 + f631151 commit 0519714

File tree

6 files changed

+10
-1
lines changed

6 files changed

+10
-1
lines changed

Documentation/devicetree/bindings/clock/qcom,gcc-sm8450.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ description: |
1717
1818
properties:
1919
compatible:
20-
const: qcom,gcc-sm8450
20+
enum:
21+
- qcom,gcc-sm8450
22+
- qcom,sm8475-gcc
2123

2224
clocks:
2325
items:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
enum:
2727
- qcom,sc8280xp-camcc
2828
- qcom,sm8450-camcc
29+
- qcom,sm8475-camcc
2930
- qcom,sm8550-camcc
3031
- qcom,sm8650-camcc
3132
- qcom,x1e80100-camcc

Documentation/devicetree/bindings/clock/qcom,sm8450-dispcc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
compatible:
2020
enum:
2121
- qcom,sm8450-dispcc
22+
- qcom,sm8475-dispcc
2223

2324
clocks:
2425
minItems: 3

Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
enum:
2727
- qcom,sm4450-gpucc
2828
- qcom,sm8450-gpucc
29+
- qcom,sm8475-gpucc
2930
- qcom,sm8550-gpucc
3031
- qcom,sm8650-gpucc
3132
- qcom,x1e80100-gpucc

Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
compatible:
2323
enum:
2424
- qcom,sm8450-videocc
25+
- qcom,sm8475-videocc
2526
- qcom,sm8550-videocc
2627
- qcom,sm8650-videocc
2728

include/dt-bindings/clock/qcom,gcc-sm8450.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@
194194
#define GCC_VIDEO_AXI0_CLK 182
195195
#define GCC_VIDEO_AXI1_CLK 183
196196
#define GCC_VIDEO_XO_CLK 184
197+
/* Additional SM8475-specific clocks */
198+
#define SM8475_GCC_GPLL2 185
199+
#define SM8475_GCC_GPLL3 186
197200

198201
/* GCC resets */
199202
#define GCC_CAMERA_BCR 0

0 commit comments

Comments
 (0)