diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2021-01-25 13:14:49 -0800 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2021-01-25 13:14:49 -0800 |
| commit | e066cfd867aabe621be5c1855fc42ff699781ae4 (patch) | |
| tree | 198bf9bda1cef34d6cd2aa4c66934f1a87f64d04 | |
| parent | d5d5b7f3e2ad4b7c7c80c6a4d5686fe8a9624947 (diff) | |
| parent | 5674e314e674d5a7c4d38d8e9beed14b91ef04d3 (diff) | |
Merge tag 'tags/bcm2835-soc-next-2021-01-25' into soc/next
Select BRCMSTB_L2_IRQ as it's now used on Raspberry Pi 4
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 9b594ae98153c..2890e61b2b46e 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,6 +161,7 @@ config ARCH_BCM2835 select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 select BCM2835_TIMER + select BRCMSTB_L2_IRQ select PINCTRL select PINCTRL_BCM2835 select MFD_CORE diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6eecdef538bd5..04c0c842c3e9b 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -39,6 +39,7 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 + select BRCMSTB_L2_IRQ help This enables support for the Broadcom BCM2837 and BCM2711 SoC. These SoCs are used in the Raspberry Pi 3 and 4 devices. |