Skip to content

Commit 0ea4cc9

Browse files
committed
Merge tag 'icc-6.19-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus
interconnect fixes for v6.19-rc This contains a few small fixes for the current cycle. - dt-bindings: interconnect: qcom,sa8775p-rpmh: Fix incorrectly added reg and clocks - MAINTAINERS: Add interconnect-clk.h to interconnect API entry - interconnect: debugfs: initialize src_node and dst_node to empty strings Signed-off-by: Georgi Djakov <djakov@kernel.org> * tag 'icc-6.19-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc: interconnect: debugfs: initialize src_node and dst_node to empty strings MAINTAINERS: Add interconnect-clk.h to interconnect API entry dt-bindings: interconnect: qcom,sa8775p-rpmh: Fix incorrectly added reg and clocks
2 parents 36a7060 + 8cc27f5 commit 0ea4cc9

3 files changed

Lines changed: 37 additions & 0 deletions

File tree

Documentation/devicetree/bindings/interconnect/qcom,sa8775p-rpmh.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,37 @@ allOf:
7474
- description: aggre UFS CARD AXI clock
7575
- description: RPMH CC IPA clock
7676

77+
- if:
78+
properties:
79+
compatible:
80+
contains:
81+
enum:
82+
- qcom,sa8775p-config-noc
83+
- qcom,sa8775p-dc-noc
84+
- qcom,sa8775p-gem-noc
85+
- qcom,sa8775p-gpdsp-anoc
86+
- qcom,sa8775p-lpass-ag-noc
87+
- qcom,sa8775p-mmss-noc
88+
- qcom,sa8775p-nspa-noc
89+
- qcom,sa8775p-nspb-noc
90+
- qcom,sa8775p-pcie-anoc
91+
- qcom,sa8775p-system-noc
92+
then:
93+
properties:
94+
clocks: false
95+
96+
- if:
97+
properties:
98+
compatible:
99+
contains:
100+
enum:
101+
- qcom,sa8775p-clk-virt
102+
- qcom,sa8775p-mc-virt
103+
then:
104+
properties:
105+
reg: false
106+
clocks: false
107+
77108
unevaluatedProperties: false
78109

79110
examples:

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13167,6 +13167,7 @@ F: Documentation/devicetree/bindings/interconnect/
1316713167
F: Documentation/driver-api/interconnect.rst
1316813168
F: drivers/interconnect/
1316913169
F: include/dt-bindings/interconnect/
13170+
F: include/linux/interconnect-clk.h
1317013171
F: include/linux/interconnect-provider.h
1317113172
F: include/linux/interconnect.h
1317213173

drivers/interconnect/debugfs-client.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ int icc_debugfs_client_init(struct dentry *icc_dir)
150150
return ret;
151151
}
152152

153+
src_node = devm_kstrdup(&pdev->dev, "", GFP_KERNEL);
154+
dst_node = devm_kstrdup(&pdev->dev, "", GFP_KERNEL);
155+
if (!src_node || !dst_node)
156+
return -ENOMEM;
157+
153158
client_dir = debugfs_create_dir("test_client", icc_dir);
154159

155160
debugfs_create_str("src_node", 0600, client_dir, &src_node);

0 commit comments

Comments
 (0)