Merge tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi into next

Pull HSI (High Speed Syncronous Interface) changes from Sebastian Reichel:
 "Please pull the following changes for the HSI subsystem, which I have
  taken over from Carlos Chinea <carlos.chinea@nokia.com>.

  The below patches have been worked on in the linux-omap mailinglist
  for 10 months and are well tested in linux-next (have been in there
  for more than two weeks) without any problems arising.  Apart from
  that potential regressions are very limited, because the subsystem is
  not yet used by any platform in the mainline kernel.

   - Add some documentation for the HSI subsystem

   - Add Device Tree support for the HSI subsystem

   - Add OMAP3 SSI driver (SSI is a legacy variant of HSI)

   - Add Nokia N900 Modem driver (without speech support for now)"

* tag 'hsi-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: Introduce Nokia N900 modem driver
  HSI: Introduce driver for SSI Protocol
  Documentation: DT: omap-ssi binding documentation
  HSI: Introduce OMAP SSI driver
  HSI: Add common DT binding for HSI client devices
  HSI: export method to (un)register clients
  HSI: Add channel resource support to HSI clients
  HSI: method to unregister clients from an hsi port
  HSI: hsi-char: fix driver for multiport scenarios
  MAINTAINERS: update HSI entry
  Documentation: HSI: Add some general description for the HSI subsystem

21 files changed, 4513 insertions, 19 deletions

