Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / hsi / omap-ssi.txt

diff --git a/Documentation/devicetree/bindings/hsi/omap-ssi.txt b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
index b8eca3c7810dfb0ca184339537cd1e3e43383ac2..955e335e7e5698d14f4631441d4d1de3a8e3a047 100644 (file)
--- a/Documentation/devicetree/bindings/hsi/omap-ssi.txt
+++ b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
@@ -1,10 +1,12 @@
 OMAP SSI controller bindings
 
-OMAP Synchronous Serial Interface (SSI) controller implements a legacy
-variant of MIPI's High Speed Synchronous Serial Interface (HSI).
+OMAP3's Synchronous Serial Interface (SSI) controller implements a
+legacy variant of MIPI's High Speed Synchronous Serial Interface (HSI),
+while the controller found inside OMAP4 is supposed to be fully compliant
+with the HSI standard.
 
 Required properties:
-- compatible:          Should include "ti,omap3-ssi".
+- compatible:          Should include "ti,omap3-ssi" or "ti,omap4-hsi"
 - reg-names:           Contains the values "sys" and "gdd" (in this order).
 - reg:                 Contains a matching register specifier for each entry
                        in reg-names.
@@ -27,6 +29,7 @@ Each port is represented as a sub-node of the ti,omap3-ssi device.
 Required Port sub-node properties:
 - compatible:          Should be set to the following value
                        ti,omap3-ssi-port (applicable to OMAP34xx devices)
+                       ti,omap4-hsi-port (applicable to OMAP44xx devices)
 - reg-names:           Contains the values "tx" and "rx" (in this order).
 - reg:                 Contains a matching register specifier for each entry
                        in reg-names.
@@ -38,6 +41,10 @@ Required Port sub-node properties:
                        property. If it's missing the port will not be
                        enabled.
 
+Optional properties:
+- ti,hwmods:           Shall contain TI interconnect module name if needed
+                       by the SoC
+
 Example for Nokia N900:
 
 ssi-controller@48058000 {