diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 14:47:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-06-28 14:47:40 +0200 |
| commit | 6d89c73ca5813768a2cc66f7420ac0cbddf4f37d (patch) | |
| tree | 7f08e03449491e18c20fd6a29a70519f14da0eed /arch | |
| parent | 275087fc3ef5af5d20b5cab1403bd29d12311c6a (diff) | |
| parent | 0386e9ce5877ee73e07675529d5ae594d00f0900 (diff) | |
| download | linux-6d89c73ca5813768a2cc66f7420ac0cbddf4f37d.tar.bz2 | |
Merge tag 'arm-soc/for-5.8/soc-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs machine/Kconfig fixes
for 5.8, please pull the following:
- Matthew adds a missing select to permit the use of the standard ARM
SP804 timers on Norsthstar Plus (NSP)
* tag 'arm-soc/for-5.8/soc-fixes' of https://github.com/Broadcom/stblinux:
ARM: bcm: Select ARM_TIMER_SP804 for ARCH_BCM_NSP
Link: https://lore.kernel.org/r/20200619202250.19029-3-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 6aa938b949db..1df0ee01ee02 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -53,6 +53,7 @@ config ARCH_BCM_NSP select ARM_ERRATA_754322 select ARM_ERRATA_775420 select ARM_ERRATA_764369 if SMP + select ARM_TIMER_SP804 select THERMAL select THERMAL_OF help |