Skip to content

Commit 6ff40dd

Browse files
committed
Merge branch '20251202-sm8750_camcc-v1-2-b3f7ef6723f1@oss.qualcomm.com' into clk-for-6.20
Merge the SM8750 camera clock controller binding through a topic branch, in order to allow the defines to made availabe to the DeviceTree branch as well.
2 parents 04c4dc1 + 82efed1 commit 6ff40dd

3 files changed

Lines changed: 186 additions & 0 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ title: Qualcomm Camera Clock & Reset Controller on SM8450
99
maintainers:
1010
- Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
1111
- Jagadeesh Kona <quic_jkona@quicinc.com>
12+
- Taniya Das <taniya.das@oss.qualcomm.com>
1213

1314
description: |
1415
Qualcomm camera clock control module provides the clocks, resets and power
@@ -18,6 +19,8 @@ description: |
1819
include/dt-bindings/clock/qcom,sm8450-camcc.h
1920
include/dt-bindings/clock/qcom,sm8550-camcc.h
2021
include/dt-bindings/clock/qcom,sm8650-camcc.h
22+
include/dt-bindings/clock/qcom,sm8750-cambistmclkcc.h
23+
include/dt-bindings/clock/qcom,sm8750-camcc.h
2124
2225
properties:
2326
compatible:
@@ -26,6 +29,8 @@ properties:
2629
- qcom,sm8475-camcc
2730
- qcom,sm8550-camcc
2831
- qcom,sm8650-camcc
32+
- qcom,sm8750-cambistmclkcc
33+
- qcom,sm8750-camcc
2934

