diff options
author | Georgi Djakov <djakov@kernel.org> | 2023-07-18 11:18:53 +0300 |
---|---|---|
committer | Georgi Djakov <djakov@kernel.org> | 2023-07-18 11:18:53 +0300 |
commit | 10cb3abb99939f6a81b714a64915b1468597fb74 (patch) | |
tree | 8928fc8430d6ff5709deb7a2239ef06fc21b550f /Documentation/devicetree/bindings/interconnect | |
parent | c73e60e07119408af898f010d6a52b49c9d97cbf (diff) | |
parent | cde2f928ae7c59f72675bed13157b18fb7ddbcdd (diff) | |
download | linux-10cb3abb99939f6a81b714a64915b1468597fb74.tar.xz |
Merge branch 'icc-sm8250-qup' into icc-next
SM8250 (like SM8150 but unlike all other QUP-equipped SoCs) doesn't
provide a qup-core path. Adjust the bindings and drivers as necessary,
and then describe the icc paths in the device tree. This makes it possible
for interconnect sync_state succeed so long as you don't use UFS.
* icc-sm8250-qup
dt-bindings: interconnect: qcom,rpmh: Add SM8250 QUP virt
dt-bindings: interconnect: qcom,sm8250: Add QUP virt
interconnect: qcom: sm8250: Fix QUP0 nodes
Link: https://lore.kernel.org/r/20230703-topic-8250_qup_icc-v2-0-9ba0a9460be2@linaro.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/interconnect')
-rw-r--r-- | Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml index 4d93ad415e0b..a46497af1fd8 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml @@ -18,9 +18,6 @@ description: | least one RPMh device child node pertaining to their RSC and each provider can map to multiple RPMh resources. -allOf: - - $ref: qcom,rpmh-common.yaml# - properties: reg: maxItems: 1 @@ -91,6 +88,7 @@ properties: - qcom,sm8250-mc-virt - qcom,sm8250-mmss-noc - qcom,sm8250-npu-noc + - qcom,sm8250-qup-virt - qcom,sm8250-system-noc - qcom,sm8350-aggre1-noc - qcom,sm8350-aggre2-noc @@ -107,7 +105,19 @@ properties: required: - compatible - - reg + +allOf: + - $ref: qcom,rpmh-common.yaml# + - if: + not: + properties: + compatible: + enum: + - qcom,sm8250-qup-virt + then: + required: + - reg + unevaluatedProperties: false |