Эх сурвалжийг харах

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>
Olof Johansson 8 жил өмнө
parent
commit
b9e44ddbe5

+ 2 - 0
arch/arm/mach-bcm/Kconfig

@@ -44,6 +44,8 @@ config ARCH_BCM_NSP
 	select ARM_ERRATA_775420
 	select ARM_ERRATA_775420
 	select ARM_ERRATA_764369 if SMP
 	select ARM_ERRATA_764369 if SMP
 	select HAVE_SMP
 	select HAVE_SMP
+	select THERMAL
+	select THERMAL_OF
 	help
 	help
 	  Support for Broadcom Northstar Plus SoC.
 	  Support for Broadcom Northstar Plus SoC.
 	  Broadcom Northstar Plus family of SoCs are used for switching control
 	  Broadcom Northstar Plus family of SoCs are used for switching control