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

Pull ARM SoC driver updates from Arnd Bergmann:
 "This branch contains platform-related driver updates for ARM and
  ARM64, these are the areas that bring the changes:

  New drivers:

   - driver support for Renesas R-Car V3M (R8A77970)

   - power management support for Amlogic GX

   - a new driver for the Tegra BPMP thermal sensor

   - a new bus driver for Technologic Systems NBUS

  Changes for subsystems that prefer to merge through arm-soc:

   - the usual updates for reset controller drivers from Philipp Zabel,
     with five added drivers for SoCs in the arc, meson, socfpa,
     uniphier and mediatek families

   - updates to the ARM SCPI and PSCI frameworks, from Sudeep Holla,
     Heiner Kallweit and Lorenzo Pieralisi

  Changes specific to some ARM-based SoC

   - the Freescale/NXP DPAA QBMan drivers from PowerPC can now work on
     ARM as well

   - several changes for power management on Broadcom SoCs

   - various improvements on Qualcomm, Broadcom, Amlogic, Atmel,
     Mediatek

   - minor Cleanups for Samsung, TI OMAP SoCs"

[ NOTE! This doesn't work without the previous ARM SoC device-tree pull,
  because the R8A77970 driver is missing a header file that came from
  that pull.

  The fact that this got merged afterwards only fixes it at this point,
  and bisection of that driver will fail if/when you walk into the
  history of that driver.           - Linus ]

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (96 commits)
  soc: amlogic: meson-gx-pwrc-vpu: fix power-off when powered by bootloader
  bus: add driver for the Technologic Systems NBUS
  memory: omap-gpmc: Remove deprecated gpmc_update_nand_reg()
  soc: qcom: remove unused label
  soc: amlogic: gx pm domain: add PM and OF dependencies
  drivers/firmware: psci_checker: Add missing destroy_timer_on_stack()
  dt-bindings: power: add amlogic meson power domain bindings
  soc: amlogic: add Meson GX VPU Domains driver
  soc: qcom: Remote filesystem memory driver
  dt-binding: soc: qcom: Add binding for rmtfs memory
  of: reserved_mem: Accessor for acquiring reserved_mem
  of/platform: Generalize /reserved-memory handling
  soc: mediatek: pwrap: fix fatal compiler error
  soc: mediatek: pwrap: fix compiler errors
  arm64: mediatek: cleanup message for platform selection
  soc: Allow test-building of MediaTek drivers
  soc: mediatek: place Kconfig for all SoC drivers under menu
  soc: mediatek: pwrap: add support for MT7622 SoC
  soc: mediatek: pwrap: add common way for setup CS timing extenstion
  soc: mediatek: pwrap: add MediaTek MT6380 as one slave of pwrap
  ..

diff --cc Documentation/devicetree/bindings/arm/samsung/pmu.txt
Simple merge

diff --cc MAINTAINERS
index 485f793029c921a1dd2a91bef7e6aded98dc3516,fb59572f780e69d1a95b6b3260d031fe6739554c..b5b00ebb04c5e4e58da9fec9d2b72c31190f10aa
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13004,16 -12918,15 +13016,22 @@@ F:        arch/arc/plat-axs10
  F:    arch/arc/boot/dts/ax*
  F:    Documentation/devicetree/bindings/arc/axs10*
  
+ SYNOPSYS AXS10x RESET CONTROLLER DRIVER
+ M:    Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+ S:    Supported
+ F:    drivers/reset/reset-axs10x.c
+ F:    Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+ 
 +SYNOPSYS DESIGNWARE APB GPIO DRIVER
 +M:    Hoan Tran <hotran@apm.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-dwapb.c
 +F:    Documentation/devicetree/bindings/gpio/snps-dwapb-gpio.txt
 +
  SYNOPSYS DESIGNWARE DMAC DRIVER
  M:    Viresh Kumar <vireshk@kernel.org>
 -M:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  S:    Maintained
  F:    include/linux/dma/dw.h
  F:    include/linux/platform_data/dma-dw.h

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc drivers/bus/Kconfig
index fa94a85bf41035814992157ceabb225d1a2a40b5,854348e646b3436ee1d27ef773fcbf20461c4133..dc7b3c7b7d42fd09eb5afd50350a7946f7434efa
--- 1/drivers/bus/Kconfig
--- 2/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@@ -158,13 -157,14 +158,21 @@@ config TEGRA_GM
          Driver for the Tegra Generic Memory Interface bus which can be used
          to attach devices such as NOR, UART, FPGA and more.
  
 +config TI_SYSC
 +      bool "TI sysc interconnect target module driver"
 +      depends on ARCH_OMAP2PLUS
 +      help
 +        Generic driver for Texas Instruments interconnect target module
 +        found on many TI SoCs.
 +
