Merge branch 'for-4.10-ti-sci-base' of https://github.com/t-kristo/linux-pm into...

Merge "ARM: keystone: add TI SCI protocol support for v4.10" from
Tero Kristo:

[description taken from http://processors.wiki.ti.com/index.php/TISCI

Texas Instruments' Keystone generation System on Chips (SoC) starting
with 66AK2G02, now include a dedicated SoC System Control entity called
PMMC(Power Management Micro Controller) in line with ARM architecture
recommendations. The function of this module is to integrate all system
operations in a centralized location. Communication with the SoC System
Control entity from various processing units like ARM/DSP occurs over
Message Manager hardware block.

...

Texas Instruments' System Control Interface defines the communication
protocol between various processing entities to the System Control Entity
on TI SoCs. This is a set of message formats and sequence of operations
required to communicate and get system services processed from System
Control entity in the SoC.]

* 'for-4.10-ti-sci-base' of https://github.com/t-kristo/linux-pm:
  firmware: ti_sci: Add support for reboot core service
  firmware: ti_sci: Add support for Clock control
  firmware: ti_sci: Add support for Device control
  firmware: Add basic support for TI System Control Interface (TI-SCI) protocol
  Documentation: Add support for TI System Control Interface (TI-SCI) protocol

diff --combined MAINTAINERS
index 7b3256abfc38642b09885b35af787c5bafa2f8f2,467b29fafacaf60cd0464de321abe9997def3965..3ec2b6592a22ab5eaa120d1db0d1cce354b73c36
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1600,7 -1600,6 +1600,7 @@@ F:      arch/arm/mach-qcom
  F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/i2c/busses/i2c-qup.c
  F:    drivers/clk/qcom/
 +F:    drivers/pinctrl/qcom/
  F:    drivers/soc/qcom/
  F:    drivers/spi/spi-qup.c
  F:    drivers/tty/serial/msm_serial.h
@@@ -4621,9 -4620,8 +4621,9 @@@ F:      sound/usb/misc/ua101.
  
  EXTENSIBLE FIRMWARE INTERFACE (EFI)
  M:    Matt Fleming <matt@codeblueprint.co.uk>
 +M:    Ard Biesheuvel <ard.biesheuvel@linaro.org>
  L:    linux-efi@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git
  S:    Maintained
  F:    Documentation/efi-stub.txt
  F:    arch/ia64/kernel/efi.c
@@@ -8214,7 -8212,7 +8214,7 @@@ F:      include/linux/mfd
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-mmc@vger.kernel.org
 -T:    git git://git.linaro.org/people/ulf.hansson/mmc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
  S:    Maintained
  F:    Documentation/devicetree/bindings/mmc/
  F:    drivers/mmc/
@@@ -9301,7 -9299,7 +9301,7 @@@ S:      Maintaine
  F:    drivers/pci/host/*designware*
  
  PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
 -M:    Joao Pinto <jpinto@synopsys.com>
 +M:    Jose Abreu <Jose.Abreu@synopsys.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/designware-pcie.txt
@@@ -11885,6 -11883,16 +11885,16 @@@ S: Maintaine
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
  
+ Texas Instruments' System Control Interface (TISCI) Protocol Driver
+ M:    Nishanth Menon <nm@ti.com>
+ M:    Tero Kristo <t-kristo@ti.com>
+ M:    Santosh Shilimkar <ssantosh@kernel.org>
+ L:    linux-arm-kernel@lists.infradead.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/arm/keystone/ti,sci.txt
+ F:    drivers/firmware/ti_sci*
+ F:    include/linux/soc/ti/ti_sci_protocol.h
+ 
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org

diff --combined drivers/firmware/Kconfig
index 6a42a098fe59c753d2e0733e1005257470d9f699,9418d7d1b0a50e0a5ff5b3f89ba89411f040a36a..1867f0d1389b2679b68a63c554bc6b12a2367ee6
--- 1/drivers/firmware/Kconfig
--- 2/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@@ -8,17 -8,6 +8,17 @@@ menu "Firmware Drivers
  config ARM_PSCI_FW
        bool
  
 +config ARM_PSCI_CHECKER
 +      bool "ARM PSCI checker"
 +      depends on ARM_PSCI_FW && HOTPLUG_CPU && !TORTURE_TEST
 +      help
 +        Run the PSCI checker during startup. This checks that hotplug and
 +        suspend operations work correctly when using PSCI.
 +
 +        The torture tests may interfere with the PSCI checker by turning CPUs
 +        on and off through hotplug, so for now torture tests and PSCI checker
 +        are mutually exclusive.
 +
  config ARM_SCPI_PROTOCOL
        tristate "ARM System Control and Power Interface (SCPI) Message Protocol"
        depends on MAILBOX
@@@ -214,6 -203,21 +214,21 @@@ config QCOM_SCM_6
        def_bool y
        depends on QCOM_SCM && ARM64
  
+ config TI_SCI_PROTOCOL
+       tristate "TI System Control Interface (TISCI) Message Protocol"
+       depends on TI_MESSAGE_MANAGER
+       help
+         TI System Control Interface (TISCI) Message Protocol is used to manage
+         compute systems such as ARM, DSP etc with the system controller in
+         complex System on Chip(SoC) such as those found on certain keystone
+         generation SoC from TI.
+ 
+         System controller provides various facilities including power
+         management function support.
+ 
+         This protocol library is used by client drivers to use the features
+         provided by the system controller.
+ 
  config HAVE_ARM_SMCCC
        bool
  
@@@ -221,6 -225,5 +236,6 @@@ source "drivers/firmware/broadcom/Kconf
  source "drivers/firmware/google/Kconfig"
  source "drivers/firmware/efi/Kconfig"
  source "drivers/firmware/meson/Kconfig"
 +source "drivers/firmware/tegra/Kconfig"
  
  endmenu

diff --combined drivers/firmware/Makefile
index e9e178b38f7e8cb45283f35fc3ceabccf69deede,dcb52c4231514595754672daf2b3d40288629790..a37f12e8d137c3a4a69456c56d9f8b982f70435f
--- 1/drivers/firmware/Makefile
--- 2/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@@ -2,7 -2,6 +2,7 @@@
  # Makefile for the linux kernel.
  #
  obj-$(CONFIG_ARM_PSCI_FW)     += psci.o
 +obj-$(CONFIG_ARM_PSCI_CHECKER)        += psci_checker.o
  obj-$(CONFIG_ARM_SCPI_PROTOCOL)       += arm_scpi.o
  obj-$(CONFIG_ARM_SCPI_POWER_DOMAIN) += scpi_pm_domain.o
  obj-$(CONFIG_DMI)             += dmi_scan.o
@@@ -21,10 -20,10 +21,11 @@@ obj-$(CONFIG_QCOM_SCM)             += qcom_scm.
  obj-$(CONFIG_QCOM_SCM_64)     += qcom_scm-64.o
  obj-$(CONFIG_QCOM_SCM_32)     += qcom_scm-32.o
  CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a
+ obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o
  
  obj-y                         += broadcom/
  obj-y                         += meson/
  obj-$(CONFIG_GOOGLE_FIRMWARE) += google/
  obj-$(CONFIG_EFI)             += efi/
  obj-$(CONFIG_UEFI_CPER)               += efi/
 +obj-y                         += tegra/