mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 06:18:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'arm-soc/for-6.1/devicetree' of https://github.com/Broadcom/stblinux into arm/dt

Browse Source 
This pull request contains Broadcom ARM-based SoC Device Tree updates
for 6.1, please pull the following:

- Rafal improves the BCM5301X PCIe DT nodes schema validation by
flagging the PCIe controller with a missing "device_type" property

- William merges BCM4908 within BCMBCA since this chip is part of the
Broadcom Broadband Carrier Access group and follows the architecture of
those chips

* tag 'arm-soc/for-6.1/devicetree' of https://github.com/Broadcom/stblinux:
  arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA
  arm64: dts: Add BCM4908 generic board dts
  arm64: dts: Move BCM4908 dts to bcmbca folder
  arm64: dts: bcmbca: update BCM4908 board dts files
  dt-bindings: arm64: bcmbca: Update BCM4908 description
  dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
  ARM: dts: BCM5301X: Add basic PCI controller properties

Link: https://lore.kernel.org/r/20220915023044.2350782-2-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2022-09-15 22:00:12 +02:00
parent 2c12f88cef dd5c672d7c
commit e33060879c
14 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
View File

@@ -1,42 +0,0 @@
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4908.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Broadcom BCM4908 device tree bindings
description:
Broadcom BCM4906 / BCM4908 / BCM49408 Wi-Fi/network SoCs with Brahma CPUs.
maintainers:
- Rafał Miłecki <rafal@milecki.pl>
properties:
$nodename:
const: '/'
compatible:
oneOf:
- description: BCM4906 based boards
items:
- enum:
- netgear,r8000p
- tplink,archer-c2300-v1
- const: brcm,bcm4906
- const: brcm,bcm4908
- description: BCM4908 based boards
items:
- enum:
- asus,gt-ac5300
- netgear,raxe500
- const: brcm,bcm4908
- description: BCM49408 based boards
items:
- const: brcm,bcm49408
- const: brcm,bcm4908
additionalProperties: true
...

25
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
View File

@@ -15,6 +15,7 @@ maintainers:
- William Zhang <william.zhang@broadcom.com>
- Anand Gore <anand.gore@broadcom.com>
- Kursad Oney <kursad.oney@broadcom.com>
- Rafał Miłecki <rafal@milecki.pl>
properties:
$nodename:
@@ -28,6 +29,30 @@ properties:
- const: brcm,bcm47622
- const: brcm,bcmbca
- description: BCM4906 based boards
items:
- enum:
- netgear,r8000p
- tplink,archer-c2300-v1
- const: brcm,bcm4906
- const: brcm,bcm4908
- const: brcm,bcmbca
- description: BCM4908 based boards
items:
- enum:
- asus,gt-ac5300
- brcm,bcm94908
- netgear,raxe500
- const: brcm,bcm4908
- const: brcm,bcmbca
- description: BCM49408 based boards
items:
- const: brcm,bcm49408
- const: brcm,bcm4908
- const: brcm,bcmbca
- description: BCM4912 based boards
items:
- enum:

12
arch/arm/boot/dts/bcm5301x.dtsi
View File

@@ -239,14 +239,26 @@ chipcommon: chipcommon@0 {
pcie0: pcie@12000 {
reg = <0x00012000 0x1000>;
device_type = "pci";
#address-cells = <3>;
#size-cells = <2>;
};
pcie1: pcie@13000 {
reg = <0x00013000 0x1000>;
device_type = "pci";
#address-cells = <3>;
#size-cells = <2>;
};
pcie2: pcie@14000 {
reg = <0x00014000 0x1000>;
device_type = "pci";
#address-cells = <3>;
#size-cells = <2>;
};
usb2: usb2@21000 {

10
arch/arm64/Kconfig.platforms
View File

@@ -47,15 +47,6 @@ config ARCH_BCM2835
This enables support for the Broadcom BCM2837 and BCM2711 SoC.
These SoCs are used in the Raspberry Pi 3 and 4 devices.
config ARCH_BCM4908
bool "Broadcom BCM4908 family"
select ARCH_BCMBCA
select GPIOLIB
help
This enables support for the Broadcom BCM4906, BCM4908 and
BCM49408 SoCs. These SoCs use Brahma-B53 cores and can be
found in home routers.
config ARCH_BCM_IPROC
bool "Broadcom iProc SoC Family"
select COMMON_CLK_IPROC
@@ -66,6 +57,7 @@ config ARCH_BCM_IPROC
config ARCH_BCMBCA
bool "Broadcom Broadband Carrier Access (BCA) origin SoC"
select GPIOLIB
help
Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based
BCA chipset.

1
arch/arm64/boot/dts/broadcom/Makefile
View File

@@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
bcm2837-rpi-cm3-io3.dtb \
bcm2837-rpi-zero-2-w.dtb
subdir-y += bcm4908
subdir-y += bcmbca
subdir-y += northstar2
subdir-y += stingray

5
arch/arm64/boot/dts/broadcom/bcm4908/Makefile
View File

@@ -1,5 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb

5
arch/arm64/boot/dts/broadcom/bcmbca/Makefile
View File

@@ -1,5 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCMBCA) += \
bcm4906-netgear-r8000p.dtb \
bcm4906-tplink-archer-c2300-v1.dtb \
bcm4908-asus-gt-ac5300.dtb \
bcm4908-netgear-raxe500.dtb \
bcm94908.dtb \
bcm4912-asus-gt-ax6000.dtb \
bcm94912.dtb \
bcm963158.dtb \

2
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts → arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
View File

@@ -7,7 +7,7 @@
#include "bcm4906.dtsi"
/ {
compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";
compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
model = "Netgear R8000P";
memory@0 {

2
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts → arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
View File

@@ -7,7 +7,7 @@
#include "bcm4906.dtsi"
/ {
compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908";
compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
model = "TP-Link Archer C2300 V1";
memory@0 {

0
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi → arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
View File

2
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts → arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
View File

@@ -6,7 +6,7 @@
#include "bcm4908.dtsi"
/ {
compatible = "asus,gt-ac5300", "brcm,bcm4908";
compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca";
model = "Asus GT-AC5300";
memory@0 {

2
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts → arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
View File

@@ -3,7 +3,7 @@
#include "bcm4908.dtsi"
/ {
compatible = "netgear,raxe500", "brcm,bcm4908";
compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca";
model = "Netgear RAXE500";
memory@0 {

0
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi → arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
View File

30
arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts Normal file
View File

@@ -0,0 +1,30 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright 2022 Broadcom Ltd.
*/
/dts-v1/;
#include "bcm4908.dtsi"
/ {
model = "Broadcom BCM94908 Reference Board";
compatible = "brcm,bcm94908", "brcm,bcm4908", "brcm,bcmbca";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x08000000>;
};
};
&uart0 {
status = "okay";
};