Merge branch 'iommu-linux-4.14.y' of git://git.ti.com/rpmsg/iommu into rproc-linux...

Merge in the updated iommu feature branch into remoteproc tree to
pull in the necessary support to fix the DRA7 IPU1 boot issue and
couple of DRA7 DSP idle issues with HW_AUTO setting. Also included
is a fix for errata i879.

* 'iommu-linux-4.14.y' of git://git.ti.com/rpmsg/iommu:
  ARM: OMAP2+: Add workaround for DRA7 DSP MStandby errata i879
  ARM: OMAP2+: Extend DRA7 IPU1 MMU pdata quirks to DSP MDMA MMUs
  ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
  iommu/omap: fix boot issue on remoteprocs with AMMU/Unicache

Signed-off-by: Suman Anna <s-anna@ti.com>

diff --cc arch/arm/mach-omap2/Makefile
index 8e8d6a8e85dd8b511f30d1facb8c16c04e948d11,51b8b57ab24c7c034b14aebd3e2bbf69704a07d6..b5c3b4764a9c8b6c2e5a1d78063a04710aba621a
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -243,16 -239,4 +243,17 @@@ obj-$(CONFIG_MACH_OMAP2_TUSB6010)        += us
  onenand-$(CONFIG_MTD_ONENAND_OMAP2)   := gpmc-onenand.o
  obj-y                                 += $(onenand-m) $(onenand-y)
  
 +# Generate offset macros for use in ASM code
 +arch/arm/mach-omap2/pm-asm-offsets.s: arch/arm/mach-omap2/pm-asm-offsets.c
 +      $(call if_changed_dep,cc_s_c)
 +
 +include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE
 +      $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__)
 +
 +arch/arm/mach-omap2/sleep33xx.o: include/generated/ti-pm-asm-offsets.h
 +arch/arm/mach-omap2/sleep43xx.o: include/generated/ti-pm-asm-offsets.h
 +
+ obj-$(CONFIG_OMAP_IOMMU)              += omap-iommu.o
 +ifneq ($(CONFIG_OMAP_REMOTEPROC),)
 +obj-y                                 += remoteproc.o
 +endif

diff --cc arch/arm/mach-omap2/pdata-quirks.c
index f709bb5498135895559bf09e340abc77b01698bf,da21fc3639a49b01e9f386ed51817f4b24d8512d..456afe32f4631d675d33ed17b66898cca605f1d5
--- 1/arch/arm/mach-omap2/pdata-quirks.c
--- 2/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -593,15 -614,7 +611,15 @@@ static struct of_dev_auxdata omap_auxda
        OF_DEV_AUXDATA("ti,dra7-iommu", 0x55082000, "55082000.mmu",
                       &omap4_iommu_pdata),
        OF_DEV_AUXDATA("ti,dra7-iommu", 0x58882000, "58882000.mmu",
-                      &omap4_iommu_pdata),
+                      &dra7_ipu1_dsp_iommu_pdata),
 +      OF_DEV_AUXDATA("ti,dra7-ipu", 0x55020000, "55020000.ipu",
 +                     &omap4_ipu_dsp_pdata),
 +      OF_DEV_AUXDATA("ti,dra7-ipu", 0x58820000, "58820000.ipu",
 +                     &omap4_ipu_dsp_pdata),
 +      OF_DEV_AUXDATA("ti,dra7-dsp", 0x40800000, "40800000.dsp",
 +                     &omap4_ipu_dsp_pdata),
 +      OF_DEV_AUXDATA("ti,dra7-dsp", 0x41000000, "41000000.dsp",
 +                     &omap4_ipu_dsp_pdata),
  #endif
        /* Common auxdata */
        OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata),