Merge branch 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg into ti-linux...

TI-Feature: rpmsg
TI-Tree: git://git.ti.com/rpmsg/rpmsg.git
TI-Branch: rpmsg-ti-linux-3.14.y

* 'rpmsg-ti-linux-3.14.y' of git://git.ti.com/rpmsg/rpmsg:
  remoteproc/pruss: add support for PRU-ICSS1 on AM437x SoCs
  ARM: OMAP2+: extend pruss pdata-quirks to AM4372
  ARM: dts: AM4372: Add the PRU-ICSS1 DT node
  remoteproc/pruss: add pru-specific debugfs support
  remoteproc/pruss: add a remoteproc driver for PRUSS in TI SoCs
  remoteproc/core: introduce post loading handler
  ARM: OMAP2+: use pdata quirks for PRUSS reset lines on AM335x
  remoteproc/pruss: define platform data for PRU remoteproc
  ARM: dts: AM33xx: Add the PRUSS DT node
  Documentation: dt: add PRUSS remoteproc bindings
  remoteproc/core: add a rproc ops for performing address translation
  remoteproc: add support to handle device specific resource types
  ARM: dts: AM4372: Add PRUSS1 PRU mboxes to mailbox node
  ARM: dts: AM33xx: Add PRU mboxes to mailbox node

Conflicts:
	arch/arm/boot/dts/dra72-evm.dts
	arch/arm/mach-omap2/pdata-quirks.c

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/am33xx.dtsi
index b4bfc05,6ca77f9..33b8165
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -718,16 -738,45 +726,49 @@@
  
                wkup_m3: wkup_m3@44d00000 {
                        compatible = "ti,am3353-wkup-m3";
 -                      reg = <0x44d00000 0x4000        /* M3 UMEM */
 -                             0x44d80000 0x2000>;      /* M3 DMEM */
 +                      reg = <0x44d00000 0x4000
 +                             0x44d80000 0x2000
 +                             0x44e11324 0x0024>;
 +                      reg-names = "m3_umem", "m3_dmem", "ipc_regs";
 +                      interrupts = <78>;
                        ti,hwmods = "wkup_m3";
                        ti,no-reset-on-init;
 +                      mboxes = <&mailbox &mbox_wkupm3>;
                };
  
+               pruss: pruss@4a300000 {
+                       compatible = "ti,am335x-pruss";
+                       ti,hwmods = "pruss";
+                       reg = <0x4a300000 0x2000>,
+                             <0x4a302000 0x2000>,
+                             <0x4a310000 0x3000>,
+                             <0x4a320000 0x2000>,
+                             <0x4a326000 0x2000>;
+                       reg-names = "dram0", "dram1", "shrdram2", "intc", "cfg";
+                       interrupts = <20 21 22 23 24 25 26 27>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+ 
+                       pru0: pru@4a334000 {
+                               compatible = "ti,pru-rproc";
+                               reg = <0x4a334000 0x2000>,
+                                     <0x4a322000 0x400>,
+                                     <0x4a322400 0x100>;
+                               reg-names = "iram", "control", "debug";
+                               mboxes = <&mailbox &mbox_pru0>;
+                       };
+ 
+                       pru1: pru@4a338000 {
+                               compatible = "ti,pru-rproc";
+                               reg = <0x4a338000 0x2000>,
+                                     <0x4a324000 0x400>,
+                                     <0x4a324400 0x100>;
+                               reg-names = "iram", "control", "debug";
+                               mboxes = <&mailbox &mbox_pru1>;
+                       };
+               };
+ 
                elm: elm@48080000 {
                        compatible = "ti,am3352-elm";
                        reg = <0x48080000 0x2000>;

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/pdata-quirks.c
index f70a31a,bce029f..4743724
--- 1/arch/arm/mach-omap2/pdata-quirks.c
--- 2/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -17,10 -17,8 +17,11 @@@
  
  #include <linux/platform_data/pinctrl-single.h>
  #include <linux/platform_data/iommu-omap.h>
 +#include <linux/platform_data/wkup_m3.h>
 +#include <linux/platform_data/sgx-omap.h>
 +#include <linux/platform_data/pci-dra7xx.h>
  #include <linux/platform_data/remoteproc-omap.h>
+ #include <linux/platform_data/remoteproc-pruss.h>
  
  #include "am35xx.h"
  #include "common.h"
@@@ -195,11 -186,11 +196,16 @@@ static void __init nokia_n900_legacy_in
  #endif /* CONFIG_ARCH_OMAP3 */
  
  #if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
 +static struct wkup_m3_platform_data wkup_m3_data = {
 +      .reset_name = "wkup_m3",
 +      .assert_reset = omap_device_assert_hardreset,
 +      .deassert_reset = omap_device_deassert_hardreset,
 +};
+ static struct pruss_platform_data pruss_pdata = {
+       .reset_name = "pruss",
+       .assert_reset = omap_device_assert_hardreset,
+       .deassert_reset = omap_device_deassert_hardreset,
+ };
  #endif
  
  #ifdef CONFIG_ARCH_OMAP4
@@@ -337,21 -322,14 +343,26 @@@ struct of_dev_auxdata omap_auxdata_look
        OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
                       &am35xx_emac_pdata),
  #endif
- 
  #ifdef CONFIG_SOC_AM33XX
 +      OF_DEV_AUXDATA("ti,am3353-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
 +                     &wkup_m3_data),
 +#endif
 +#ifdef CONFIG_SOC_AM43XX
 +      OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3",
 +                     &wkup_m3_data),
 +#endif
 +#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
 +      OF_DEV_AUXDATA("ti,sgx", 0x56000000, "56000000.sgx",
 +                     &sgx_pdata),
 +#endif
++#ifdef CONFIG_SOC_AM33XX
+       OF_DEV_AUXDATA("ti,am335x-pruss", 0x4a300000, "4a300000.pruss",
+                      &pruss_pdata),
+ #endif
  #ifdef CONFIG_SOC_AM43XX
        OF_DEV_AUXDATA("ti,am437-padconf", 0x44e10800, "44e10800.pinmux", &pcs_pdata),
+       OF_DEV_AUXDATA("ti,am4372-pruss", 0x54400000, "54400000.pruss",
+                      &pruss_pdata),
  #endif
  #ifdef CONFIG_ARCH_OMAP4
        OF_DEV_AUXDATA("ti,omap4-padconf", 0x4a100040, "4a100040.pinmux", &pcs_pdata),

diff --cc drivers/remoteproc/Kconfig
Simple merge

diff --cc drivers/remoteproc/Makefile
index 81b04d1,0bad671..6448bf8
--- 1/drivers/remoteproc/Makefile
--- 2/drivers/remoteproc/Makefile
+++ b/drivers/remoteproc/Makefile
@@@ -9,5 -9,5 +9,6 @@@ remoteproc-y                             += remoteproc_virtio.
  remoteproc-y                          += remoteproc_elf_loader.o
  obj-$(CONFIG_OMAP_REMOTEPROC)         += omap_remoteproc.o
  obj-$(CONFIG_STE_MODEM_RPROC)         += ste_modem_rproc.o
 +obj-$(CONFIG_WKUP_M3_RPROC)           += wkup_m3_rproc.o
  obj-$(CONFIG_DA8XX_REMOTEPROC)                += da8xx_remoteproc.o
+ obj-$(CONFIG_PRUSS_REMOTEPROC)                += pruss_remoteproc.o