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

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

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

 into char-misc-next

Georgi writes:

interconnect changes for 5.12

Here are the interconnect changes for the 5.12-rc1 merge window
consisting of driver updates.

Driver changes:
- Refactoring and consolidation of drivers.
- New driver for MSM8939 platforms.
- New driver for SDX55 platforms.

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

* tag 'icc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: Add SDX55 interconnect provider driver
  dt-bindings: interconnect: Add Qualcomm SDX55 DT bindings
  interconnect: qcom: Add MSM8939 interconnect provider driver
  dt-bindings: interconnect: Add Qualcomm MSM8939 DT bindings
  dt-bindings: interconnect: single yaml file for RPM interconnect drivers
  interconnect: qcom: qcs404: use shared code
  interconnect: qcom: Consolidate interconnect RPM support
parents 920fd8a7 6715ea06

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

deleted100644 → 0
+0 −77
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,qcs404.yaml#

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



title: Qualcomm QCS404 Network-On-Chip interconnect



maintainers:

  - Georgi Djakov <georgi.djakov@linaro.org>



description: |

  The Qualcomm QCS404 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.



properties:

  reg:

    maxItems: 1



  compatible:

    enum:

      - qcom,qcs404-bimc

      - qcom,qcs404-pcnoc

      - qcom,qcs404-snoc



  '#interconnect-cells':

    const: 1



  clock-names:

    items:

      - const: bus

      - const: bus_a



  clocks:

    items:

      - description: Bus Clock

      - description: Bus A Clock



required:

  - compatible

  - reg

  - '#interconnect-cells'

  - clock-names

  - clocks



additionalProperties: false



examples:

  - |

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



      bimc: interconnect@400000 {

              reg = <0x00400000 0x80000>;

              compatible = "qcom,qcs404-bimc";

              #interconnect-cells = <1>;

              clock-names = "bus", "bus_a";

              clocks = <&rpmcc RPM_SMD_BIMC_CLK>,

                       <&rpmcc RPM_SMD_BIMC_A_CLK>;

      };



      pnoc: interconnect@500000 {

             reg = <0x00500000 0x15080>;

             compatible = "qcom,qcs404-pcnoc";

             #interconnect-cells = <1>;

             clock-names = "bus", "bus_a";

             clocks = <&rpmcc RPM_SMD_PNOC_CLK>,

                      <&rpmcc RPM_SMD_PNOC_A_CLK>;

      };



      snoc: interconnect@580000 {

            reg = <0x00580000 0x23080>;

            compatible = "qcom,qcs404-snoc";

            #interconnect-cells = <1>;

            clock-names = "bus", "bus_a";

            clocks = <&rpmcc RPM_SMD_SNOC_CLK>,

                     <&rpmcc RPM_SMD_SNOC_A_CLK>;

      };

Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml→Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

+15 −7
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,msm8916.yaml#

$id: http://devicetree.org/schemas/interconnect/qcom,rpm.yaml#

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



title: Qualcomm MSM8916 Network-On-Chip interconnect

title: Qualcomm RPM Network-On-Chip Interconnect



maintainers:

  - Georgi Djakov <georgi.djakov@linaro.org>



description: |

  The Qualcomm MSM8916 interconnect providers support adjusting the

  bandwidth requirements between the various NoC fabrics.

  RPM interconnect providers support system bandwidth requirements through

  RPM processor. The provider is able to communicate with the RPM through

  the RPM shared memory device.



properties:

  reg:

    maxItems: 1



  compatible:

    enum:

      - qcom,msm8916-bimc

      - qcom,msm8916-pcnoc

      - qcom,msm8916-snoc



  reg:

    maxItems: 1

      - qcom,msm8939-bimc

      - qcom,msm8939-pcnoc

      - qcom,msm8939-snoc

      - qcom,msm8939-snoc-mm

      - qcom,qcs404-bimc

      - qcom,qcs404-pcnoc

      - qcom,qcs404-snoc



  '#interconnect-cells':

    const: 1

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

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ properties: 
      - qcom,sdm845-mem-noc

      - qcom,sdm845-mmss-noc

      - qcom,sdm845-system-noc

      - qcom,sdx55-ipa-virt

      - qcom,sdx55-mc-virt

      - qcom,sdx55-mem-noc

      - qcom,sdx55-system-noc

      - qcom,sm8150-aggre1-noc

      - qcom,sm8150-aggre2-noc

      - qcom,sm8150-camnoc-noc

drivers/interconnect/qcom/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ config INTERCONNECT_QCOM_MSM8916 
	  This is a driver for the Qualcomm Network-on-Chip on msm8916-based

	  platforms.



config INTERCONNECT_QCOM_MSM8939

	tristate "Qualcomm MSM8939 interconnect driver"

	depends on INTERCONNECT_QCOM

	depends on QCOM_SMD_RPM

	select INTERCONNECT_QCOM_SMD_RPM

	help

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

	  platforms.



config INTERCONNECT_QCOM_MSM8974

	tristate "Qualcomm MSM8974 interconnect driver"

	depends on INTERCONNECT_QCOM
@@ -74,6 +83,15 @@ config INTERCONNECT_QCOM_SDM845 
	  This is a driver for the Qualcomm Network-on-Chip on sdm845-based

	  platforms.



config INTERCONNECT_QCOM_SDX55

	tristate "Qualcomm SDX55 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 sdx55-based

	  platforms.



config INTERCONNECT_QCOM_SM8150

	tristate "Qualcomm SM8150 interconnect driver"

	depends on INTERCONNECT_QCOM_RPMH_POSSIBLE

drivers/interconnect/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -2,24 +2,28 @@ 


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

qnoc-msm8916-objs			:= msm8916.o

qnoc-msm8939-objs			:= msm8939.o

qnoc-msm8974-objs			:= msm8974.o

icc-osm-l3-objs				:= osm-l3.o

qnoc-qcs404-objs			:= qcs404.o

icc-rpmh-obj				:= icc-rpmh.o

qnoc-sc7180-objs			:= sc7180.o

qnoc-sdm845-objs			:= sdm845.o

qnoc-sdx55-objs				:= sdx55.o

qnoc-sm8150-objs			:= sm8150.o

qnoc-sm8250-objs			:= sm8250.o

icc-smd-rpm-objs			:= smd-rpm.o

icc-smd-rpm-objs			:= smd-rpm.o icc-rpm.o



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

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

obj-$(CONFIG_INTERCONNECT_QCOM_MSM8939) += qnoc-msm8939.o

obj-$(CONFIG_INTERCONNECT_QCOM_MSM8974) += qnoc-msm8974.o

obj-$(CONFIG_INTERCONNECT_QCOM_OSM_L3) += icc-osm-l3.o

obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o

obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o

obj-$(CONFIG_INTERCONNECT_QCOM_SC7180) += qnoc-sc7180.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o

obj-$(CONFIG_INTERCONNECT_QCOM_SDX55) += qnoc-sdx55.o

obj-$(CONFIG_INTERCONNECT_QCOM_SM8150) += qnoc-sm8150.o

obj-$(CONFIG_INTERCONNECT_QCOM_SM8250) += qnoc-sm8250.o

obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o