Skip to content

Commit 6d89c73

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 275087f + 0386e9c commit 6d89c73

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm/mach-bcm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ config ARCH_BCM_NSP
5353
select ARM_ERRATA_754322
5454
select ARM_ERRATA_775420
5555
select ARM_ERRATA_764369 if SMP
56+
select ARM_TIMER_SP804
5657
select THERMAL
5758
select THERMAL_OF
5859
help

0 commit comments

Comments
 (0)