From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Sep 2017 03:40:00 +0000 (-0700)
Subject: Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.14-rc1~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae46654bcff303b33facbbd04a3ad9c21d303f9b;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull ARM SoC driver updates from Olof Johansson:
 "This branch contains platform-related driver updates for ARM and ARM64.

  Among them:

   - Reset driver updates:
     + New API for dealing with arrays of resets
     + Make unimplemented {de,}assert return success on shared resets
     + MSDKv1 driver
     + Removal of obsolete Gemini reset driver
     + Misc updates for sunxi and Uniphier

   - SoC drivers:
     + Platform SoC driver registration on Tegra
     + Shuffle of Qualcomm drivers into a submenu
     + Allwinner A64 support for SRAM
     + Renesas R-Car R3 support
     + Power domains for Rockchip RK3366

   - Misc updates and smaller fixes for TEE and memory driver
     subsystems"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  firmware: arm_scpi: fix endianness of dev_id in struct dev_pstate_set
  soc/tegra: fuse: Add missing semi-colon
  soc/tegra: Restrict SoC device registration to Tegra
  drivers: soc: sunxi: add support for A64 and its SRAM C
  drivers: soc: sunxi: add support for remapping func value to reg value
  drivers: soc: sunxi: fix error processing on base address when claiming
  dt-bindings: add binding for Allwinner A64 SRAM controller and SRAM C
  bus: sunxi-rsb: Enable by default for ARM64
  soc/tegra: Register SoC device
  firmware: tegra: set drvdata earlier
  memory: Convert to using %pOF instead of full_name
  soc: Convert to using %pOF instead of full_name
  bus: Convert to using %pOF instead of full_name
  firmware: Convert to using %pOF instead of full_name
  soc: mediatek: add SCPSYS power domain driver for MediaTek MT7622 SoC
  soc: mediatek: add header files required for MT7622 SCPSYS dt-binding
  soc: mediatek: reduce code duplication of scpsys_probe across all SoCs
  dt-bindings: soc: update the binding document for SCPSYS on MediaTek MT7622 SoC
  reset: uniphier: add analog amplifiers reset control
  reset: uniphier: add video input subsystem reset control
  ...
---

ae46654bcff303b33facbbd04a3ad9c21d303f9b
diff --cc drivers/soc/qcom/Kconfig
index d0fc331,5f12657..b00bccd
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@@ -1,15 -1,8 +1,17 @@@
  #
  # QCOM Soc drivers
  #
+ menu "Qualcomm SoC drivers"
+ 
 +config QCOM_GLINK_SSR
 +	tristate "Qualcomm Glink SSR driver"
 +	depends on RPMSG
 +	depends on QCOM_RPROC_COMMON
 +	help
 +	  Say y here to enable GLINK SSR support. The GLINK SSR driver
 +	  implements the SSR protocol for notifying the remote processor about
 +	  neighboring subsystems going up or down.
 +
  config QCOM_GSBI
          tristate "QCOM General Serial Bus Interface"
          depends on ARCH_QCOM