Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e44ddb authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents d28bcd53 27d9fa06

arch/arm/mach-bcm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -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