diff options
| author |  Rob Herring <robh@kernel.org>
| 2022-04-19 07:55:12 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org>
| 2022-04-19 07:55:12 -0500 |
| commit | 2bd50abce1b6636bd3c9064e7ae5c0f832a615b2 (patch) | |
| tree | 3e9047eacab5c5035400d7f9d66272221c2bfab4 /Documentation/devicetree/bindings/gpu | |
| parent | dt-bindings: soc: qcom,smp2p: convert to dtschema (diff) | |
| parent | dt-bindings: display: panel-timing: Define a single type for properties (diff) | |
| download | linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.tar.gz linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.tar.bz2 linux-2bd50abce1b6636bd3c9064e7ae5c0f832a615b2.zip | |
Merge branch 'dt/linus' into dt/next
Pick up new meta-schema warning fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/gpu')
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml index 4d6bfae0653c..85f8d4764740 100644 --- a/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml +++ b/Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml @@ -20,6 +20,7 @@ properties: - mediatek,mt8183-mali - realtek,rtd1619-mali - renesas,r9a07g044-mali + - renesas,r9a07g054-mali - rockchip,px30-mali - rockchip,rk3568-mali - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable @@ -109,7 +110,9 @@ allOf: properties: compatible: contains: - const: renesas,r9a07g044-mali + enum: + - renesas,r9a07g044-mali + - renesas,r9a07g054-mali then: properties: interrupts: |