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

Pull ARM SoC-related driver updates from Olof Johansson:
 "Various driver updates for platforms and a couple of the small driver
  subsystems we merge through our tree:

  Among the larger pieces:

   - Power management improvements for TI am335x and am437x (RTC
     suspend/wake)

   - Misc new additions for Amlogic (socinfo updates)

   - ZynqMP FPGA manager

   - Nvidia improvements for reset/powergate handling

   - PMIC wrapper for Mediatek MT8516

   - Misc fixes/improvements for ARM SCMI, TEE, NXP i.MX SCU drivers"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (57 commits)
  soc: aspeed: fix Kconfig
  soc: add aspeed folder and misc drivers
  spi: zynqmp: Fix build break
  soc: imx: Add generic i.MX8 SoC driver
  MAINTAINERS: Update email for Qualcomm SoC maintainer
  memory: tegra: Fix a typos for "fdcdwr2" mc client
  Revert "ARM: tegra: Restore memory arbitration on resume from LP1 on Tegra30+"
  memory: tegra: Replace readl-writel with mc_readl-mc_writel
  memory: tegra: Fix integer overflow on tick value calculation
  memory: tegra: Fix missed registers values latching
  ARM: tegra: cpuidle: Handle tick broadcasting within cpuidle core on Tegra20/30
  optee: allow to work without static shared memory
  soc/tegra: pmc: Move powergate initialisation to probe
  soc/tegra: pmc: Remove reset sysfs entries on error
  soc/tegra: pmc: Fix reset sources and levels
  soc: amlogic: meson-gx-pwrc-vpu: Add support for G12A
  soc: amlogic: meson-gx-pwrc-vpu: Fix power on/off register bitmask
  fpga manager: Adding FPGA Manager support for Xilinx zynqmp
  dt-bindings: fpga: Add bindings for ZynqMP fpga driver
  firmware: xilinx: Add fpga API's
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/pm33xx-core.c
Simple merge

diff --cc arch/arm/mach-tegra/Kconfig
index 63e89e75639bd0e3fffe7fb6e9852cb93f153bc4,51a8fa3566ef7bad5c720a2c3a4dde4a9908282f..3a06ba263e3450e1b8ee446729a71064c63af746
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -10,7 -10,9 +10,8 @@@ menuconfig ARCH_TEGR
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select PINCTRL
+       select PM
        select PM_OPP
 -      select ARCH_HAS_RESET_CONTROLLER
        select RESET_CONTROLLER
        select SOC_BUS
        select ZONE_DMA if ARM_LPAE

diff --cc arch/arm/mach-tegra/iomap.h
Simple merge

diff --cc drivers/clk/zynqmp/clkc.c
Simple merge

diff --cc drivers/rtc/rtc-omap.c
Simple merge

diff --cc drivers/soc/Kconfig
Simple merge

diff --cc drivers/soc/Makefile
index c7c1a139ad8dbe8e99366a0cfd2ea053e99b1c35,814128fe479f974991a26ef35db86bac7d61ea22..524ecdc2a9bb42eb5e72e8ca415cd71b418b4251
--- 1/drivers/soc/Makefile
--- 2/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -4,6 -4,7 +4,7 @@@
  #
  
  obj-$(CONFIG_ARCH_ACTIONS)    += actions/
 -obj-$(CONFIG_ARCH_ASPEED)     += aspeed/
++obj-$(CONFIG_SOC_ASPEED)      += aspeed/
  obj-$(CONFIG_ARCH_AT91)               += atmel/
  obj-y                         += bcm/
  obj-$(CONFIG_ARCH_DOVE)               += dove/

diff --cc drivers/soc/aspeed/Kconfig
index 0000000000000000000000000000000000000000,858b5e3f79c97449000dbb5b7be5dc3ccd8dce67..765d1019138774c016d248345d2d29af21f007db
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/soc/aspeed/Kconfig
+++ b/drivers/soc/aspeed/Kconfig
@@@ -1,0 -1,20 +1,31 @@@
 -      depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
+ menu "Aspeed SoC drivers"
+ 
++config SOC_ASPEED
++      def_bool y
++      depends on ARCH_ASPEED || COMPILE_TEST
++
+ config ASPEED_LPC_CTRL
 -      depends on (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
++      depends on SOC_ASPEED && REGMAP && MFD_SYSCON
+       tristate "Aspeed ast2400/2500 HOST LPC to BMC bridge control"
+       ---help---
+         Control Aspeed ast2400/2500 HOST LPC to BMC mappings through
+         ioctl()s, the driver also provides a read/write interface to a BMC ram
+         region where the host LPC read/write region can be buffered.
+ 
+ config ASPEED_LPC_SNOOP
+       tristate "Aspeed ast2500 HOST LPC snoop support"
++      depends on SOC_ASPEED && REGMAP && MFD_SYSCON
+       help
+         Provides a driver to control the LPC snoop interface which
+         allows the BMC to listen on and save the data written by
+         the host to an arbitrary LPC I/O port.
+ 
++config ASPEED_P2A_CTRL
++      depends on SOC_ASPEED && REGMAP && MFD_SYSCON
++      tristate "Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC bridge control"
++      help
++        Control Aspeed ast2400/2500 HOST P2A VGA MMIO to BMC mappings through
++        ioctl()s, the driver also provides an interface for userspace mappings to
++        a pre-defined region.
+ 
+ endmenu

diff --cc drivers/soc/aspeed/Makefile
index 0000000000000000000000000000000000000000,cfaa9adc67b5b7ceef72cf620ed576919ed28a6c..2f7b6da7be79effe0d6a56ba4be2cadfe9dcbf5d
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/soc/aspeed/Makefile
+++ b/drivers/soc/aspeed/Makefile
@@@ -1,0 -1,2 +1,3 @@@
+ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o
+ obj-$(CONFIG_ASPEED_LPC_SNOOP)        += aspeed-lpc-snoop.o
++obj-$(CONFIG_ASPEED_P2A_CTRL) += aspeed-p2a-ctrl.o

diff --cc drivers/soc/aspeed/aspeed-p2a-ctrl.c
index b60fbeaffcbd01c8b91db89a77ae9b4b4964b1b8,0000000000000000000000000000000000000000..b60fbeaffcbd01c8b91db89a77ae9b4b4964b1b8
mode 100644,000000..100644
--- 1/drivers/misc/aspeed-p2a-ctrl.c
--- /dev/null
+++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c

diff --cc drivers/soc/imx/gpc.c
Simple merge