3035
clocks:
3136
items:
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
*/
5+
6+
#ifndef _DT_BINDINGS_CLK_QCOM_CAM_BIST_MCLK_CC_SM8750_H
7+
#define _DT_BINDINGS_CLK_QCOM_CAM_BIST_MCLK_CC_SM8750_H
8+
9+
/* CAM_BIST_MCLK_CC clocks */
10+
#define CAM_BIST_MCLK_CC_MCLK0_CLK 0
11+
#define CAM_BIST_MCLK_CC_MCLK0_CLK_SRC 1
12+
#define CAM_BIST_MCLK_CC_MCLK1_CLK 2
13+
#define CAM_BIST_MCLK_CC_MCLK1_CLK_SRC 3
14+
#define CAM_BIST_MCLK_CC_MCLK2_CLK 4
15+
#define CAM_BIST_MCLK_CC_MCLK2_CLK_SRC 5
16+
#define CAM_BIST_MCLK_CC_MCLK3_CLK 6
17+
#define CAM_BIST_MCLK_CC_MCLK3_CLK_SRC 7
18+
#define CAM_BIST_MCLK_CC_MCLK4_CLK 8
19+
#define CAM_BIST_MCLK_CC_MCLK4_CLK_SRC 9
20+
#define CAM_BIST_MCLK_CC_MCLK5_CLK 10
21+
#define CAM_BIST_MCLK_CC_MCLK5_CLK_SRC 11
22+
#define CAM_BIST_MCLK_CC_MCLK6_CLK 12
23+
#define CAM_BIST_MCLK_CC_MCLK6_CLK_SRC 13
24+
#define CAM_BIST_MCLK_CC_MCLK7_CLK 14
25+
#define CAM_BIST_MCLK_CC_MCLK7_CLK_SRC 15
26+
#define CAM_BIST_MCLK_CC_PLL0 16
27+
#define CAM_BIST_MCLK_CC_SLEEP_CLK 17
28+
#define CAM_BIST_MCLK_CC_SLEEP_CLK_SRC 18
29+
30+
#endif
Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
4+
*/
5+
6+
#ifndef _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8750_H
7+
#define _DT_BINDINGS_CLK_QCOM_CAM_CC_SM8750_H
8+
9+
/* CAM_CC clocks */
10+
#define CAM_CC_CAM_TOP_AHB_CLK 0
11+
#define CAM_CC_CAM_TOP_FAST_AHB_CLK 1
12+
#define CAM_CC_CAMNOC_DCD_XO_CLK 2
13+
#define CAM_CC_CAMNOC_NRT_AXI_CLK 3
14+
#define CAM_CC_CAMNOC_NRT_CRE_CLK 4
15+
#define CAM_CC_CAMNOC_NRT_IPE_NPS_CLK 5
16+
#define CAM_CC_CAMNOC_NRT_OFE_ANCHOR_CLK 6
17+
#define CAM_CC_CAMNOC_NRT_OFE_HDR_CLK 7
18+
#define CAM_CC_CAMNOC_NRT_OFE_MAIN_CLK 8
19+
#define CAM_CC_CAMNOC_RT_AXI_CLK 9
20+
#define CAM_CC_CAMNOC_RT_AXI_CLK_SRC 10
21+
#define CAM_CC_CAMNOC_RT_IFE_LITE_CLK 11
22+
#define CAM_CC_CAMNOC_RT_TFE_0_BAYER_CLK 12
23+
#define CAM_CC_CAMNOC_RT_TFE_0_MAIN_CLK 13
24+
#define CAM_CC_CAMNOC_RT_TFE_1_BAYER_CLK 14
25+
#define CAM_CC_CAMNOC_RT_TFE_1_MAIN_CLK 15
26+
#define CAM_CC_CAMNOC_RT_TFE_2_BAYER_CLK 16
27+
#define CAM_CC_CAMNOC_RT_TFE_2_MAIN_CLK 17
28+
#define CAM_CC_CAMNOC_XO_CLK 18
29+
#define CAM_CC_CCI_0_CLK 19
30+
#define CAM_CC_CCI_0_CLK_SRC 20
31+
#define CAM_CC_CCI_1_CLK 21
32+
#define CAM_CC_CCI_1_CLK_SRC 22
33+
#define CAM_CC_CCI_2_CLK 23
34+
#define CAM_CC_CCI_2_CLK_SRC 24
35+
#define CAM_CC_CORE_AHB_CLK 25
36+
#define CAM_CC_CPHY_RX_CLK_SRC 26
37+
#define CAM_CC_CRE_AHB_CLK 27
38+
#define CAM_CC_CRE_CLK 28
39+
#define CAM_CC_CRE_CLK_SRC 29
40+
#define CAM_CC_CSI0PHYTIMER_CLK 30
41+
#define CAM_CC_CSI0PHYTIMER_CLK_SRC 31
42+
#define CAM_CC_CSI1PHYTIMER_CLK 32
43+
#define CAM_CC_CSI1PHYTIMER_CLK_SRC 33
44+
#define CAM_CC_CSI2PHYTIMER_CLK 34
45+
#define CAM_CC_CSI2PHYTIMER_CLK_SRC 35
46+
#define CAM_CC_CSI3PHYTIMER_CLK 36
47+
#define CAM_CC_CSI3PHYTIMER_CLK_SRC 37
48+
#define CAM_CC_CSI4PHYTIMER_CLK 38
49+
#define CAM_CC_CSI4PHYTIMER_CLK_SRC 39
50+
#define CAM_CC_CSI5PHYTIMER_CLK 40
51+
#define CAM_CC_CSI5PHYTIMER_CLK_SRC 41
52+
#define CAM_CC_CSID_CLK 42
53+
#define CAM_CC_CSID_CLK_SRC 43
54+
#define CAM_CC_CSID_CSIPHY_RX_CLK 44
55+
#define CAM_CC_CSIPHY0_CLK 45
56+
#define CAM_CC_CSIPHY1_CLK 46
57+
#define CAM_CC_CSIPHY2_CLK 47
58+
#define CAM_CC_CSIPHY3_CLK 48
59+
#define CAM_CC_CSIPHY4_CLK 49
60+
#define CAM_CC_CSIPHY5_CLK 50
61+
#define CAM_CC_DRV_AHB_CLK 51
62+
#define CAM_CC_DRV_XO_CLK 52
63+
#define CAM_CC_FAST_AHB_CLK_SRC 53
64+
#define CAM_CC_GDSC_CLK 54
65+
#define CAM_CC_ICP_0_AHB_CLK 55
66+
#define CAM_CC_ICP_0_CLK 56
67+
#define CAM_CC_ICP_0_CLK_SRC 57
68+
#define CAM_CC_ICP_1_AHB_CLK 58
69+
#define CAM_CC_ICP_1_CLK 59
70+
#define CAM_CC_ICP_1_CLK_SRC 60
71+
#define CAM_CC_IFE_LITE_AHB_CLK 61
72+
#define CAM_CC_IFE_LITE_CLK 62
73+
#define CAM_CC_IFE_LITE_CLK_SRC 63
74+
#define CAM_CC_IFE_LITE_CPHY_RX_CLK 64
75+
#define CAM_CC_IFE_LITE_CSID_CLK 65
76+
#define CAM_CC_IFE_LITE_CSID_CLK_SRC 66
77+
#define CAM_CC_IPE_NPS_AHB_CLK 67
78+
#define CAM_CC_IPE_NPS_CLK 68
79+
#define CAM_CC_IPE_NPS_CLK_SRC 69
80+
#define CAM_CC_IPE_NPS_FAST_AHB_CLK 70
81+
#define CAM_CC_IPE_PPS_CLK 71
82+
#define CAM_CC_IPE_PPS_FAST_AHB_CLK 72
83+
#define CAM_CC_JPEG_0_CLK 73
84+
#define CAM_CC_JPEG_1_CLK 74
85+
#define CAM_CC_JPEG_CLK_SRC 75
86+
#define CAM_CC_OFE_AHB_CLK 76
87+
#define CAM_CC_OFE_ANCHOR_CLK 77
88+
#define CAM_CC_OFE_ANCHOR_FAST_AHB_CLK 78
89+
#define CAM_CC_OFE_CLK_SRC 79
90+
#define CAM_CC_OFE_HDR_CLK 80
91+
#define CAM_CC_OFE_HDR_FAST_AHB_CLK 81
92+
#define CAM_CC_OFE_MAIN_CLK 82
93+
#define CAM_CC_OFE_MAIN_FAST_AHB_CLK 83
94+
#define CAM_CC_PLL0 84
95+
#define CAM_CC_PLL0_OUT_EVEN 85
96+
#define CAM_CC_PLL0_OUT_ODD 86
97+
#define CAM_CC_PLL1 87
98+
#define CAM_CC_PLL1_OUT_EVEN 88
99+
#define CAM_CC_PLL2 89
100+
#define CAM_CC_PLL2_OUT_EVEN 90
101+
#define CAM_CC_PLL3 91
102+
#define CAM_CC_PLL3_OUT_EVEN 92
103+
#define CAM_CC_PLL4 93
104+
#define CAM_CC_PLL4_OUT_EVEN 94
105+
#define CAM_CC_PLL5 95
106+
#define CAM_CC_PLL5_OUT_EVEN 96
107+
#define CAM_CC_PLL6 97
108+
#define CAM_CC_PLL6_OUT_EVEN 98
109+
#define CAM_CC_PLL6_OUT_ODD 99
110+
#define CAM_CC_QDSS_DEBUG_CLK 100
111+
#define CAM_CC_QDSS_DEBUG_CLK_SRC 101
112+
#define CAM_CC_QDSS_DEBUG_XO_CLK 102
113+
#define CAM_CC_SLEEP_CLK 103
114+
#define CAM_CC_SLEEP_CLK_SRC 104
115+
#define CAM_CC_SLOW_AHB_CLK_SRC 105
116+
#define CAM_CC_TFE_0_BAYER_CLK 106
117+
#define CAM_CC_TFE_0_BAYER_FAST_AHB_CLK 107
118+
#define CAM_CC_TFE_0_CLK_SRC 108
119+
#define CAM_CC_TFE_0_MAIN_CLK 109
120+
#define CAM_CC_TFE_0_MAIN_FAST_AHB_CLK 110
121+
#define CAM_CC_TFE_1_BAYER_CLK 111
122+
#define CAM_CC_TFE_1_BAYER_FAST_AHB_CLK 112
123+
#define CAM_CC_TFE_1_CLK_SRC 113
124+
#define CAM_CC_TFE_1_MAIN_CLK 114
125+
#define CAM_CC_TFE_1_MAIN_FAST_AHB_CLK 115
126+
#define CAM_CC_TFE_2_BAYER_CLK 116
127+
#define CAM_CC_TFE_2_BAYER_FAST_AHB_CLK 117
128+
#define CAM_CC_TFE_2_CLK_SRC 118
129+
#define CAM_CC_TFE_2_MAIN_CLK 119
130+
#define CAM_CC_TFE_2_MAIN_FAST_AHB_CLK 120
131+
#define CAM_CC_XO_CLK_SRC 121
132+
133+
/* CAM_CC power domains */
134+
#define CAM_CC_TITAN_TOP_GDSC 0
135+
#define CAM_CC_IPE_0_GDSC 1
136+
#define CAM_CC_OFE_GDSC 2
137+
#define CAM_CC_TFE_0_GDSC 3
138+
#define CAM_CC_TFE_1_GDSC 4
139+
#define CAM_CC_TFE_2_GDSC 5
140+
141+
/* CAM_CC resets */
142+
#define CAM_CC_DRV_BCR 0
143+
#define CAM_CC_ICP_BCR 1
144+
#define CAM_CC_IPE_0_BCR 2
145+
#define CAM_CC_OFE_BCR 3
146+
#define CAM_CC_QDSS_DEBUG_BCR 4
147+
#define CAM_CC_TFE_0_BCR 5
148+
#define CAM_CC_TFE_1_BCR 6
149+
#define CAM_CC_TFE_2_BCR 7
150+
151+
#endif

0 commit comments

Comments
 (0)