Merge tag 'docs-4.10-2' of git://git.lwn.net/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / arm / arm,scpi.txt

diff --git a/Documentation/devicetree/bindings/arm/arm,scpi.txt b/Documentation/devicetree/bindings/arm/arm,scpi.txt
index faa4b44572e36e4bbe6342dd0dd2d0372e4da614..401831973638d6c9d22dc8432313cbd2956a1246 100644 (file)
--- a/Documentation/devicetree/bindings/arm/arm,scpi.txt
+++ b/Documentation/devicetree/bindings/arm/arm,scpi.txt
@@ -7,7 +7,10 @@ by Linux to initiate various system control and power operations.
 
 Required properties:
 
-- compatible : should be "arm,scpi"
+- compatible : should be
+       * "arm,scpi" : For implementations complying to SCPI v1.0 or above
+       * "arm,scpi-pre-1.0" : For implementations complying to all
+               unversioned releases prior to SCPI v1.0
 - mboxes: List of phandle and mailbox channel specifiers
          All the channels reserved by remote SCP firmware for use by
          SCPI message protocol should be specified in any order
@@ -59,18 +62,14 @@ SRAM and Shared Memory for SCPI
 A small area of SRAM is reserved for SCPI communication between application
 processors and SCP.
 
-Required properties:
-- compatible : should be "arm,juno-sram-ns" for Non-secure SRAM on Juno
-
-The rest of the properties should follow the generic mmio-sram description
-found in ../../sram/sram.txt
+The properties should follow the generic mmio-sram description found in [3]
 
 Each sub-node represents the reserved area for SCPI.
 
 Required sub-node properties:
 - reg : The base offset and size of the reserved area with the SRAM
-- compatible : should be "arm,juno-scp-shmem" for Non-secure SRAM based
-              shared memory on Juno platforms
+- compatible : should be "arm,scp-shmem" for Non-secure SRAM based
+              shared memory
 
 Sensor bindings for the sensors based on SCPI Message Protocol
 --------------------------------------------------------------
@@ -81,11 +80,9 @@ Required properties:
 - #thermal-sensor-cells: should be set to 1. This property follows the
                         thermal device tree bindings[2].
 
-                        Valid cell values are raw identifiers (Sensor
-                        ID) as used by the firmware. Refer to
-                        platform documentation for your
-                        implementation for the IDs to use. For Juno
-                        R0 and Juno R1 refer to [3].
+                        Valid cell values are raw identifiers (Sensor ID)
+                        as used by the firmware. Refer to  platform details
+                        for your implementation for the IDs to use.
 
 Power domain bindings for the power domains based on SCPI Message Protocol
 ------------------------------------------------------------
@@ -112,7 +109,7 @@ Required properties:
 [0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html
 [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
 [2] Documentation/devicetree/bindings/thermal/thermal.txt
-[3] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0922b/apas03s22.html
+[3] Documentation/devicetree/bindings/sram/sram.txt
 [4] Documentation/devicetree/bindings/power/power_domain.txt
 
 Example: