Skip to content

Commit

Permalink
dt-bindings: interconnect: Combine SDM660 bindings into RPM schema
Browse files Browse the repository at this point in the history
SDM660 interconnect bindings are similar to other RPM interconnect
providers, and now it shares the same common driver with them, so
it is better to combine them into qcom,rpm.yaml.

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> #db820c
Link: https://lore.kernel.org/r/20211021132329.234942-2-y.oudjana@protonmail.com
Signed-off-by: Georgi Djakov <djakov@kernel.org>
  • Loading branch information
Yassine Oudjana authored and Georgi Djakov committed Nov 22, 2021
1 parent fa55b7d commit 45c548c
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 193 deletions.
103 changes: 95 additions & 8 deletions Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,23 @@ properties:
- qcom,qcs404-bimc
- qcom,qcs404-pcnoc
- qcom,qcs404-snoc
- qcom,sdm660-a2noc
- qcom,sdm660-bimc
- qcom,sdm660-cnoc
- qcom,sdm660-gnoc
- qcom,sdm660-mnoc
- qcom,sdm660-snoc

'#interconnect-cells':
const: 1

clock-names:
items:
- const: bus
- const: bus_a

clocks:
items:
- description: Bus Clock
- description: Bus A Clock
minItems: 2
maxItems: 7

clock-names:
minItems: 2
maxItems: 7

required:
- compatible
Expand All @@ -53,6 +57,89 @@ required:

additionalProperties: false

allOf:
- if:
properties:
compatible:
contains:
enum:
- qcom,msm8916-bimc
- qcom,msm8916-pcnoc
- qcom,msm8916-snoc
- qcom,msm8939-bimc
- qcom,msm8939-pcnoc
- qcom,msm8939-snoc
- qcom,msm8939-snoc-mm
- qcom,qcs404-bimc
- qcom,qcs404-pcnoc
- qcom,qcs404-snoc
- qcom,sdm660-bimc
- qcom,sdm660-cnoc
- qcom,sdm660-gnoc
- qcom,sdm660-snoc

then:
properties:
clock-names:
items:
- const: bus
- const: bus_a

clocks:
items:
- description: Bus Clock
- description: Bus A Clock

- if:
properties:
compatible:
contains:
enum:
- qcom,sdm660-mnoc

then:
properties:
clock-names:
items:
- const: bus
- const: bus_a
- const: iface

clocks:
items:
- description: Bus Clock.
- description: Bus A Clock.
- description: CPU-NoC High-performance Bus Clock.

- if:
properties:
compatible:
contains:
enum:
- qcom,sdm660-a2noc

then:
properties:
clock-names:
items:
- const: bus
- const: bus_a
- const: ipa
- const: ufs_axi
- const: aggre2_ufs_axi
- const: aggre2_usb3_axi
- const: cfg_noc_usb2_axi

clocks:
items:
- description: Bus Clock.
- description: Bus A Clock.
- description: IPA Clock.
- description: UFS AXI Clock.
- description: Aggregate2 UFS AXI Clock.
- description: Aggregate2 USB3 AXI Clock.
- description: Config NoC USB2 AXI Clock.

examples:
- |
#include <dt-bindings/clock/qcom,rpmcc.h>
Expand Down
185 changes: 0 additions & 185 deletions Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml

This file was deleted.

0 comments on commit 45c548c

Please sign in to comment.