diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-30 18:41:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-30 18:41:36 +0100 |
| commit | bbb09f8353c1192ce436eb32ffae9105bc6e1d27 (patch) | |
| tree | 8f03cf6897db7865a81b8e43ffc233356cf5bf6c /Documentation | |
| parent | Merge tag 'coresight-next-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge branch 'icc-sc8280xp-l3' into icc-next (diff) | |
| download | linux-bbb09f8353c1192ce436eb32ffae9105bc6e1d27.tar.xz linux-bbb09f8353c1192ce436eb32ffae9105bc6e1d27.zip | |
Merge tag 'icc-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next
Georgi writes:
interconnect changes for 6.2
These are the interconnect changes for the 6.2-rc1 merge window consisting
of new drivers to enable both L3 and DDR scaling on sc8280xp platforms.
There are also a few miscellaneous fixes.
New osm-l3 driver:
- interconnect: qcom: osm-l3: Use platform-independent node ids
- interconnect: qcom: osm-l3: Squash common descriptors
- interconnect: qcom: osm-l3: Add per-core EPSS L3 support
- interconnect: qcom: osm-l3: Simplify osm_l3_set()
- dt-bindings: interconnect: Add sm8350, sc8280xp and generic OSM L3 compatibles
- dt-bindings: interconnect: qcom,msm8998-bwmon: Add sc8280xp bwmon instances
Fixes:
- interconnect: qcom: icc-rpm: Remove redundant dev_err call
- interconnect: qcom: sc7180: fix dropped const of qcom_icc_bcm
- interconnect: qcom: sc7180: drop double space
- interconnect: qcom: sc8180x: constify pointer to qcom_icc_node
Signed-off-by: Georgi Djakov <djakov@kernel.org>
* tag 'icc-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
interconnect: qcom: sc8180x: constify pointer to qcom_icc_node
interconnect: qcom: sc7180: drop double space
interconnect: qcom: sc7180: fix dropped const of qcom_icc_bcm
interconnect: qcom: icc-rpm: Remove redundant dev_err call
dt-bindings: interconnect: qcom,msm8998-bwmon: Add sc8280xp bwmon instances
dt-bindings: interconnect: Add sm8350, sc8280xp and generic OSM L3 compatibles
interconnect: qcom: osm-l3: Simplify osm_l3_set()
interconnect: qcom: osm-l3: Add per-core EPSS L3 support
interconnect: qcom: osm-l3: Squash common descriptors
interconnect: qcom: osm-l3: Use platform-independent node ids
dt-bindings: interconnect: qcom,msm8998-bwmon: Correct SC7280 CPU compatible
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml | 7 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml | 24 |
2 files changed, 22 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml index 2684562df4d9..0c720dbde36e 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml @@ -24,10 +24,15 @@ properties: oneOf: - items: - enum: - - qcom,sc7280-bwmon + - qcom,sc7280-cpu-bwmon + - qcom,sc8280xp-cpu-bwmon - qcom,sdm845-bwmon - const: qcom,msm8998-bwmon - const: qcom,msm8998-bwmon # BWMON v4 + - items: + - enum: + - qcom,sc8280xp-llcc-bwmon + - const: qcom,sc7280-llcc-bwmon - const: qcom,sc7280-llcc-bwmon # BWMON v5 - const: qcom,sdm845-llcc-bwmon # BWMON v5 diff --git a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml index bf538c0c5a81..aadae4424ba9 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml @@ -16,13 +16,21 @@ description: properties: compatible: - enum: - - qcom,sc7180-osm-l3 - - qcom,sc7280-epss-l3 - - qcom,sc8180x-osm-l3 - - qcom,sdm845-osm-l3 - - qcom,sm8150-osm-l3 - - qcom,sm8250-epss-l3 + oneOf: + - items: + - enum: + - qcom,sc7180-osm-l3 + - qcom,sc8180x-osm-l3 + - qcom,sdm845-osm-l3 + - qcom,sm8150-osm-l3 + - const: qcom,osm-l3 + - items: + - enum: + - qcom,sc7280-epss-l3 + - qcom,sc8280xp-epss-l3 + - qcom,sm8250-epss-l3 + - qcom,sm8350-epss-l3 + - const: qcom,epss-l3 reg: maxItems: 1 @@ -56,7 +64,7 @@ examples: #define RPMH_CXO_CLK 0 osm_l3: interconnect@17d41000 { - compatible = "qcom,sdm845-osm-l3"; + compatible = "qcom,sdm845-osm-l3", "qcom,osm-l3"; reg = <0x17d41000 0x1400>; clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GPLL0>; |