Commit 0ea4cc93 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.19-rc6' of... 

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: default avatarGeorgi 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
parents 36a70608 8cc27f5c

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

+31 −0
Original line number Diff line number Diff line
@@ -74,6 +74,37 @@ allOf: 
            - description: aggre UFS CARD AXI clock

            - description: RPMH CC IPA clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sa8775p-config-noc

              - qcom,sa8775p-dc-noc

              - qcom,sa8775p-gem-noc

              - qcom,sa8775p-gpdsp-anoc

              - qcom,sa8775p-lpass-ag-noc

              - qcom,sa8775p-mmss-noc

              - qcom,sa8775p-nspa-noc

              - qcom,sa8775p-nspb-noc

              - qcom,sa8775p-pcie-anoc

              - qcom,sa8775p-system-noc

    then:

      properties:

        clocks: false



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sa8775p-clk-virt

              - qcom,sa8775p-mc-virt

    then:

      properties:

        reg: false

        clocks: false



unevaluatedProperties: false



examples:

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13167,6 +13167,7 @@ F: Documentation/devicetree/bindings/interconnect/ 
F:	Documentation/driver-api/interconnect.rst

F:	drivers/interconnect/

F:	include/dt-bindings/interconnect/

F:	include/linux/interconnect-clk.h

F:	include/linux/interconnect-provider.h

F:	include/linux/interconnect.h
































drivers/interconnect/debugfs-client.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -150,6 +150,11 @@ int icc_debugfs_client_init(struct dentry *icc_dir)







		return ret;









	}



















	src_node = devm_kstrdup(&pdev->dev, "", GFP_KERNEL);









	dst_node = devm_kstrdup(&pdev->dev, "", GFP_KERNEL);









	if (!src_node || !dst_node)









		return -ENOMEM;



















	client_dir = debugfs_create_dir("test_client", icc_dir);



















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