diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 06:14:46 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 06:14:46 +0300 |
| commit | b9e44ddbe528217090a8d8c54fc99cc71885949f (patch) | |
| tree | ec97bcf6603c5a268268154823d1eccf438886d2 /arch/arm | |
| parent | d28bcd53fa90549e00f7dbcdfc885dfe8409e8a2 (diff) | |
| parent | 27d9fa06c122b135ad7552fa3138c3b47e5776c5 (diff) | |
| download | linux-b9e44ddbe528217090a8d8c54fc99cc71885949f.tar.xz | |
Merge tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux into next/soc
This pull request contains Broadcom ARM-based SoCs (non Device Tree) changes:
- Jon updates the Kconfig entry for Northstar Plus to have THERMAL and THERMAL_OF
selected in order to get the NS/NSP thermal driver dependencies to be satistfied
* tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux:
ARM: BCM: Enable thermal support for NSP SoCs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index f9389c5910e7..abfce8f29ca1 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -44,6 +44,8 @@ config ARCH_BCM_NSP select ARM_ERRATA_775420 select ARM_ERRATA_764369 if SMP select HAVE_SMP + select THERMAL + select THERMAL_OF help Support for Broadcom Northstar Plus SoC. Broadcom Northstar Plus family of SoCs are used for switching control |