Skip to content

Commit f7d27c1

Browse files
author
Georgi Djakov
committed
Merge branch 'icc-misc' into icc-next
This series introduce new ICC drivers for some legacy socs while at it also updates a bit of qcs404 driver which seems to not receive much attention lately. * icc-misc dt-bindings: interconnect: qcom: Add Qualcomm MSM8976 NoC interconnect: qcom: Add MSM8976 interconnect provider driver dt-bindings: interconnect: qcom: Add Qualcomm MSM8937 NoC interconnect: qcom: Add MSM8937 interconnect provider driver interconnect: qcom: qcs404: Mark AP-owned nodes as such interconnect: qcom: qcs404: Add regmaps and more bus descriptions dt-bindings: interconnect: qcom: msm8939: Fix example interconnect: qcom: msm8953: Add ab_coeff dt-bindings: interconnect: qcom: msm8953: Fix 'See also' in description Link: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Georgi Djakov <[email protected]>
2 parents 0af96a3 + 69704bb commit f7d27c1

File tree

10 files changed

+3143
-16
lines changed

10 files changed

+3143
-16
lines changed

Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,30 @@
44
$id: http://devicetree.org/schemas/interconnect/qcom,msm8939.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Qualcomm MSM8939 Network-On-Chip interconnect
7+
title: Qualcomm MSM8937/MSM8939/MSM8976 Network-On-Chip interconnect
88

99
maintainers:
1010
- Konrad Dybcio <[email protected]>
1111

12-
description: |
13-
The Qualcomm MSM8939 interconnect providers support adjusting the
14-
bandwidth requirements between the various NoC fabrics.
12+
description:
13+
The Qualcomm MSM8937/MSM8939/MSM8976 interconnect providers support
14+
adjusting the bandwidth requirements between the various NoC fabrics.
1515

1616
allOf:
1717
- $ref: qcom,rpm-common.yaml#
1818

1919
properties:
2020
compatible:
2121
enum:
22+
- qcom,msm8937-bimc
23+
- qcom,msm8937-pcnoc
24+
- qcom,msm8937-snoc
2225
- qcom,msm8939-bimc
2326
- qcom,msm8939-pcnoc
2427
- qcom,msm8939-snoc
28+
- qcom,msm8976-bimc
29+
- qcom,msm8976-pcnoc
30+
- qcom,msm8976-snoc
2531

2632
reg:
2733
maxItems: 1
@@ -39,7 +45,10 @@ patternProperties:
3945

4046
properties:
4147
compatible:
42-
const: qcom,msm8939-snoc-mm
48+
enum:
49+
- qcom,msm8937-snoc-mm
50+
- qcom,msm8939-snoc-mm
51+
- qcom,msm8976-snoc-mm
4352

4453
required:
4554
- compatible
@@ -60,12 +69,6 @@ examples:
6069
compatible = "qcom,msm8939-snoc";
6170
reg = <0x00580000 0x14000>;
6271
#interconnect-cells = <1>;
63-
};
64-
65-
bimc: interconnect@400000 {
66-
compatible = "qcom,msm8939-bimc";
67-
reg = <0x00400000 0x62000>;
68-
#interconnect-cells = <1>;
6972
7073
snoc_mm: interconnect-snoc {
7174
compatible = "qcom,msm8939-snoc-mm";

Documentation/devicetree/bindings/interconnect/qcom,msm8953.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ description: |
1313
The Qualcomm MSM8953 interconnect providers support adjusting the
1414
bandwidth requirements between the various NoC fabrics.
1515
16-
See also:
17-
- dt-bindings/interconnect/qcom,msm8953.h
16+
See also: include/dt-bindings/interconnect/qcom,msm8953.h
1817
1918
properties:
2019
compatible:

drivers/interconnect/qcom/Kconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ config INTERCONNECT_QCOM_MSM8916
2626
This is a driver for the Qualcomm Network-on-Chip on msm8916-based
2727
platforms.
2828

29+
config INTERCONNECT_QCOM_MSM8937
30+
tristate "Qualcomm MSM8937 interconnect driver"
31+
depends on INTERCONNECT_QCOM
32+
depends on QCOM_SMD_RPM
33+
select INTERCONNECT_QCOM_SMD_RPM
34+
help
35+
This is a driver for the Qualcomm Network-on-Chip on msm8937-based
36+
platforms.
37+
2938
config INTERCONNECT_QCOM_MSM8939
3039
tristate "Qualcomm MSM8939 interconnect driver"
3140
depends on INTERCONNECT_QCOM
@@ -53,6 +62,15 @@ config INTERCONNECT_QCOM_MSM8974
5362
This is a driver for the Qualcomm Network-on-Chip on msm8974-based
5463
platforms.
5564

65+
config INTERCONNECT_QCOM_MSM8976
66+
tristate "Qualcomm MSM8976 interconnect driver"
67+
depends on INTERCONNECT_QCOM
68+
depends on QCOM_SMD_RPM
69+
select INTERCONNECT_QCOM_SMD_RPM
70+
help
71+
This is a driver for the Qualcomm Network-on-Chip on msm8976-based
72+
platforms.
73+
5674
config INTERCONNECT_QCOM_MSM8996
5775
tristate "Qualcomm MSM8996 interconnect driver"
5876
depends on INTERCONNECT_QCOM

drivers/interconnect/qcom/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ interconnect_qcom-y := icc-common.o
66
icc-bcm-voter-objs := bcm-voter.o
77
qnoc-msm8909-objs := msm8909.o
88
qnoc-msm8916-objs := msm8916.o
9+
qnoc-msm8937-objs := msm8937.o
910
qnoc-msm8939-objs := msm8939.o
1011
qnoc-msm8953-objs := msm8953.o
1112
qnoc-msm8974-objs := msm8974.o
13+
qnoc-msm8976-objs := msm8976.o
1214
qnoc-msm8996-objs := msm8996.o
1315
icc-osm-l3-objs := osm-l3.o
1416
qnoc-qcm2290-objs := qcm2290.o
@@ -41,9 +43,11 @@ icc-smd-rpm-objs := smd-rpm.o icc-rpm.o icc-rpm-clocks.o
4143
obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o
4244
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8909) += qnoc-msm8909.o
4345
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += qnoc-msm8916.o
46+
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8937) += qnoc-msm8937.o
4447
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8939) += qnoc-msm8939.o
4548
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8953) += qnoc-msm8953.o
4649
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8974) += qnoc-msm8974.o
50+
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8976) += qnoc-msm8976.o
4751
obj-$(CONFIG_INTERCONNECT_QCOM_MSM8996) += qnoc-msm8996.o
4852
obj-$(CONFIG_INTERCONNECT_QCOM_OSM_L3) += icc-osm-l3.o
4953
obj-$(CONFIG_INTERCONNECT_QCOM_QCM2290) += qnoc-qcm2290.o

0 commit comments

Comments
 (0)