Skip to content

Commit 0990a71

Browse files
gregkhgregkh
committed
Merge tag 'icc-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next
Georgi writes: This pull request contains the interconnect changes for the 7.1-rc1 merge window. They are listed below: - New driver for Mahua SoC - New driver for Eliza SoC - Enable QoS support for QCS8300 and QCS615 SoCs - Add L3 cache scaling compatibles for SM8550 and Eliza SoCs - Fix multiple issues in the msm8974 driver - Fix kfree mismatch - Misc cleanups - Add maintainer entry for the interconnect KUnit tests Signed-off-by: Georgi Djakov <djakov@kernel.org> * tag 'icc-7.1-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc: (22 commits) MAINTAINERS: Add interconnect kunit test entry interconnect: debugfs: fix devm_kstrdup and kfree mismatch interconnect: qcom: msm8974: expand DEFINE_QNODE macros interconnect: qcom: msm8974: switch to the main icc-rpm driver interconnect: qcom: let platforms declare their bugginess interconnect: qcom: define OCMEM bus resource interconnect: qcom: icc-rpm: allow overwriting get_bw callback interconnect: qcom: drop unused is_on flag dt-bindings: interconnect: qcom,msm8974: use qcom,rpm-common dt-bindings: interconnect: qcom,msm8974: drop bus clocks interconnect: qcom: qcs615: enable QoS configuration dt-bindings: interconnect: qcom,qcs615-rpmh: add clocks property to enable QoS interconnect: qcom: Add Eliza interconnect provider driver dt-bindings: interconnect: document the RPMh Network-On-Chip interconnect in Eliza SoC dt-bindings: interconnect: OSM L3: Add Eliza EPSS L3 compatible interconnect: qcom: De-acronymize SoC names dt-bindings: interconnect: qcom,glymur-rpmh: De-acronymize SoC name dt-bindings: interconnect: OSM L3: Document sm8550 OSM L3 compatible interconnect: qcom: qcs8300: enable QoS configuration dt-bindings: interconnect: qcom,qcs8300-rpmh: add clocks property to enable QoS ...
2 parents 8aeea23 + 0436cd3 commit 0990a71

19 files changed

Lines changed: 4014 additions & 461 deletions

File tree