diff --git a/Documentation/devicetree/bindings/hsi/client-devices.txt b/Documentation/devicetree/bindings/hsi/client-devices.txt
new file mode 100644
index 000000000000..104c9a3e57a4
--- /dev/null
+++ b/Documentation/devicetree/bindings/hsi/client-devices.txt
@@ -0,0 +1,44 @@
+Each HSI port is supposed to have one child node, which
+symbols the remote device connected to the HSI port. The
+following properties are standardized for HSI clients:
+
+Required HSI configuration properties:
+
+- hsi-channel-ids:      A list of channel ids
+
+- hsi-rx-mode:          Receiver Bit transmission mode ("stream" or "frame")
+- hsi-tx-mode:          Transmitter Bit transmission mode ("stream" or "frame")
+- hsi-mode:             May be used instead hsi-rx-mode and hsi-tx-mode if
+                        the transmission mode is the same for receiver and
+                        transmitter
+- hsi-speed-kbps:       Max bit transmission speed in kbit/s
+- hsi-flow:             RX flow type ("synchronized" or "pipeline")
+- hsi-arb-mode:         Arbitration mode for TX frame ("round-robin", "priority")
+
+Optional HSI configuration properties:
+
+- hsi-channel-names:    A list with one name per channel specified in the
+                        hsi-channel-ids property
+
+
+Device Tree node example for an HSI client:
+
+hsi-controller {
+        hsi-port {
+                modem: hsi-client {
+                        compatible = "nokia,n900-modem";
+
+                        hsi-channel-ids = <0>, <1>, <2>, <3>;
+                        hsi-channel-names = "mcsaab-control",
+                                            "speech-control",
+                                            "speech-data",
+                                            "mcsaab-data";
+                        hsi-speed-kbps = <55000>;
+                        hsi-mode = "frame";
+                        hsi-flow = "synchronized";
+                        hsi-arb-mode = "round-robin";
+
+                        /* more client specific properties */
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/hsi/nokia-modem.txt b/Documentation/devicetree/bindings/hsi/nokia-modem.txt
new file mode 100644
index 000000000000..8a979780452b
--- /dev/null
+++ b/Documentation/devicetree/bindings/hsi/nokia-modem.txt
@@ -0,0 +1,57 @@
+Nokia modem client bindings
+
+The Nokia modem HSI client follows the common HSI client binding
+and inherits all required properties. The following additional
+properties are needed by the Nokia modem HSI client:
+
+Required properties:
+- compatible:           Should be one of
+      "nokia,n900-modem"
+- hsi-channel-names:    Should contain the following strings
+      "mcsaab-control"
+      "speech-control"
+      "speech-data"
+      "mcsaab-data"
+- gpios:                Should provide a GPIO handler for each GPIO listed in
+                        gpio-names
+- gpio-names:           Should contain the following strings
+      "cmt_apeslpx"
+      "cmt_rst_rq"
+      "cmt_en"
+      "cmt_rst"
+      "cmt_bsi"
+- interrupts:           Should be IRQ handle for modem's reset indication
+
+Example:
+
+&ssi_port {
+        modem: hsi-client {
+                compatible = "nokia,n900-modem";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&modem_pins>;
+
+                hsi-channel-ids = <0>, <1>, <2>, <3>;
+                hsi-channel-names = "mcsaab-control",
+                                    "speech-control",
+                                    "speech-data",
+                                    "mcsaab-data";
+                hsi-speed-kbps = <55000>;
+                hsi-mode = "frame";
+                hsi-flow = "synchronized";
+                hsi-arb-mode = "round-robin";
+
+                interrupts-extended = <&gpio3 8 IRQ_TYPE_EDGE_FALLING>; /* 72 */
+
+                gpios = <&gpio3  6 GPIO_ACTIVE_HIGH>, /* 70 */
+                        <&gpio3  9 GPIO_ACTIVE_HIGH>, /* 73 */
+                        <&gpio3 10 GPIO_ACTIVE_HIGH>, /* 74 */
+                        <&gpio3 11 GPIO_ACTIVE_HIGH>, /* 75 */
+                        <&gpio5 29 GPIO_ACTIVE_HIGH>; /* 157 */
+                gpio-names = "cmt_apeslpx",
+                             "cmt_rst_rq",
+                             "cmt_en",
+                             "cmt_rst",
+                             "cmt_bsi";
+        };
+};
diff --git a/Documentation/devicetree/bindings/hsi/omap-ssi.txt b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
new file mode 100644
index 000000000000..f26625e42693
--- /dev/null
+++ b/Documentation/devicetree/bindings/hsi/omap-ssi.txt
@@ -0,0 +1,97 @@
+OMAP SSI controller bindings
+
+OMAP Synchronous Serial Interface (SSI) controller implements a legacy
+variant of MIPI's High Speed Synchronous Serial Interface (HSI).
+
+Required properties:
+- compatible:           Should include "ti,omap3-ssi".
+- reg-names:            Contains the values "sys" and "gdd" (in this order).
+- reg:                  Contains a matching register specifier for each entry
+                        in reg-names.
+- interrupt-names:      Contains the value "gdd_mpu".
+- interrupts:           Contains matching interrupt information for each entry
+                        in interrupt-names.
+- ranges:               Represents the bus address mapping between the main
+                        controller node and the child nodes below.
+- clock-names:          Must include the following entries:
+  "ssi_ssr_fck": The OMAP clock of that name
+  "ssi_sst_fck": The OMAP clock of that name
+  "ssi_ick": The OMAP clock of that name
+- clocks:               Contains a matching clock specifier for each entry in
+                        clock-names.
+- #address-cells:       Should be set to <1>
+- #size-cells:          Should be set to <1>
+
+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)
+- reg-names:            Contains the values "tx" and "rx" (in this order).
+- reg:                  Contains a matching register specifier for each entry
+                        in reg-names.
+- interrupt-parent      Should be a phandle for the interrupt controller
+- interrupts:           Should contain interrupt specifiers for mpu interrupts
+                        0 and 1 (in this order).
+- ti,ssi-cawake-gpio:   Defines which GPIO pin is used to signify CAWAKE
+                        events for the port. This is an optional board-specific
+                        property. If it's missing the port will not be
+                        enabled.
+
+Example for Nokia N900:
+
+ssi-controller@48058000 {
+        compatible = "ti,omap3-ssi";
+
+        /* needed until hwmod is updated to use the compatible string */
+        ti,hwmods = "ssi";
+
+        reg = <0x48058000 0x1000>,
+              <0x48059000 0x1000>;
+        reg-names = "sys",