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

[linux-2.6-block.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 1b1a74129141f3eec51936ec2429b269b10f920f..2658b8ec1d83038fdc0bd2d0dbe0fc82b4ad52d7 100644 (file)
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
@@ -31,12 +31,21 @@ Optional properties:
 
 - clocks : Phandle to clock for the Mali Midgard device.
 
+- clock-names : Specify the names of the clocks specified in clocks
+  when multiple clocks are present.
+    * core: clock driving the GPU itself (When only one clock is present,
+      assume it's this clock.)
+    * bus: bus clock for the GPU
+
 - mali-supply : Phandle to regulator for the Mali device. Refer to
   Documentation/devicetree/bindings/regulator/regulator.txt for details.
 
 - operating-points-v2 : Refer to Documentation/devicetree/bindings/opp/opp.txt
   for details.
 
+- #cooling-cells: Refer to Documentation/devicetree/bindings/thermal/thermal.txt
+  for details.
+
 - resets : Phandle of the GPU reset line.
 
 Vendor-specific bindings
@@ -65,6 +74,7 @@ gpu@ffa30000 {
        mali-supply = <&vdd_gpu>;
        operating-points-v2 = <&gpu_opp_table>;
        power-domains = <&power RK3288_PD_GPU>;
+       #cooling-cells = <2>;
 };
 
 gpu_opp_table: opp_table0 {