From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Jan 2020 19:22:43 +0000 (-0800)
Subject: Merge branch 'omap/soc' into arm/dt
X-Git-Tag: v5.6-rc1~19^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=785ca50f8e616b27417436fac517687a81fff5b0;p=thirdparty%2Flinux.git

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>
---

785ca50f8e616b27417436fac517687a81fff5b0