diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-09-10 16:39:45 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-10 16:39:45 +0000 |
| commit | 46d2efc4efc00e09a47e41f753af69a9fe169ec4 (patch) | |
| tree | 45f0c6caf12452f7f3b35374de1d31edd9f07926 | |
| parent | e494548a15ea1eb6cddd5f695ac6718452087ead (diff) | |
| parent | 2b28fe75c7dbe7ec322e706eed4622964409e21d (diff) | |
Merge tag 'arm-soc/for-6.12/soc' of https://github.com/Broadcom/stblinux into soc/arm
This pull request contains Broadcom 32-bit SoC changes for 6.12, please
pull the following:
- Florian enables the ARM GICv3 driver since newer STB chips make use of
a GIC-600 controller
* tag 'arm-soc/for-6.12/soc' of https://github.com/Broadcom/stblinux:
ARM: bcm: Select ARM_GIC_V3 for ARCH_BRCMSTB
| -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 7318d8789e24..24bc6e18d806 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -185,6 +185,7 @@ config ARCH_BRCMSTB select ARCH_HAS_RESET_CONTROLLER select ARM_AMBA select ARM_GIC + select ARM_GIC_V3 select ARM_ERRATA_798181 if SMP select HAVE_ARM_ARCH_TIMER select ZONE_DMA if ARM_LPAE |