Merge drm/drm-next into drm-misc-next

[platform/kernel/linux-rpi.git] / Documentation / devicetree / bindings / gpu / arm,mali-midgard.txt

diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
index abaca05..2658b8e 100644 (file)
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@ -46,6 +46,21 @@ Optional properties:
 - #cooling-cells: Refer to Documentation/devicetree/bindings/thermal/thermal.txt
   for details.
 
+- resets : Phandle of the GPU reset line.
+
+Vendor-specific bindings
+------------------------
+
+The Mali GPU is integrated very differently from one SoC to
+another. In order to accomodate those differences, you have the option
+to specify one more vendor-specific compatible, among:
+
+- "amlogic,meson-gxm-mali"
+  Required properties:
+  - resets : Should contain phandles of :
+    + GPU reset line
+    + GPU APB glue reset line
+
 Example for a Mali-T760:
 
 gpu@ffa30000 {