Unverified Commit 2c071ce5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.20/devicetree-arm64-part2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 5995e923 746ef3ac

arch/arm64/Kconfig.platforms

+2 −1
Original line number Diff line number Diff line
@@ -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.

arch/arm64/boot/dts/broadcom/bcmbca/Makefile

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_BCMBCA) += bcm94912.dtb \

dtb-$(CONFIG_ARCH_BCMBCA) += \

				bcm4912-asus-gt-ax6000.dtb \

				bcm94912.dtb \

				bcm963158.dtb \

				bcm96858.dtb \

				bcm963146.dtb \

arch/arm64/boot/dts/broadcom/bcmbca/bcm4912-asus-gt-ax6000.dts

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT



/dts-v1/;



#include "bcm4912.dtsi"



/ {

	compatible = "asus,gt-ax6000", "brcm,bcm4912", "brcm,bcmbca";

	model = "Asus GT-AX6000";



	memory@0 {

		device_type = "memory";

		reg = <0x00 0x00 0x00 0x40000000>;

	};

};



&uart0 {

	status = "okay";

};