diff mbox series

[3/5] dt-bindings: interconnect: single yaml file for RPM interconnect drivers

Message ID 20200930081645.3434-4-jun.nie@linaro.org (mailing list archive)
State Not Applicable, archived
Headers show
Series Consolidate RPM interconnect and support to MSM8939 | expand

Commit Message

Jun Nie Sept. 30, 2020, 8:16 a.m. UTC
MSM8916 and QCS404 bindings are almost identical, so combine them into one.
This will make it easier to add interconnect bindings for more SoC with RPM.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
---
 .../bindings/interconnect/qcom,qcs404.yaml    | 77 -------------------
 .../{qcom,msm8916.yaml => qcom,rpm.yaml}      | 24 +++---
 2 files changed, 14 insertions(+), 87 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
 rename Documentation/devicetree/bindings/interconnect/{qcom,msm8916.yaml => qcom,rpm.yaml} (76%)

Comments

Rob Herring (Arm) Oct. 6, 2020, 7:13 p.m. UTC | #1
On Wed, Sep 30, 2020 at 04:16:43PM +0800, Jun Nie wrote:
> MSM8916 and QCS404 bindings are almost identical, so combine them into one.
> This will make it easier to add interconnect bindings for more SoC with RPM.
> 
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> ---
>  .../bindings/interconnect/qcom,qcs404.yaml    | 77 -------------------
>  .../{qcom,msm8916.yaml => qcom,rpm.yaml}      | 24 +++---
>  2 files changed, 14 insertions(+), 87 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
>  rename Documentation/devicetree/bindings/interconnect/{qcom,msm8916.yaml => qcom,rpm.yaml} (76%)
> 
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
> deleted file mode 100644
> index 3fbb8785fbc9..000000000000
> --- a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -# 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>;
> -      };
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> similarity index 76%
> rename from Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
> rename to Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> index e1009ae4e8f7..e9f856357822 100644
> --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
> +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> @@ -1,28 +1,32 @@
>  # 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:
> -  compatible:
> -    enum:
> -      - qcom,msm8916-bimc
> -      - qcom,msm8916-pcnoc
> -      - qcom,msm8916-snoc
> -
>    reg:
>      maxItems: 1
>  
> +  compatible:
> +        enum:

Wrong indentation...

With that fixed,

Reviewed-by: Rob Herring <robh@kernel.org>

> +          - qcom,msm8916-bimc
> +          - qcom,msm8916-pcnoc
> +          - qcom,msm8916-snoc
> +          - qcom,qcs404-bimc
> +          - qcom,qcs404-pcnoc
> +          - qcom,qcs404-snoc
> +
>    '#interconnect-cells':
>      const: 1
>  
> -- 
> 2.17.1
>
Rob Herring (Arm) Oct. 6, 2020, 7:14 p.m. UTC | #2
On Wed, Sep 30, 2020 at 04:16:43PM +0800, Jun Nie wrote:
> MSM8916 and QCS404 bindings are almost identical, so combine them into one.
> This will make it easier to add interconnect bindings for more SoC with RPM.
> 
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> ---
>  .../bindings/interconnect/qcom,qcs404.yaml    | 77 -------------------
>  .../{qcom,msm8916.yaml => qcom,rpm.yaml}      | 24 +++---
>  2 files changed, 14 insertions(+), 87 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
>  rename Documentation/devicetree/bindings/interconnect/{qcom,msm8916.yaml => qcom,rpm.yaml} (76%)
> 
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
> deleted file mode 100644
> index 3fbb8785fbc9..000000000000
> --- a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -# 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>;
> -      };
> diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> similarity index 76%
> rename from Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
> rename to Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> index e1009ae4e8f7..e9f856357822 100644
> --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
> +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
> @@ -1,28 +1,32 @@
>  # 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.

And here the indentation is wrong too.

>  
>  properties:
> -  compatible:
> -    enum:
> -      - qcom,msm8916-bimc
> -      - qcom,msm8916-pcnoc
> -      - qcom,msm8916-snoc
> -
>    reg:
>      maxItems: 1
>  
> +  compatible:
> +        enum:
> +          - qcom,msm8916-bimc
> +          - qcom,msm8916-pcnoc
> +          - qcom,msm8916-snoc
> +          - qcom,qcs404-bimc
> +          - qcom,qcs404-pcnoc
> +          - qcom,qcs404-snoc
> +
>    '#interconnect-cells':
>      const: 1
>  
> -- 
> 2.17.1
>
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
deleted file mode 100644
index 3fbb8785fbc9..000000000000
--- a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml
+++ /dev/null
@@ -1,77 +0,0 @@ 
-# 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>;
-      };
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
similarity index 76%
rename from Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
rename to Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
index e1009ae4e8f7..e9f856357822 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
@@ -1,28 +1,32 @@ 
 # 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:
-  compatible:
-    enum:
-      - qcom,msm8916-bimc
-      - qcom,msm8916-pcnoc
-      - qcom,msm8916-snoc
-
   reg:
     maxItems: 1
 
+  compatible:
+        enum:
+          - qcom,msm8916-bimc
+          - qcom,msm8916-pcnoc
+          - qcom,msm8916-snoc
+          - qcom,qcs404-bimc
+          - qcom,qcs404-pcnoc
+          - qcom,qcs404-snoc
+
   '#interconnect-cells':
     const: 1