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

Merge tag 'icc-6.18-rc1' of... 

Merge tag 'icc-6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-next

Georgi writes:

interconnect changes for 6.18

This pull request contains the interconnect changes for the 6.18-rc1
merge window. It contains new driver and a minor core cleanup.

Core change:
- Use device_match_of_node() instead of open coding it

Driver changes:
- Add new driver for the Qualcomm Glymur SoC
- Enable OSM L3 support for the QCS615 SoC

Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-6.18-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  dt-bindings: interconnect: Add OSM L3 compatible for QCS615 SoC
  interconnect: core: Use device_match_of_node()
  interconnect: qcom: add glymur interconnect provider driver
  interconnect: qcom: icc-rpmh: increase MAX_PORTS to support four QoS ports
  dt-bindings: interconnect: document the RPMh Network-On-Chip interconnect in Glymur SoC
parents eafedbc7 bcdf7a06

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

0 → 100644
+172 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/interconnect/qcom,glymur-rpmh.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Qualcomm RPMh Network-On-Chip Interconnect on GLYMUR



maintainers:

  - Raviteja Laggyshetty <raviteja.laggyshetty@oss.qualcomm.com>



description: |

  RPMh interconnect providers support system bandwidth requirements through

  RPMh hardware accelerators known as Bus Clock Manager (BCM). The provider is

  able to communicate with the BCM through the Resource State Coordinator (RSC)

  associated with each execution environment. Provider nodes must point to at

  least one RPMh device child node pertaining to their RSC and each provider

  can map to multiple RPMh resources.



  See also: include/dt-bindings/interconnect/qcom,glymur-rpmh.h



properties:

  compatible:

    enum:

      - qcom,glymur-aggre1-noc

      - qcom,glymur-aggre2-noc

      - qcom,glymur-aggre3-noc

      - qcom,glymur-aggre4-noc

      - qcom,glymur-clk-virt

      - qcom,glymur-cnoc-cfg

      - qcom,glymur-cnoc-main

      - qcom,glymur-hscnoc

      - qcom,glymur-lpass-ag-noc

      - qcom,glymur-lpass-lpiaon-noc

      - qcom,glymur-lpass-lpicx-noc

      - qcom,glymur-mc-virt

      - qcom,glymur-mmss-noc

      - qcom,glymur-nsinoc

      - qcom,glymur-nsp-noc

      - qcom,glymur-oobm-ss-noc

      - qcom,glymur-pcie-east-anoc

      - qcom,glymur-pcie-east-slv-noc

      - qcom,glymur-pcie-west-anoc

      - qcom,glymur-pcie-west-slv-noc

      - qcom,glymur-system-noc



  reg:

    maxItems: 1



  clocks:

    minItems: 1

    maxItems: 4



required:

  - compatible



