Commit dfeef93f authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Georgi Djakov
Browse files

dt-bindings: interconnect: Convert snoc-mm to a sub-node of snoc 



snoc and snoc-mm in downstream use the same address space a mistake which
we have carried over into upstream. In silicon terms snoc-mm has been
tacked on to the original snoc which came from msm8916.

Convert to a better description where snoc-mm is a sub-node of snoc, thus
avoiding a mmio remap collision when using the RPM interconnect driver.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220129032735.2410936-2-bryan.odonoghue@linaro.org


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

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

+31 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ properties: 
      - qcom,msm8939-bimc

      - qcom,msm8939-pcnoc

      - qcom,msm8939-snoc

      - qcom,msm8939-snoc-mm

      - qcom,msm8996-a0noc

      - qcom,msm8996-a1noc

      - qcom,msm8996-a2noc
@@ -80,7 +79,6 @@ allOf: 
              - qcom,msm8939-bimc

              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8939-snoc-mm

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc
@@ -107,6 +105,37 @@ allOf: 
              - description: Bus Clock

              - description: Bus A Clock



        # Child node's properties

        patternProperties:

          '^interconnect-[a-z0-9]+$':

            type: object

            description:

              snoc-mm is a child of snoc, sharing snoc's register address space.



            properties:

              compatible:

                enum:

                  - qcom,msm8939-snoc-mm



              '#interconnect-cells':

                const: 1



              clock-names:

                items:

                  - const: bus

                  - const: bus_a



              clocks:

                items:

                  - description: Bus Clock

                  - description: Bus A Clock



            required:

              - compatible

              - '#interconnect-cells'

              - clock-names

              - clocks



  - if:

      properties:

        compatible: