Skip to content

Commit ac409ad

Browse files
committed
Merge branch 'for-v6.4/clk-exynos850-dt-binding' into next/clk
Merge Devicetree bindings with new Exynos850 clock IDs (headers), used also by the clock drivers. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
2 parents a4c7836 + 284f6dc commit ac409ad

File tree

2 files changed

+44
-3
lines changed

2 files changed

+44
-3
lines changed

Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ properties:
3737
- samsung,exynos850-cmu-cmgp
3838
- samsung,exynos850-cmu-core
3939
- samsung,exynos850-cmu-dpu
40+
- samsung,exynos850-cmu-g3d
4041
- samsung,exynos850-cmu-hsi
4142
- samsung,exynos850-cmu-is
4243
- samsung,exynos850-cmu-mfcmscl
@@ -169,6 +170,24 @@ allOf:
169170
- const: oscclk
170171
- const: dout_dpu
171172

173+
- if:
174+
properties:
175+
compatible:
176+
contains:
177+
const: samsung,exynos850-cmu-g3d
178+
179+
then:
180+
properties:
181+
clocks:
182+
items:
183+
- description: External reference clock (26 MHz)
184+
- description: G3D clock (from CMU_TOP)
185+
186+
clock-names:
187+
items:
188+
- const: oscclk
189+
- const: dout_g3d_switch
190+
172191
- if:
173192
properties:
174193
compatible:

include/dt-bindings/clock/exynos850.h

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
#define CLK_DOUT_MFCMSCL_M2M 73
8686
#define CLK_DOUT_MFCMSCL_MCSC 74
8787
#define CLK_DOUT_MFCMSCL_JPEG 75
88-
#define TOP_NR_CLK 76
88+
#define CLK_MOUT_G3D_SWITCH 76
89+
#define CLK_GOUT_G3D_SWITCH 77
90+
#define CLK_DOUT_G3D_SWITCH 78
91+
#define TOP_NR_CLK 79
8992

9093
/* CMU_APM */
9194
#define CLK_RCO_I3C_PMIC 1
@@ -175,7 +178,8 @@
175178
#define IOCLK_AUDIOCDCLK5 58
176179
#define IOCLK_AUDIOCDCLK6 59
177180
#define TICK_USB 60
178-
#define AUD_NR_CLK 61
181+
#define CLK_GOUT_AUD_CMU_AUD_PCLK 61
182+
#define AUD_NR_CLK 62
179183

180184
/* CMU_CMGP */
181185
#define CLK_RCO_CMGP 1
@@ -195,6 +199,21 @@
195199
#define CLK_GOUT_SYSREG_CMGP_PCLK 15
196200
#define CMGP_NR_CLK 16
197201

202+
/* CMU_G3D */
203+
#define CLK_FOUT_G3D_PLL 1
204+
#define CLK_MOUT_G3D_PLL 2
205+
#define CLK_MOUT_G3D_SWITCH_USER 3
206+
#define CLK_MOUT_G3D_BUSD 4
207+
#define CLK_DOUT_G3D_BUSP 5
208+
#define CLK_GOUT_G3D_CMU_G3D_PCLK 6
209+
#define CLK_GOUT_G3D_GPU_CLK 7
210+
#define CLK_GOUT_G3D_TZPC_PCLK 8
211+
#define CLK_GOUT_G3D_GRAY2BIN_CLK 9
212+
#define CLK_GOUT_G3D_BUSD_CLK 10
213+
#define CLK_GOUT_G3D_BUSP_CLK 11
214+
#define CLK_GOUT_G3D_SYSREG_PCLK 12
215+
#define G3D_NR_CLK 13
216+
198217
/* CMU_HSI */
199218
#define CLK_MOUT_HSI_BUS_USER 1
200219
#define CLK_MOUT_HSI_MMC_CARD_USER 2
@@ -209,7 +228,10 @@
209228
#define CLK_GOUT_MMC_CARD_ACLK 11
210229
#define CLK_GOUT_MMC_CARD_SDCLKIN 12
211230
#define CLK_GOUT_SYSREG_HSI_PCLK 13
212-
#define HSI_NR_CLK 14
231+
#define CLK_GOUT_HSI_PPMU_ACLK 14
232+
#define CLK_GOUT_HSI_PPMU_PCLK 15
233+
#define CLK_GOUT_HSI_CMU_HSI_PCLK 16
234+
#define HSI_NR_CLK 17
213235

214236
/* CMU_IS */
215237
#define CLK_MOUT_IS_BUS_USER 1

0 commit comments

Comments
 (0)