projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a6c3e8 4601832)
Merge branch 'omap/soc' into arm/dt
authorOlof Johansson <olof@lixom.net>
Tue, 7 Jan 2020 19:22:43 +0000 (11:22 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Jan 2020 19:22:43 +0000 (11:22 -0800)
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>
1  2 
arch/arm/mach-omap2/pdata-quirks.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge
Domain: System / Kernel;