+ config TS_NBUS
+       tristate "Technologic Systems NBUS Driver"
+       depends on SOC_IMX28
+       depends on OF_GPIO && PWM
+       help
+         Driver for the Technologic Systems NBUS which is used to interface
+         with the peripherals in the FPGA of the TS-4600 SoM.
+ 
  config UNIPHIER_SYSTEM_BUS
        tristate "UniPhier System Bus driver"
        depends on ARCH_UNIPHIER && OF

diff --cc drivers/bus/Makefile
index 94a079008cbe7301e4290d26e61ded0522f3a0c2,72377f77651c97c686adea43ff658c3e738d4013..9bcd0bf3954bf18209f2dfe0e65cc79e04de4dc1
--- 1/drivers/bus/Makefile
--- 2/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -21,7 -20,7 +21,8 @@@ obj-$(CONFIG_SUNXI_RSB)               += sunxi-rsb.
  obj-$(CONFIG_SIMPLE_PM_BUS)   += simple-pm-bus.o
  obj-$(CONFIG_TEGRA_ACONNECT)  += tegra-aconnect.o
  obj-$(CONFIG_TEGRA_GMI)               += tegra-gmi.o
 +obj-$(CONFIG_TI_SYSC)         += ti-sysc.o
+ obj-$(CONFIG_TS_NBUS)         += ts-nbus.o
  obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)     += uniphier-system-bus.o
  obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o
  

diff --cc drivers/clk/bcm/Makefile
Simple merge

diff --cc drivers/memory/Makefile
Simple merge

diff --cc drivers/of/of_reserved_mem.c
Simple merge

diff --cc drivers/reset/Makefile
Simple merge

diff --cc drivers/soc/Makefile
Simple merge

diff --cc drivers/soc/fsl/qbman/Makefile
index 363982b83ab5ccf21a2fe5bf8e3dfb47d2333033,3cbd08aeab596fd8e20bdb497a36d0decbd51d3e..811312ad526fbf488e0463347dddb24a9674abe5
--- 1/drivers/soc/fsl/qbman/Makefile
--- 2/drivers/soc/fsl/qbman/Makefile
+++ b/drivers/soc/fsl/qbman/Makefile
@@@ -1,7 -1,6 +1,7 @@@
 +# SPDX-License-Identifier: GPL-2.0
  obj-$(CONFIG_FSL_DPAA)                          += bman_ccsr.o qman_ccsr.o \
                                                   bman_portal.o qman_portal.o \
-                                                  bman.o qman.o
+                                                  bman.o qman.o dpaa_sys.o
  
  obj-$(CONFIG_FSL_BMAN_TEST)                     += bman-test.o
  bman-test-y                                      = bman_test.o

diff --cc drivers/soc/qcom/Makefile
Simple merge

diff --cc drivers/soc/renesas/Makefile
Simple merge

diff --cc drivers/thermal/Makefile
Simple merge

diff --cc drivers/thermal/tegra/Makefile
index 8a3f221f17c187cd1c611b64729d80f2dd978707,ea541ecbbf32344ccf4240c3732dd095d138c169..0f2b66edf0d2773b7947c57f83b836e6bf55c14f
--- 1/drivers/thermal/tegra/Makefile
--- 2/drivers/thermal/tegra/Makefile
+++ b/drivers/thermal/tegra/Makefile
@@@ -1,5 -1,5 +1,6 @@@
- obj-$(CONFIG_TEGRA_SOCTHERM)  += tegra-soctherm.o
 +# SPDX-License-Identifier: GPL-2.0
+ obj-$(CONFIG_TEGRA_SOCTHERM)          += tegra-soctherm.o
+ obj-$(CONFIG_TEGRA_BPMP_THERMAL)      += tegra-bpmp-thermal.o
  
  tegra-soctherm-y                              := soctherm.o soctherm-fuse.o
  tegra-soctherm-$(CONFIG_ARCH_TEGRA_124_SOC)   += tegra124-soctherm.o

diff --cc include/linux/of_reserved_mem.h
Simple merge