diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 18:07:32 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 18:07:32 +0300 |
| commit | c049adc9fd2937562b4880bdc35b8303ff56d425 (patch) | |
| tree | f75d32289b1053b3e65cb0e7d330079bee2c9a9b /drivers/firmware/Makefile | |
| parent | 273395f0c2973b96a35772f8aa3b65c25517a45d (diff) | |
| parent | 68acc77a2d5197141ba376fd8872eccb43bfcd7d (diff) | |
| download | linux-c049adc9fd2937562b4880bdc35b8303ff56d425.tar.xz | |
Merge tag 'arm-scpi-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/drivers
Merge "ARM System Control and Power Interface(SCPI) support" from Sudeep Holla
It adds support for the following features provided by SCP firmware
using different subsystems in Linux:
1. SCPI mailbox protocol driver which using mailbox framework
2. Clocks provided by SCP using clock framework
3. CPU DVFS(cpufreq) using existing arm-big-little driver
4. SCPI based sensors including temperature sensors
* tag 'arm-scpi-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
hwmon: Support thermal zones registration for SCP temperature sensors
hwmon: Support sensors exported via ARM SCP interface
firmware: arm_scpi: Extend to support sensors
Documentation: add DT bindings for ARM SCPI sensors
cpufreq: arm_big_little: add SCPI interface driver
clk: scpi: add support for cpufreq virtual device
clk: add support for clocks provided by SCP(System Control Processor)
firmware: add support for ARM System Control and Power Interface(SCPI) protocol
Documentation: add DT binding for ARM System Control and Power Interface(SCPI) protocol
Diffstat (limited to 'drivers/firmware/Makefile')
| -rw-r--r-- | drivers/firmware/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 2ee83474a3c1..b8a521741418 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -2,6 +2,7 @@ # Makefile for the linux kernel. # obj-$(CONFIG_ARM_PSCI_FW) += psci.o +obj-$(CONFIG_ARM_SCPI_PROTOCOL) += arm_scpi.o obj-$(CONFIG_DMI) += dmi_scan.o obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o obj-$(CONFIG_EDD) += edd.o |