From 2bd074d2287a78645687ba075bc5842ddab85437 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 7 Apr 2020 09:25:48 +0200 Subject: [PATCH] ANDROID: clean up merge issues with gmu.yaml patch The commit "FROMLIST: dt-bindings: display: msm: Convert GMU bindings to YAML" was not quite merged the same way upstream. So clean up our local version to match what upstream ended up taking. Cc: Jordan Crouse Cc: John Stultz Link: https://lore.kernel.org/lkml/1582223216-23459-2-git-send-email-jcrouse@codeaurora.org/ Signed-off-by: Greg Kroah-Hartman Change-Id: I5598d6deae27a1f2ec21b27a3ff6113cbcdd996b --- .../devicetree/bindings/display/msm/gmu.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/gmu.yaml b/Documentation/devicetree/bindings/display/msm/gmu.yaml index d11a073ed4f9..9785dc3f54bc 100644 --- a/Documentation/devicetree/bindings/display/msm/gmu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gmu.yaml @@ -72,16 +72,9 @@ properties: - const: gx iommus: - $ref: /schemas/types.yaml#/definitions/phandle-array - description: - Phandle to a IOMMU device and stream ID. Refer to ../../iommu/iommu.txt - for more information. + maxItems: 1 - operating-points-v2: - $ref: /schemas/types.yaml#/definitions/phandle - description: - Phandle to the OPP table for the available GMU frequencies. Refer to - ../../opp/opp.txt for more information. + operating-points-v2: true dma-ranges: $ref: /schemas/types.yaml#/definitions/uint32-array