‎Documentation/devicetree/bindings/interconnect/qcom,eliza-rpmh.yaml‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interconnect/qcom,eliza-rpmh.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm RPMh Network-On-Chip Interconnect on Eliza SoC
8+
9+
maintainers:
10+
- Odelu Kukatla <odelu.kukatla@oss.qualcomm.com>
11+
12+
description: |
13+
RPMh interconnect providers support system bandwidth requirements through
14+
RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is
15+
able to communicate with the BCM through the Resource State Coordinator (RSC)
16+
associated with each execution environment. Provider nodes must point to at
17+
least one RPMh device child node pertaining to their RSC and each provider
18+
can map to multiple RPMh resources.
19+
20+
See also: include/dt-bindings/interconnect/qcom,eliza-rpmh.h
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- qcom,eliza-aggre1-noc
26+
- qcom,eliza-aggre2-noc
27+
- qcom,eliza-clk-virt
28+
- qcom,eliza-cnoc-cfg
29+
- qcom,eliza-cnoc-main
30+
- qcom,eliza-gem-noc
31+
- qcom,eliza-lpass-ag-noc
32+
- qcom,eliza-lpass-lpiaon-noc
33+
- qcom,eliza-lpass-lpicx-noc
34+
- qcom,eliza-mc-virt
35+
- qcom,eliza-mmss-noc
36+
- qcom,eliza-nsp-noc
37+
- qcom,eliza-pcie-anoc
38+
- qcom,eliza-system-noc
39+
40+
reg:
41+
maxItems: 1
42+
43+
clocks:
44+
minItems: 1
45+
maxItems: 2
46+
47+
required:
48+
- compatible
49+
50+
allOf:
51+
- $ref: qcom,rpmh-common.yaml#
52+
- if:
53+
properties:
54+
compatible:
55+
contains:
56+
enum:
57+
- qcom,eliza-clk-virt
58+
- qcom,eliza-mc-virt
59+
then:
60+
properties:
61+
reg: false
62+
else:
63+
required:
64+
- reg
65+
66+
- if:
67+
properties:
68+
compatible:
69+
contains:
70+
enum:
71+
- qcom,eliza-aggre1-noc
72+
then:
73+
properties:
74+
clocks:
75+
items:
76+
- description: aggre UFS PHY AXI clock
77+
- description: aggre USB3 PRIM AXI clock
78+
79+
- if:
80+
properties:
81+
compatible:
82+
contains:
83+
enum:
84+
- qcom,eliza-aggre2-noc
85+
then:
86+
properties:
87+
clocks:
88+
items:
89+
- description: RPMH CC IPA clock
90+
91+
- if:
92+
properties:
93+
compatible:
94+
contains:
95+
enum:
96+
- qcom,eliza-pcie-anoc
97+
then:
98+
properties:
99+
clocks:
100+
items:
101+
- description: aggre-NOC PCIe AXI clock
102+
- description: cfg-NOC PCIe a-NOC AHB clock
103+
104+
- if:
105+
properties:
106+
compatible:
107+
contains:
108+
enum:
109+
- qcom,eliza-aggre1-noc
110+
- qcom,eliza-aggre2-noc
111+
- qcom,eliza-pcie-anoc
112+
then:
113+
required:
114+
- clocks
115+
else:
116+
properties:
117+
clocks: false
118+
119+
unevaluatedProperties: false
120+
121+
examples:
122+
- |
123+
gem_noc: interconnect@24100000 {
124+
compatible = "qcom,eliza-gem-noc";
125+
reg = <0x24100000 0x163080>;
126+
#interconnect-cells = <2>;
127+
qcom,bcm-voters = <&apps_bcm_voter>;
128+
};
129+
130+
mc_virt: interconnect-2 {
131+
compatible = "qcom,eliza-mc-virt";
132+
#interconnect-cells = <2>;
133+
qcom,bcm-voters = <&apps_bcm_voter>;
134+
};
135+
136+
aggre1_noc: interconnect@16e0000 {
137+
compatible = "qcom,eliza-aggre1-noc";
138+
reg = <0x16e0000 0x16400>;
139+
#interconnect-cells = <2>;
140+
clocks = <&gcc_phy_axi_clk>, <&gcc_prim_axi_clk>;
141+
qcom,bcm-voters = <&apps_bcm_voter>;
142+
};

‎Documentation/devicetree/bindings/interconnect/qcom,glymur-rpmh.yaml‎

Lines changed: 111 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/interconnect/qcom,glymur-rpmh.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Qualcomm RPMh Network-On-Chip Interconnect on GLYMUR
7+
title: Qualcomm RPMh Network-On-Chip Interconnect on Glymur and Mahua SoCs
88

