From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2019 22:52:38 +0000 (-0700)
Subject: Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=399eb9b6cbf31ff6ef91a6930e2e94c703d74078;p=uclinux-h8%2Flinux.git

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

Pull ARM SoC driver updates from Arnd Bergmann:
 "This contains driver changes that are tightly connected to SoC
  specific code. Aside from smaller cleanups and bug fixes, here is a
  list of the notable changes.

  New device drivers:

   - The Turris Mox router has a new "moxtet" bus driver for its
     on-board pluggable extension bus. The same platform also gains a
     firmware driver.

   - The Samsung Exynos family gains a new Chipid driver exporting using
     the soc device sysfs interface

   - A similar socinfo driver for Qualcomm Snapdragon chips.

   - A firmware driver for the NXP i.MX DSP IPC protocol using shared
     memory and a mailbox

  Other changes:

   - The i.MX reset controller driver now supports the NXP i.MX8MM chip

   - Amlogic SoC specific drivers gain support for the S905X3 and A311D
     chips

   - A rework of the TI Davinci framebuffer driver to allow important
     cleanups in the platform code

   - A couple of device drivers for removed ARM SoC platforms are
     removed. Most of the removals were picked up by other maintainers,
     this contains whatever was left"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (123 commits)
  bus: uniphier-system-bus: use devm_platform_ioremap_resource()
  soc: ti: ti_sci_pm_domains: Add support for exclusive and shared access
  dt-bindings: ti_sci_pm_domains: Add support for exclusive and shared access
  firmware: ti_sci: Allow for device shared and exclusive requests
  bus: imx-weim: remove incorrect __init annotations
  fbdev: remove w90x900/nuc900 platform drivers
  spi: remove w90x900 driver
  net: remove w90p910-ether driver
  net: remove ks8695 driver
  firmware: turris-mox-rwtm: Add sysfs documentation
  firmware: Add Turris Mox rWTM firmware driver
  dt-bindings: firmware: Document cznic,turris-mox-rwtm binding
  bus: moxtet: fix unsigned comparison to less than zero
  bus: moxtet: remove set but not used variable 'dummy'
  ARM: scoop: Use the right include
  dt-bindings: power: add Amlogic Everything-Else power domains bindings
  soc: amlogic: Add support for Everything-Else power domains controller
  fbdev: da8xx: use resource management for dma
  fbdev: da8xx-fb: drop a redundant if
  fbdev: da8xx-fb: use devm_platform_ioremap_resource()
  ...
---

399eb9b6cbf31ff6ef91a6930e2e94c703d74078
diff --cc drivers/spi/Makefile
index adbebee93a75,b1131809a294..bb49c9e6d0a0
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -63,9 -63,7 +63,8 @@@ obj-$(CONFIG_SPI_MT65XX
  obj-$(CONFIG_SPI_MT7621)		+= spi-mt7621.o
  obj-$(CONFIG_SPI_MXIC)			+= spi-mxic.o
  obj-$(CONFIG_SPI_MXS)			+= spi-mxs.o
 +obj-$(CONFIG_SPI_NPCM_FIU)		+= spi-npcm-fiu.o
  obj-$(CONFIG_SPI_NPCM_PSPI)		+= spi-npcm-pspi.o
- obj-$(CONFIG_SPI_NUC900)		+= spi-nuc900.o
  obj-$(CONFIG_SPI_NXP_FLEXSPI)		+= spi-nxp-fspi.o
  obj-$(CONFIG_SPI_OC_TINY)		+= spi-oc-tiny.o
  spi-octeon-objs				:= spi-cavium.o spi-cavium-octeon.o