Merge branch 'omap/soc' into arm/dt
Bringing in to resolve soc -> add/add conflicts locally
* omap/soc:
ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
ARM: OMAP2+: omap-iommu.c conversion to ti-sysc
ARM: OMAP2+: Add workaround for DRA7 DSP MStandby errata i879
ARM: OMAP4+: remove pdata quirks for omap4+ iommus
ARM: OMAP2+: pdata-quirks: add PRM data for reset support
ARM: OMAP2+: am43xx: Add lcdc clockdomain
Signed-off-by:
Olof Johansson <olof@lixom.net>
Showing
Please register or sign in to comment