Merge branch 'iommu-linux-4.19.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. The DSP idle
status is achieved across all the DSPs and boards only with the
fix for errata i879.

* 'iommu-linux-4.19.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 eeb1e8377d824c4c4c0a0ab5456023454354c037,d51a694e74dbde588f52a5ae5a338b02a4906cc6..359c9b11d44b3d06e156f26429508e9079fc370f
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -244,6 -244,4 +244,7 @@@ include/generated/ti-pm-asm-offsets.h: 
  
  $(obj)/sleep33xx.o $(obj)/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 268113a63c8544897dfb9fcd8316ff53332d83c9,9126961b5f5fd35ccae34dc60b1c223180f0f486..2271add0a6619e50648598e5a4e8843921b680ed
--- 1/arch/arm/mach-omap2/pdata-quirks.c
--- 2/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -629,15 -618,7 +647,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("ti,sysc", 0, NULL, &ti_sysc_pdata),