Skip to content

Commit 745ffd4

Browse files
gregkhgregkh
committed
Merge tag 'icc-7.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next
Georgi writes: This pull request contains the following interconnect updates for the 7.2-rc1 merge window: - New driver for Shikra SoC - New driver for Nord SoC - New driver for Hawi SoC including CPU/LLCC bwmon support - Add missing SDCC nodes for Eliza SoC - Misc cleanups and fixes. Signed-off-by: Georgi Djakov <djakov@kernel.org> * tag 'icc-7.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc: interconnect: qcom: add Hawi interconnect provider driver dt-bindings: interconnect: qcom: document the RPMh NoC for Hawi SoC dt-bindings: interconnect: qcom-bwmon: Add Hawi llcc-bwmon compatible interconnect: qcom: eliza: Add SDCC1 slave node dt-bindings: interconnect: qcom,eliza-rpmh: Add SDCC1 slave interconnect: qcom: Restrict drivers per ARM/ARM64 interconnect: qcom: Fix indentation dt-bindings: interconnect: qcom,sm6115: Restrict children and clocks dt-bindings: interconnect: qcom,sm6115: Drop incorrect children if:then: block dt-bindings: interconnect: qcom,sdm660: Disallow clocks when appropriate interconnect: Move MODULE_DEVICE_TABLE next to the table itself interconnect: Do not create empty devres on missing interconnects dt-bindings: interconnect: qcom-bwmon: Add Hawi cpu-bwmon compatible interconnect: qcom: Add interconnect provider driver for Nord SoC dt-bindings: interconnect: Document RPMh Network-On-Chip for Qualcomm Nord SoC interconnect: qcom: add Shikra interconnect provider driver dt-bindings: interconnect: document the RPM Network-On-Chip interconnect in Shikra SoC
2 parents 47b56cc + 94fe92d commit 745ffd4

18 files changed

Lines changed: 7577 additions & 38 deletions

File tree

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

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interconnect/qcom,hawi-rpmh.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm RPMh Network-On-Chip Interconnect on Hawi
8+
9+
maintainers:
10+
- Vivek Aknurwar <vivek.aknurwar@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,hawi-rpmh.h
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- qcom,hawi-aggre1-noc
26+
- qcom,hawi-clk-virt
27+
- qcom,hawi-cnoc-main
28+
- qcom,hawi-gem-noc
29+
- qcom,hawi-llclpi-noc
30+
- qcom,hawi-lpass-ag-noc
31+
- qcom,hawi-lpass-lpiaon-noc
32+
- qcom,hawi-lpass-lpicx-noc
33+
- qcom,hawi-mc-virt
34+
- qcom,hawi-mmss-noc
35+
- qcom,hawi-nsp-noc
36+
- qcom,hawi-pcie-anoc
37+
- qcom,hawi-stdst-cfg
38+
- qcom,hawi-stdst-main
39+
- qcom,hawi-system-noc
40+
41+
reg:
42+
maxItems: 1
43+
44+
clocks:
45+
minItems: 2
46+
maxItems: 3
47+
48+
required:
49+
- compatible
50+
51+
allOf:
52+
- $ref: qcom,rpmh-common.yaml#
53+
- if:
54+
properties:
55+
compatible:
56+
contains:
57+
enum:
58+
- qcom,hawi-clk-virt
59+
- qcom,hawi-mc-virt
60+
then:
61+
properties:
62+
reg: false
63+
else:
64+
required:
65+
- reg
66+
67+
- if:
68+
properties:
69+
compatible:
70+
contains:
71+
enum:
72+
- qcom,hawi-pcie-anoc
73+
then:
74+
properties:
75+
clocks:
76+
items:
77+
- description: aggre-NOC PCIe AXI clock
78+
- description: cfg-NOC PCIe a-NOC AHB clock
79+
80+
- if:
81+
properties:
82+
compatible:
83+
contains:
84+
enum:
85+
- qcom,hawi-aggre1-noc
86+
then:
87+
properties:
88+
clocks:
89+
items:
90+
- description: aggre UFS PHY AXI clock
91+
- description: aggre USB3 PRIM AXI clock
92+
- description: RPMH CC IPA clock
93+
94+
- if:
95+
properties:
96+
compatible:
97+
contains:
98+
enum:
99+
- qcom,hawi-aggre1-noc
100+
- qcom,hawi-pcie-anoc
101+
then:
102+
required:
103+
- clocks
104+
else:
105+
properties:
106+
clocks: false
107+
108+
unevaluatedProperties: false
109+
110+
examples:
111+
- |
112+
soc {
113+
#address-cells = <2>;
114+
#size-cells = <2>;
115+
116+
clk_virt: interconnect-0 {
117+
compatible = "qcom,hawi-clk-virt";
118+
#interconnect-cells = <2>;
119+
qcom,bcm-voters = <&apps_bcm_voter>;
120+
};
121+
122+
aggre_noc: interconnect@f00000 {
123+
compatible = "qcom,hawi-aggre1-noc";
124+
reg = <0x0 0xf00000 0x0 0x54400>;
125+
#interconnect-cells = <2>;
126+
clocks = <&gcc_aggre_ufs_phy_axi_clk>,
127+
<&gcc_aggre_usb3_prim_axi_clk>,
128+
<&rpmhcc_ipa_clk>;
129+
qcom,bcm-voters = <&apps_bcm_voter>;
130+
};
131+
};

