Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm SoC platform updates from Olof Johansson:
 "SoC updates, mostly refactorings and cleanups of old legacy platforms,
  but also a few more things:

  New SoC support this release:
   - NXP/Freescale i.MX7ULP (1x Cortex-A7, Cortex-M4, graphics, etc)
   - Allwinner F1C100, older platform with an ARM926-EJS (ARMv5) core

  Cleanups of various platforms:
   - OMAP1 ams-delta does some GPIO cleanups
   - Davinci removes of at24 platform data
   - Samsung cleans up old wakeup, PM debug and secondary core boot code
   - Renesas moves around config options and PM code to drivers/soc for
     sharing with 64-bit and more consistency
   - i.MX, Broadcom and SoCFPGA all have tweaks to lowlevel debug
     console setups
   - SoCFPGA adds explicit selection of ARM errata and removes some
     unused code

  This also contains a few patches that I had queued up as fixes for
  4.20 but didn't send in before the release"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (68 commits)
  arm64: dts: renesas: draak: Fix CVBS input
  ARM: omap2: avoid section mismatch warning
  ARM: tegra: avoid section mismatch warning
  ARM: ks8695: fix section mismatch warning
  ARM: pxa: avoid section mismatch warning
  ARM: mmp: fix pxa168_device_usb_phy use on aspenite
  ARM: mmp: fix timer_init calls
  ARM: OMAP1: fix USB configuration for device-only setups
  ARM: OMAP1: add MMC configuration for Palm Tungsten E
  ARM: imx: fix dependencies on imx7ulp
  ARM: meson: select HAVE_ARM_TWD and ARM_GLOBAL_TIMER
  MAINTAINERS: add drivers/soc/amlogic/ to amlogic list
  ARM: imx: add initial support for imx7ulp
  ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
  ARM: dts: Fix OMAP4430 SDP Ethernet startup
  ARM: dts: am335x-pdu001: Fix polarity of card detection input
  ARM: OMAP1: ams-delta: Fix audio permanently muted
  ARM: dts: omap5: Fix dual-role mode on Super-Speed port
  arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
  ARM: davinci: da850-evm: remove unnecessary include
  ...

diff --cc MAINTAINERS
index 7d37f8a4743ce5603be79fad77af86e515c400e0,924c9643cf3875b00a0a4e738bd5242526280928..046dad9636e890b9dc86fce7faafcbef3abdecc5
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1317,15 -1307,9 +1316,16 @@@ F:    arch/arm/boot/dts/meson
  F:    arch/arm64/boot/dts/amlogic/
  F:    drivers/pinctrl/meson/
  F:    drivers/mmc/host/meson*
+ F:    drivers/soc/amlogic/
  N:    meson
  
 +ARM/Amlogic Meson SoC Sound Drivers
 +M:    Jerome Brunet <jbrunet@baylibre.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/meson/
 +F:    Documentation/devicetree/bindings/sound/amlogic*
 +
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
  M:    Antoine Tenart <antoine.tenart@bootlin.com>

diff --cc arch/arm/mach-bcm/Kconfig
Simple merge

diff --cc arch/arm/mach-davinci/board-dm365-evm.c
Simple merge

diff --cc arch/arm/mach-omap1/Makefile
Simple merge

diff --cc arch/arm/mach-omap1/ams-delta-fiq.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc arch/arm/mach-socfpga/Kconfig
index d43798defdbabebe4345da10758e4384352b4c5a,a04660918d71203668b8cba14822833cc9c7ba8f..cc1745e6c60ae2cb002cf499ea7067ff0d8c4efa
--- 1/arch/arm/mach-socfpga/Kconfig
--- 2/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@@ -10,7 -10,14 +10,14 @@@ menuconfig ARCH_SOCFPG
        select HAVE_ARM_SCU
        select HAVE_ARM_TWD if SMP
        select MFD_SYSCON
 -      select PCI_DOMAINS if PCI
 +      select PCI_DOMAINS_GENERIC if PCI
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_764369 if SMP
+       select ARM_ERRATA_775420
+       select PL310_ERRATA_588369
+       select PL310_ERRATA_727915
+       select PL310_ERRATA_753970 if PL310
+       select PL310_ERRATA_769419
  
  if ARCH_SOCFPGA
  config SOCFPGA_SUSPEND