Skip to content

Commit c703675

Browse files
committed
Merge branch '[email protected]' into clk-for-6.15
Merge the QCS8300 multimedia clock controllers through a topic branch, to make binding constants available to DeviceTree source as well.
2 parents 5d02941 + 329497f commit c703675

File tree

5 files changed

+42
-1
lines changed

5 files changed

+42
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
4+
*/
5+
6+
#ifndef _DT_BINDINGS_CLK_QCOM_QCS8300_CAM_CC_H
7+
#define _DT_BINDINGS_CLK_QCOM_QCS8300_CAM_CC_H
8+
9+
#include "qcom,sa8775p-camcc.h"
10+
11+
/* QCS8300 introduces below new clocks compared to SA8775P */
12+
13+
/* CAM_CC clocks */
14+
#define CAM_CC_TITAN_TOP_ACCU_SHIFT_CLK 86
15+
16+
#endif
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved.
4+
*/
5+
6+
#ifndef _DT_BINDINGS_CLK_QCOM_GPUCC_QCS8300_H
7+
#define _DT_BINDINGS_CLK_QCOM_GPUCC_QCS8300_H
8+
9+
#include "qcom,sa8775p-gpucc.h"
10+
11+
/* QCS8300 introduces below new clocks compared to SA8775P */
12+
13+
/* GPU_CC clocks */
14+
#define GPU_CC_CX_ACCU_SHIFT_CLK 23
15+
#define GPU_CC_GX_ACCU_SHIFT_CLK 24
16+
17+
#endif

0 commit comments

Comments
 (0)