diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-17 05:16:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-17 05:16:02 -0700 |
| commit | b41e48a82bcf056cbb9f4194a5f21504d24f0139 (patch) | |
| tree | 853f8e5bb8bdae37f50f9c16ed1dd34084d0fc95 | |
| parent | b06c51debc6c12f2859c5a626cb2ba043fa8001d (diff) | |
| parent | 724cf0aecb0d839b0b5865901b02a742dcfa6ea4 (diff) | |
| download | linux-b41e48a82bcf056cbb9f4194a5f21504d24f0139.tar.gz linux-b41e48a82bcf056cbb9f4194a5f21504d24f0139.tar.bz2 linux-b41e48a82bcf056cbb9f4194a5f21504d24f0139.zip | |
Merge tag 'arm-soc/for-5.3/soc-arm64' of https://github.com/Broadcom/stblinux into arm/soc
This pull request contains Broadcom ARM64-based SoCs Kconfig.platform
changes for 5.3, please pull the following:
- Jim adds the ability for ARCH_BRCMSTB to use reset controllers
- Doug adds the ability for ARCH_BRCMSTB to use the PINCTRL framework
- Florian enables the use of the BCM7038 Level 1 interrupt controller
for ARCH_BRCMSTB
* tag 'arm-soc/for-5.3/soc-arm64' of https://github.com/Broadcom/stblinux:
arm64: Enable PINCTRL for ARCH_BRCMSTB
arm64: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB
arm64: Enable BCM7038_L1_IRQ for ARCH_BRCMSTB
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index c7ad684926c3..84f2755b409c 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -66,8 +66,11 @@ config ARCH_BITMAIN config ARCH_BRCMSTB bool "Broadcom Set-Top-Box SoCs" + select ARCH_HAS_RESET_CONTROLLER + select BCM7038_L1_IRQ select BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP + select PINCTRL help This enables support for Broadcom's ARMv8 Set Top Box SoCs |