allOf:

  - $ref: qcom,rpmh-common.yaml#

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-clk-virt

              - qcom,glymur-mc-virt

    then:

      properties:

        reg: false

    else:

      required:

        - reg



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-pcie-west-anoc

    then:

      properties:

        clocks:

          items:

            - description: aggre PCIE_3A WEST AXI clock

            - description: aggre PCIE_3B WEST AXI clock

            - description: aggre PCIE_4 WEST AXI clock

            - description: aggre PCIE_6 WEST AXI clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-pcie-east-anoc

    then:

      properties:

        clocks:

          items:

            - description: aggre PCIE_5 EAST AXI clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-aggre2-noc

    then:

      properties:

        clocks:

          items:

            - description: aggre USB3 TERT AXI clock

            - description: aggre USB4_2 AXI clock

            - description: aggre UFS PHY AXI clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-aggre4-noc

    then:

      properties:

        clocks:

          items:

            - description: aggre USB3 PRIM AXI clock

            - description: aggre USB3 SEC AXI clock

            - description: aggre USB4_0 AXI clock

            - description: aggre USB4_1 AXI clock



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,glymur-pcie-west-anoc

              - qcom,glymur-pcie-east-anoc

              - qcom,glymur-aggre2-noc

              - qcom,glymur-aggre4-noc

    then:

      required:

        - clocks

    else:

      properties:

        clocks: false



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/qcom,glymur-gcc.h>

    clk_virt: interconnect-0 {

      compatible = "qcom,glymur-clk-virt";

      #interconnect-cells = <2>;

      qcom,bcm-voters = <&apps_bcm_voter>;

    };



    aggre1_noc: interconnect@16e0000 {

      compatible = "qcom,glymur-aggre1-noc";

      reg = <0x016e0000 0x14400>;

      #interconnect-cells = <2>;

      qcom,bcm-voters = <&apps_bcm_voter>;

    };



    aggre4_noc: interconnect@1740000 {

      compatible = "qcom,glymur-aggre4-noc";

      reg = <0x01740000 0x14400>;

      #interconnect-cells = <2>;

      qcom,bcm-voters = <&apps_bcm_voter>;

      clocks = <&gcc GCC_AGGRE_USB3_PRIM_AXI_CLK>,

               <&gcc GCC_AGGRE_USB3_SEC_AXI_CLK>,

               <&gcc GCC_AGGRE_USB4_0_AXI_CLK>,

               <&gcc GCC_AGGRE_USB4_1_AXI_CLK>;

    };

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

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ properties: 
              - qcom,qcs8300-epss-l3

          - const: qcom,sa8775p-epss-l3

          - const: qcom,epss-l3

      - items:

          - enum:

              - qcom,qcs615-osm-l3

          - const: qcom,sm8150-osm-l3

          - const: qcom,osm-l3



  reg:

    maxItems: 1

drivers/interconnect/core.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ struct icc_node_data *of_icc_get_from_provider(const struct of_phandle_args *spe 


	mutex_lock(&icc_lock);

	list_for_each_entry(provider, &icc_providers, provider_list) {

		if (provider->dev->of_node == spec->np) {

		if (device_match_of_node(provider->dev, spec->np)) {

			if (provider->xlate_extended) {

				data = provider->xlate_extended(spec, provider->data);

				if (!IS_ERR(data)) {

drivers/interconnect/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -8,6 +8,15 @@ config INTERCONNECT_QCOM 
config INTERCONNECT_QCOM_BCM_VOTER

	tristate



config INTERCONNECT_QCOM_GLYMUR

       tristate "Qualcomm GLYMUR interconnect driver"

       depends on INTERCONNECT_QCOM_RPMH_POSSIBLE

       select INTERCONNECT_QCOM_RPMH

       select INTERCONNECT_QCOM_BCM_VOTER

       help

         This is a driver for the Qualcomm Network-on-Chip on glymur-based

         platforms.



config INTERCONNECT_QCOM_MSM8909

	tristate "Qualcomm MSM8909 interconnect driver"

	depends on INTERCONNECT_QCOM

drivers/interconnect/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_INTERCONNECT_QCOM) += interconnect_qcom.o 


interconnect_qcom-y			:= icc-common.o

icc-bcm-voter-objs			:= bcm-voter.o

qnoc-glymur-objs			:= glymur.o

qnoc-milos-objs				:= milos.o

qnoc-msm8909-objs			:= msm8909.o

qnoc-msm8916-objs			:= msm8916.o
@@ -46,6 +47,7 @@ qnoc-x1e80100-objs := x1e80100.o 
icc-smd-rpm-objs			:= smd-rpm.o icc-rpm.o icc-rpm-clocks.o



obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o

obj-$(CONFIG_INTERCONNECT_QCOM_GLYMUR) += qnoc-glymur.o

obj-$(CONFIG_INTERCONNECT_QCOM_MILOS) += qnoc-milos.o

obj-$(CONFIG_INTERCONNECT_QCOM_MSM8909) += qnoc-msm8909.o

obj-$(CONFIG_INTERCONNECT_QCOM_MSM8916) += qnoc-msm8916.o