Merge tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc

Pull remoteproc updates from Ohad Ben-Cohen:

 - remoteproc fixes/cleanups from Suman Anna

 - new remoteproc TI Wakeup M3 driver from Dave Gerlach

 - remoteproc core support for TI's Wakeup M3 driver from both Dave and Suman

 - tiny remoteproc build fix from myself

* tag 'remoteproc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: fix !CONFIG_OF build breakage
  remoteproc/wkup_m3: add a remoteproc driver for TI Wakeup M3
  Documentation: dt: add bindings for TI Wakeup M3 processor
  remoteproc: add a rproc ops for performing address translation
  remoteproc: introduce rproc_get_by_phandle API
  remoteproc: fix various checkpatch warnings
  remoteproc/davinci: fix quoted split string checkpatch warning
  remoteproc/ste: add blank lines after declarations

2 files changed, 58 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt b/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
new file mode 100644
index 000000000000..3a70073797eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt
@@ -0,0 +1,52 @@
+TI Wakeup M3 Remoteproc Driver
+==============================
+
+The TI AM33xx and AM43xx family of devices use a small Cortex M3 co-processor
+(commonly referred to as Wakeup M3 or CM3) to help with various low power tasks
+that cannot be controlled from the MPU. This CM3 processor requires a firmware
+binary to accomplish this. The wkup_m3 remoteproc driver handles the loading of
+the firmware and booting of the CM3.
+
+Wkup M3 Device Node:
+====================
+A wkup_m3 device node is used to represent the Wakeup M3 processor instance
+within the SoC. It is added as a child node of the parent interconnect bus
+(l4_wkup) through which it is accessible to the MPU.
+
+Required properties:
+--------------------
+- compatible:           Should be one of,
+                                "ti,am3352-wkup-m3" for AM33xx SoCs
+                                "ti,am4372-wkup-m3" for AM43xx SoCs
+- reg:                  Should contain the address ranges for the two internal
+                        memory regions, UMEM and DMEM. The parent node should
+                        provide an appropriate ranges property for properly
+                        translating these into bus addresses.
+- reg-names:            Contains the corresponding names for the two memory
+                        regions. These should be named "umem" & "dmem".
+- ti,hwmods:            Name of the hwmod associated with the wkupm3 device.
+- ti,pm-firmware:       Name of firmware file to be used for loading and
+                        booting the wkup_m3 remote processor.
+
+Example:
+--------
+/* AM33xx */
+ocp {
+         l4_wkup: l4_wkup@44c00000 {
+                compatible = "am335-l4-wkup", "simple-bus";
+                ranges = <0 0x44c00000 0x400000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                wkup_m3: wkup_m3@100000 {
+                        compatible = "ti,am3352-wkup-m3";
+                        reg = <0x100000 0x4000>,
+                              <0x180000 0x2000>;
+                        reg-names = "umem", "dmem";
+                        ti,hwmods = "wkup_m3";
+                        ti,pm-firmware = "am335x-pm-firmware.elf";
+                };
+        };
+
+        ...
+};
diff --git a/Documentation/remoteproc.txt b/Documentation/remoteproc.txt
index e6469fdcf89a..ef0219fa4bb4 100644
--- a/Documentation/remoteproc.txt
+++ b/Documentation/remoteproc.txt
@@ -51,6 +51,12 @@ cost.
         rproc_shutdown() returns, and users can still use it with a subsequent
         rproc_boot(), if needed.
 
+  struct rproc *rproc_get_by_phandle(phandle phandle)
+    - Find an rproc handle using a device tree phandle. Returns the rproc
+      handle on success, and NULL on failure. This function increments
+      the remote processor's refcount, so always use rproc_put() to
+      decrement it back once rproc isn't needed anymore.
+
 3. Typical usage
 
 #include <linux/remoteproc.h>