From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2016 02:42:30 +0000 (-0800)
Subject: Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.14-rc1~3958
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9638685e32af961943b679fcb72d4ddd458eb18f;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull ARM SoC driver updates from Olof Johansson:
 "Driver updates for ARM SoCs.  Some for SoC-family code under
  drivers/soc, but also some other driver updates that don't belong
  anywhere else.  We also bring in the drivers/reset code through
  arm-soc.

  Some of the larger updates:

   - Qualcomm support for SMEM, SMSM, SMP2P.  All used to communicate
     with other parts of the chip/board on these platforms, all
     proprietary protocols that don't fit into other subsystems and live
     in drivers/soc for now.

   - System bus driver for UniPhier

   - Driver for the TI Wakeup M3 IPC device

   - Power management for Raspberry PI

  + Again a bunch of other smaller updates and patches"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
  bus: uniphier: allow only built-in driver
  ARM: bcm2835: clarify RASPBERRYPI_FIRMWARE dependency
  MAINTAINERS: Drop Kumar Gala from QCOM
  bus: uniphier-system-bus: add UniPhier System Bus driver
  ARM: bcm2835: add rpi power domain driver
  dt-bindings: add rpi power domain driver bindings
  ARM: bcm2835: Define two new packets from the latest firmware.
  drivers/soc: make mediatek/mtk-scpsys.c explicitly non-modular
  soc: mediatek: SCPSYS: Add regulator support
  MAINTAINERS: Change QCOM entries
  soc: qcom: smd-rpm: Add existing platform support
  memory/tegra: Add number of TLB lines for Tegra124
  reset: hi6220: fix modular build
  soc: qcom: Introduce WCNSS_CTRL SMD client
  ARM: qcom: select ARM_CPU_SUSPEND for power management
  MAINTAINERS: Add rules for Qualcomm dts files
  soc: qcom: enable smsm/smp2p modular build
  serial: msm_serial: Make config tristate
  soc: qcom: smp2p: Qualcomm Shared Memory Point to Point
  soc: qcom: smsm: Add driver for Qualcomm SMSM
  ...
---

9638685e32af961943b679fcb72d4ddd458eb18f
diff --cc MAINTAINERS
index 9268e83,c4f19b3..db68d7f
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1672,7 -1643,7 +1673,8 @@@ F:	arch/arm/boot/dts/uniphier
  F:	arch/arm/include/asm/hardware/cache-uniphier.h
  F:	arch/arm/mach-uniphier/
  F:	arch/arm/mm/cache-uniphier.c
 +F:	arch/arm64/boot/dts/socionext/
+ F:	drivers/bus/uniphier-system-bus.c
  F:	drivers/i2c/busses/i2c-uniphier*
  F:	drivers/pinctrl/uniphier/
  F:	drivers/tty/serial/8250/8250_uniphier.c
diff --cc drivers/soc/Kconfig
index ad0df75,8441426..fb2b393
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,7 -1,7 +1,8 @@@
  menu "SOC (System On Chip) specific Drivers"
  
+ source "drivers/soc/bcm/Kconfig"
  source "drivers/soc/brcmstb/Kconfig"
 +source "drivers/soc/fsl/qe/Kconfig"
  source "drivers/soc/mediatek/Kconfig"
  source "drivers/soc/qcom/Kconfig"
  source "drivers/soc/rockchip/Kconfig"
diff --cc drivers/soc/Makefile
index 9b1c2e8,f3f955c..2afdc74
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -2,10 -2,9 +2,11 @@@
  # Makefile for the Linux Kernel SOC specific device drivers.
  #
  
+ obj-y				+= bcm/
  obj-$(CONFIG_SOC_BRCMSTB)	+= brcmstb/
 +obj-$(CONFIG_ARCH_DOVE)		+= dove/
  obj-$(CONFIG_MACH_DOVE)		+= dove/
 +obj-y				+= fsl/
  obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
  obj-$(CONFIG_ARCH_QCOM)		+= qcom/
  obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/