Skip to content

Commit ea5594a

Browse files
committed
Merge branch '20240606-topic-rb1_gpu-v4-1-4bc0c19da4af@linaro.org' into clk-for-6.11
Merge the QCM2290 GPUCC binding through a topic branch to allow for it to also be merged into the DeviceTree branch.
2 parents 2441b96 + 525b428 commit ea5594a

2 files changed

Lines changed: 109 additions & 0 deletions

File tree

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,qcm2290-gpucc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Graphics Clock & Reset Controller on QCM2290
8+
9+
maintainers:
10+
- Konrad Dybcio <konradybcio@kernel.org>
11+
12+
description: |
13+
Qualcomm graphics clock control module provides the clocks, resets and power
14+
domains on Qualcomm SoCs.
15+
16+
See also::
17+
include/dt-bindings/clock/qcom,qcm2290-gpucc.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,qcm2290-gpucc
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
items:
28+
- description: AHB interface clock,
29+
- description: SoC CXO clock
30+
- description: GPLL0 main branch source
31+
- description: GPLL0 div branch source
32+
33+
power-domains:
34+
description:
35+
A phandle and PM domain specifier for the CX power domain.
36+
maxItems: 1
37+
38+
required-opps:
39+
description:
40+
A phandle to an OPP node describing required CX performance point.
41+
maxItems: 1
42+
43+
required:
44+
- compatible
45+
- clocks
46+
- power-domains
47+
48+
allOf:
49+
- $ref: qcom,gcc.yaml#
50+
51+
unevaluatedProperties: false
52+
53+
examples:
54+
- |
55+
#include <dt-bindings/clock/qcom,gcc-qcm2290.h>
56+
#include <dt-bindings/clock/qcom,rpmcc.h>
57+
#include <dt-bindings/power/qcom-rpmpd.h>
58+
59+
soc {
60+
#address-cells = <2>;
61+
#size-cells = <2>;
62+
63+
clock-controller@5990000 {
64+
compatible = "qcom,qcm2290-gpucc";
65+
reg = <0x0 0x05990000 0x0 0x9000>;
66+
clocks = <&gcc GCC_GPU_CFG_AHB_CLK>,
67+
<&rpmcc RPM_SMD_XO_CLK_SRC>,
68+
<&gcc GCC_GPU_GPLL0_CLK_SRC>,
69+
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
70+
power-domains = <&rpmpd QCM2290_VDDCX>;
71+
required-opps = <&rpmpd_opp_low_svs>;
72+
#clock-cells = <1>;
73+
#reset-cells = <1>;
74+
#power-domain-cells = <1>;
75+
};
76+
};
77+
...
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
2+
/*
3+
* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
4+
* Copyright (c) 2024, Linaro Limited
5+
*/
6+
7+
#ifndef _DT_BINDINGS_CLK_QCOM_GPU_CC_QCM2290_H
8+
#define _DT_BINDINGS_CLK_QCOM_GPU_CC_QCM2290_H
9+
10+
/* GPU_CC clocks */
11+
#define GPU_CC_AHB_CLK 0
12+
#define GPU_CC_CRC_AHB_CLK 1
13+
#define GPU_CC_CX_GFX3D_CLK 2
14+
#define GPU_CC_CX_GMU_CLK 3
15+
#define GPU_CC_CX_SNOC_DVM_CLK 4
16+
#define GPU_CC_CXO_AON_CLK 5
17+
#define GPU_CC_CXO_CLK 6
18+
#define GPU_CC_GMU_CLK_SRC 7
19+
#define GPU_CC_GX_GFX3D_CLK 8
20+
#define GPU_CC_GX_GFX3D_CLK_SRC 9
21+
#define GPU_CC_PLL0 10
22+
#define GPU_CC_SLEEP_CLK 11
23+
#define GPU_CC_HLOS1_VOTE_GPU_SMMU_CLK 12
24+
25+
/* Resets */
26+
#define GPU_GX_BCR 0
27+
28+
/* GDSCs */
29+
#define GPU_CX_GDSC 0
30+
#define GPU_GX_GDSC 1
31+
32+
#endif

0 commit comments

Comments
 (0)