Unverified Commit c5560db5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.20/soc-part2' of https://github.com/Broadcom/stblinux into arm/soc 

This pull request contains Broadcom ARM-based SoCs Kconfig updates for
5.20, second part, please pull the following:

- Rafal spells out what the BCA acronym means

- Florian removes the forced thermal subsystem selection done by
  ARCH_BCM_NSP

* tag 'arm-soc/for-5.20/soc-part2' of https://github.com/Broadcom/stblinux:
  ARM: bcmbca: Include full family name in Kconfig
  ARM: bcm: NSP: Removed forced thermal selection

Link: https://lore.kernel.org/r/20220715221642.297536-4-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b1f8b0cf 9e0c41d4

arch/arm/mach-bcm/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ config ARCH_BCM_NSP 
	select ARM_ERRATA_775420

	select ARM_ERRATA_764369 if SMP

	select ARM_TIMER_SP804

	select THERMAL

	select THERMAL_OF

	help

	  Support for Broadcom Northstar Plus SoC.

	  Broadcom Northstar Plus family of SoCs are used for switching control
@@ -202,7 +200,7 @@ config ARCH_BRCMSTB 
	  including the 7445 family of chips.



menuconfig ARCH_BCMBCA

	bool "Broadcom Broadband SoC"

	bool "Broadcom Broadband Carrier Access (BCA) origin SoC"

	depends on ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_GIC