99
maintainers:
1010
- Raviteja Laggyshetty <raviteja.laggyshetty@oss.qualcomm.com>
@@ -21,28 +21,98 @@ description: |
2121
2222
properties:
2323
compatible:
24-
enum:
25-
- qcom,glymur-aggre1-noc
26-
- qcom,glymur-aggre2-noc
27-
- qcom,glymur-aggre3-noc
28-
- qcom,glymur-aggre4-noc
29-
- qcom,glymur-clk-virt
30-
- qcom,glymur-cnoc-cfg
31-
- qcom,glymur-cnoc-main
32-
- qcom,glymur-hscnoc
33-
- qcom,glymur-lpass-ag-noc
34-
- qcom,glymur-lpass-lpiaon-noc
35-
- qcom,glymur-lpass-lpicx-noc
36-
- qcom,glymur-mc-virt
37-
- qcom,glymur-mmss-noc
38-
- qcom,glymur-nsinoc
39-
- qcom,glymur-nsp-noc
40-
- qcom,glymur-oobm-ss-noc
41-
- qcom,glymur-pcie-east-anoc
42-
- qcom,glymur-pcie-east-slv-noc
43-
- qcom,glymur-pcie-west-anoc
44-
- qcom,glymur-pcie-west-slv-noc
45-
- qcom,glymur-system-noc
24+
oneOf:
25+
- items:
26+
- enum:
27+
- qcom,mahua-aggre1-noc
28+
- const: qcom,glymur-aggre1-noc
29+
- items:
30+
- enum:
31+
- qcom,mahua-aggre2-noc
32+
- const: qcom,glymur-aggre2-noc
33+
- items:
34+
- enum:
35+
- qcom,mahua-aggre3-noc
36+
- const: qcom,glymur-aggre3-noc
37+
- items:
38+
- enum:
39+
- qcom,mahua-aggre4-noc
40+
- const: qcom,glymur-aggre4-noc
41+
- items:
42+
- enum:
43+
- qcom,mahua-clk-virt
44+
- const: qcom,glymur-clk-virt
45+
- items:
46+
- enum:
47+
- qcom,mahua-cnoc-main
48+
- const: qcom,glymur-cnoc-main
49+
- items:
50+
- enum:
51+
- qcom,mahua-lpass-ag-noc
52+
- const: qcom,glymur-lpass-ag-noc
53+
- items:
54+
- enum:
55+
- qcom,mahua-lpass-lpiaon-noc
56+
- const: qcom,glymur-lpass-lpiaon-noc
57+
- items:
58+
- enum:
59+
- qcom,mahua-lpass-lpicx-noc
60+
- const: qcom,glymur-lpass-lpicx-noc
61+
- items:
62+
- enum:
63+
- qcom,mahua-mmss-noc
64+
- const: qcom,glymur-mmss-noc
65+
- items:
66+
- enum:
67+
- qcom,mahua-nsinoc
68+
- const: qcom,glymur-nsinoc
69+
- items:
70+
- enum:
71+
- qcom,mahua-nsp-noc
72+
- const: qcom,glymur-nsp-noc
73+
- items:
74+
- enum:
75+
- qcom,mahua-oobm-ss-noc
76+
- const: qcom,glymur-oobm-ss-noc
77+
- items:
78+
- enum:
79+
- qcom,mahua-pcie-east-anoc
80+
- const: qcom,glymur-pcie-east-anoc
81+
- items:
82+
- enum:
83+
- qcom,mahua-pcie-east-slv-noc
84+
- const: qcom,glymur-pcie-east-slv-noc
85+
- items:
86+
- enum:
87+
- qcom,mahua-system-noc
88+
- const: qcom,glymur-system-noc
89+
- enum:
90+
- qcom,glymur-aggre1-noc
91+
- qcom,glymur-aggre2-noc
92+
- qcom,glymur-aggre3-noc
93+
- qcom,glymur-aggre4-noc
94+
- qcom,glymur-clk-virt
95+
- qcom,glymur-cnoc-cfg
96+
- qcom,glymur-cnoc-main
97+
- qcom,glymur-hscnoc
98+
- qcom,glymur-lpass-ag-noc
99+
- qcom,glymur-lpass-lpiaon-noc
100+
- qcom,glymur-lpass-lpicx-noc
101+
- qcom,glymur-mc-virt
102+
- qcom,glymur-mmss-noc
103+
- qcom,glymur-nsinoc
104+
- qcom,glymur-nsp-noc
105+
- qcom,glymur-oobm-ss-noc
106+
- qcom,glymur-pcie-east-anoc
107+
- qcom,glymur-pcie-east-slv-noc
108+
- qcom,glymur-pcie-west-anoc
109+
- qcom,glymur-pcie-west-slv-noc
110+
- qcom,glymur-system-noc
111+
- qcom,mahua-cnoc-cfg
112+
- qcom,mahua-hscnoc
113+
- qcom,mahua-mc-virt
114+
- qcom,mahua-pcie-west-anoc
115+
- qcom,mahua-pcie-west-slv-noc
46116

