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

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

Merge in the updated iommu feature branch into the remoteproc tree.
This merge pulls in the OMAP IOMMU driver support for both the DRA74x
and DRA72x SoC families, and on the DRA7 EVM, DRA72 EVM and AM57xx
Beagle X15 boards.

* 'iommu-linux-3.14.y' of git://git.ti.com/rpmsg/iommu: (32 commits)
  ARM: OMAP2+: Regroup pdata quirks based on SoC family
  ARM: DRA7: hwmod_data: Add reset data to second MMU on DSPs
  ARM: dts: dra7xx-clocks: Fix the l3 and l4 clock rates
  ARM: dts: dra72-evm: Mark TPS as wakeup capable pin
  ARM: AM437x: use pdata quirks for pinctrl information
  ARM: DRA7: use pdata quirks for pinctrl information
  ARM: OMAP5: use pdata quirks for pinctrl information
  pinctrl: single: AM437x: Add pinctrl compatibility
  pinctrl: single: add DRA7 pinctrl compatibility
  pinctrl: bindings: Add OMAP pinctrl binding
  ARM: dts: AM437x: switch to compatible pinctrl
  ARM: dts: DRA7: switch to compatible pinctrl
  ARM: dts: OMAP5: switch to compatible pinctrl
  ARM: dts: beagle-x15: Enable relevant IPU and DSP MMU nodes
  ARM: dts: dra72-evm: Enable relevant IPU and DSP MMU nodes
  ARM: dts: dra7-evm: Enable relevant IPU and DSP MMU nodes
  iommu/omap: add support to program multiple iommus
  iommu/omap: change the attach detection logic
  ARM: OMAP2+: devices: use sentinel terminated iommu archdata for ISP
  iommu/omap: add support for configuring dsp iommus on DRA7xx
  ...

Signed-off-by: Suman Anna <s-anna@ti.com>
Conflicts:
	arch/arm/boot/dts/am57xx-beagle-x15.dts
	arch/arm/boot/dts/dra7-evm.dts
	arch/arm/boot/dts/dra72-evm.dts
	arch/arm/mach-omap2/pdata-quirks.c