‎Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- items:
2727
- enum:
2828
- qcom,glymur-cpu-bwmon
29+
- qcom,hawi-cpu-bwmon
2930
- qcom,kaanapali-cpu-bwmon
3031
- qcom,qcm2290-cpu-bwmon
3132
- qcom,qcs615-cpu-bwmon
@@ -45,6 +46,7 @@ properties:
4546
- const: qcom,sdm845-bwmon # BWMON v4, unified register space
4647
- items:
4748
- enum:
49+
- qcom,hawi-llcc-bwmon
4850
- qcom,qcs615-llcc-bwmon
4951
- qcom,qcs8300-llcc-bwmon
5052
- qcom,sa8775p-llcc-bwmon

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

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/interconnect/qcom,nord-rpmh.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm RPMh Network-On-Chip Interconnect on Nord
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,nord-rpmh.h
21+
22+
properties:
23+
compatible:
24+
enum:
25+
- qcom,nord-aggre1-noc
26+
- qcom,nord-aggre1-noc-tile
27+
- qcom,nord-aggre2-noc
28+
- qcom,nord-aggre2-noc-tile
29+
- qcom,nord-clk-virt
30+
- qcom,nord-cnoc-cfg
31+
- qcom,nord-cnoc-main
32+
- qcom,nord-hpass-ag-noc
33+
- qcom,nord-hscnoc
34+
- qcom,nord-mc-virt
35+
- qcom,nord-mmss-noc
36+
- qcom,nord-nsp-data-noc-0
37+
- qcom,nord-nsp-data-noc-1
38+
- qcom,nord-nsp-data-noc-2
39+
- qcom,nord-nsp-data-noc-3
40+
- qcom,nord-pcie-cfg
41+
- qcom,nord-pcie-data-inbound
42+
- qcom,nord-pcie-data-outbound
43+
- qcom,nord-system-noc
44+
45+
reg:
46+
maxItems: 1
47+
48+
clocks:
49+
minItems: 1
50+
maxItems: 4
51+
52+
required:
53+
- compatible
54+
55+
allOf:
56+
- $ref: qcom,rpmh-common.yaml#
57+
- if:
58+
properties:
59+
compatible:
60+
contains:
61+
enum:
62+
- qcom,nord-clk-virt
63+
- qcom,nord-mc-virt
64+
then:
65+
properties:
66+
reg: false
67+
else:
68+
required:
69+
- reg
70+
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
enum:
76+
- qcom,nord-aggre1-noc-tile
77+
then:
78+
properties:
79+
clocks:
80+
items:
81+
- description: aggre UFS PHY AXI clock
82+
- description: aggre USB2 AXI clock
83+
- description: aggre USB3 PRIM AXI clock
84+
- description: aggre USB3 SEC AXI clock
85+
86+
- if:
87+
properties:
88+
compatible:
89+
contains:
90+
enum:
91+
- qcom,nord-aggre2-noc
92+
then:
93+
properties:
94+
clocks:
95+
items:
96+
- description: RPMH CC IPA clock
97+
98+
- if:
99+
properties:
100+
compatible:
101+
contains:
102+
enum:
103+
- qcom,nord-aggre1-noc-tile
104+
- qcom,nord-aggre2-noc
105+
then:
106+
required:
107+
- clocks
108+
else:
109+
properties:
110+
clocks: false
111+
112+
unevaluatedProperties: false
113+
114+
examples:
115+
- |
116+
clk_virt: interconnect-clk-virt {
117+
compatible = "qcom,nord-clk-virt";
118+
#interconnect-cells = <2>;
119+
qcom,bcm-voters = <&apps_bcm_voter>;
120+
};
121+
122+
aggre1_noc_tile: interconnect@1720000 {
123+
compatible = "qcom,nord-aggre1-noc-tile";
124+
reg = <0x01720000 0x23400>;
125+
#interconnect-cells = <2>;
126+
qcom,bcm-voters = <&apps_bcm_voter>;
127+
clocks = <&ne_gcc_aggre_noc_ufs_phy_axi_clk>,
128+
<&ne_gcc_aggre_noc_usb2_axi_clk>,
129+
<&ne_gcc_aggre_noc_usb3_prim_axi_clk>,
130+
<&ne_gcc_aggre_noc_usb3_sec_axi_clk>;
131+
};

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ allOf:
7979
- const: aggre2_usb3_axi
8080
- const: cfg_noc_usb2_axi
8181

82+
- if:
83+
properties:
84+
compatible:
85+
enum:
86+
- qcom,sdm660-bimc
87+
- qcom,sdm660-cnoc
88+
- qcom,sdm660-gnoc
89+
- qcom,sdm660-snoc
90+
then:
91+
properties:
92+
clocks: false
93+
clock-names: false
94+
8295
examples:
8396
- |
8497
#include <dt-bindings/clock/qcom,gcc-sdm660.h>

0 commit comments

Comments
 (0)