diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-07-16 21:50:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-16 21:50:19 +0200 |
| commit | c5560db571d491569931244cdc2391664be04dc8 (patch) | |
| tree | 773e210f8363b5b7f23b22bbaebe5c990e07e148 | |
| parent | b1f8b0cfe397a0b2c6e66b08ad8e4a218f7adffc (diff) | |
| parent | 9e0c41d4a72ffc42cc82cb58adac8f351694c811 (diff) | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 0cd23e549cdd..8789d93a7c04 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -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 |