Commit 9919d418 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'icc-6.1-rc6' of...

Merge tag 'icc-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus

Georgi writes:
  interconnect fix for v6.1-rc

   This contains a tiny fix to align the driver compatible string in the
   binding documentation with the one used in DTS.

   - dt-bindings: interconnect: qcom,msm8998-bwmon: Correct SC7280 CPU compatible
Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>

* tag 'icc-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  dt-bindings: interconnect: qcom,msm8998-bwmon: Correct SC7280 CPU compatible
parents 634c5fa1 1498a5a7
...@@ -24,7 +24,7 @@ properties: ...@@ -24,7 +24,7 @@ properties:
oneOf: oneOf:
- items: - items:
- enum: - enum:
- qcom,sc7280-bwmon - qcom,sc7280-cpu-bwmon
- qcom,sdm845-bwmon - qcom,sdm845-bwmon
- const: qcom,msm8998-bwmon - const: qcom,msm8998-bwmon
- const: qcom,msm8998-bwmon # BWMON v4 - const: qcom,msm8998-bwmon # BWMON v4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment