diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-07-16 21:47:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-16 21:47:57 +0200 |
| commit | 2c071ce53d566a5b3b4e541334e7b32551a8dd62 (patch) | |
| tree | 9ee0cffeeceb482a6436a5fa5d1a269b6344db4a /arch/arm64/Kconfig.platforms | |
| parent | 5995e9232fc38decb77fc8b421ce47aeec8e19ee (diff) | |
| parent | 746ef3ac89cadfac2c444b1704962b32fb309d4a (diff) | |
Merge tag 'arm-soc/for-5.20/devicetree-arm64-part2' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom ARM64-based SoCs Device Tree changes
for 5.20, second part, please pull the following:
- Rafal adds basic support for the BCM4912-based router Asus GT-AX6000,
he also has ARCH_BCM4908 select ARCH_BCMBCA such that in the next cycle
we can remove ARCH_BCM4908 and continue to have make oldconfig work.
Finally he spells out what BCA means to make it clearer
* tag 'arm-soc/for-5.20/devicetree-arm64-part2' of https://github.com/Broadcom/stblinux:
arm64: bcmbca: Include full family name in Kconfig
arm64: make ARCH_BCM4908 select ARCH_BCMBCA
arm64: dts: Add base DTS file for bcmbca device Asus GT-AX6000
Link: https://lore.kernel.org/r/20220715221642.297536-3-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 83e3943f7a55..e2700db35701 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -49,6 +49,7 @@ config ARCH_BCM2835 config ARCH_BCM4908 bool "Broadcom BCM4908 family" + select ARCH_BCMBCA select GPIOLIB help This enables support for the Broadcom BCM4906, BCM4908 and @@ -64,7 +65,7 @@ config ARCH_BCM_IPROC This enables support for Broadcom iProc based SoCs config ARCH_BCMBCA - bool "Broadcom Broadband SoC" + bool "Broadcom Broadband Carrier Access (BCA) origin SoC" help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset. |