From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 16:19:14 +0000 (-0700)
Subject: Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.15~6342
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc413a90edbe715bebebe859dc072ef73d490d70;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'armsoc-drivers' of git://git./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
  ...
---

dc413a90edbe715bebebe859dc072ef73d490d70
diff --cc arch/arm/mach-tegra/Kconfig
index 63e89e7,51a8fa3..3a06ba2
--- a/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 drivers/soc/Makefile
index c7c1a13,814128f..524ecdc
--- a/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 0000000,858b5e3..765d101
mode 000000,100644..100644
--- a/drivers/soc/aspeed/Kconfig
+++ b/drivers/soc/aspeed/Kconfig
@@@ -1,0 -1,20 +1,31 @@@
+ 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 (ARCH_ASPEED || COMPILE_TEST) && REGMAP && MFD_SYSCON
++	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 0000000,cfaa9ad..2f7b6da
mode 000000,100644..100644
--- a/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 b60fbea,0000000..b60fbea
mode 100644,000000..100644
--- a/drivers/soc/aspeed/aspeed-p2a-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-p2a-ctrl.c