47117
reg:
48118
maxItems: 1
@@ -63,6 +133,7 @@ allOf:
63133
enum:
64134
- qcom,glymur-clk-virt
65135
- qcom,glymur-mc-virt
136+
- qcom,mahua-mc-virt
66137
then:
67138
properties:
68139
reg: false
@@ -85,6 +156,20 @@ allOf:
85156
- description: aggre PCIE_4 WEST AXI clock
86157
- description: aggre PCIE_6 WEST AXI clock
87158

159+
- if:
160+
properties:
161+
compatible:
162+
contains:
163+
enum:
164+
- qcom,mahua-pcie-west-anoc
165+
then:
166+
properties:
167+
clocks:
168+
items:
169+
- description: aggre PCIE_3B WEST AXI clock
170+
- description: aggre PCIE_4 WEST AXI clock
171+
- description: aggre PCIE_6 WEST AXI clock
172+
88173
- if:
89174
properties:
90175
compatible:
@@ -131,10 +216,11 @@ allOf:
131216
compatible:
132217
contains:
133218
enum:
134-
- qcom,glymur-pcie-west-anoc
135-
- qcom,glymur-pcie-east-anoc
136219
- qcom,glymur-aggre2-noc
137220
- qcom,glymur-aggre4-noc
221+
- qcom,glymur-pcie-east-anoc
222+
- qcom,glymur-pcie-west-anoc
223+
- qcom,mahua-pcie-west-anoc
138224
then:
139225
required:
140226
- clocks

‎Documentation/devicetree/bindings/interconnect/qcom,msm8974.yaml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,34 @@ properties:
2626
- qcom,msm8974-pnoc
2727
- qcom,msm8974-snoc
2828

29-
'#interconnect-cells':
30-
const: 1
31-
3229
clock-names:
3330
items:
3431
- const: bus
35-
- const: bus_a
3632

3733
clocks:
3834
items:
3935
- description: Bus Clock
40-
- description: Bus A Clock
4136

4237
required:
4338
- compatible
4439
- reg
45-
- '#interconnect-cells'
46-
- clock-names
47-
- clocks
4840

49-
additionalProperties: false
41+
unevaluatedProperties: false
42+
43+
allOf:
44+
- $ref: qcom,rpm-common.yaml#
45+
- if:
46+
properties:
47+
compatible:
48+
const: qcom,msm8974-mmssnoc
49+
then:
50+
required:
51+
- clocks
52+
- clock-names
53+
else:
54+
properties:
55+
clocks: false
56+
clock-names: false
5057

5158
examples:
5259
- |
@@ -56,7 +63,4 @@ examples:
5663
reg = <0xfc380000 0x6a000>;
5764
compatible = "qcom,msm8974-bimc";
5865
#interconnect-cells = <1>;
59-
clock-names = "bus", "bus_a";
60-
clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
61-
<&rpmcc RPM_SMD_BIMC_A_CLK>;
6266
};

‎Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ properties:
2828
- const: qcom,osm-l3
2929
- items:
3030
- enum:
31+
- qcom,eliza-epss-l3
3132
- qcom,sa8775p-epss-l3
3233
- qcom,sc7280-epss-l3
3334
- qcom,sc8280xp-epss-l3
3435
- qcom,sm6375-cpucp-l3
3536
- qcom,sm8250-epss-l3
3637
- qcom,sm8350-epss-l3
38+
- qcom,sm8550-epss-l3
3739
- qcom,sm8650-epss-l3
3840
- const: qcom,epss-l3
3941
- items:

0 commit comments

Comments
 (0)