Skip to content

Commit 96b34ba

Browse files
committed
Merge tag 'arm-soc/for-5.6/maintainers' of https://github.com/Broadcom/stblinux into arm/drivers
This pull request contains Broadcom SoCs MAINTAINERS file updates for 5.6, please pull the following: - Nicolas adds an entry for the Broadcom STB PCIe Root Complex files for both BCM7xxx (actual STB SoCs) and BCM2711 (Raspberry Pi 4). * tag 'arm-soc/for-5.6/maintainers' of https://github.com/Broadcom/stblinux: MAINTAINERS: Add brcmstb PCIe controller entry Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents feec214 + e0b7094 commit 96b34ba

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3238,6 +3238,8 @@ S: Maintained
32383238
N: bcm2711
32393239
N: bcm2835
32403240
F: drivers/staging/vc04_services
3241+
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
3242+
F: drivers/pci/controller/pcie-brcmstb.c
32413243

32423244
BROADCOM BCM47XX MIPS ARCHITECTURE
32433245
M: Hauke Mehrtens <[email protected]>
@@ -3293,6 +3295,8 @@ F: drivers/bus/brcmstb_gisb.c
32933295
F: arch/arm/mm/cache-b15-rac.c
32943296
F: arch/arm/include/asm/hardware/cache-b15-rac.h
32953297
N: brcmstb
3298+
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
3299+
F: drivers/pci/controller/pcie-brcmstb.c
32963300

32973301
BROADCOM BMIPS CPUFREQ DRIVER
32983302
M: Markus Mayer <[email protected]>

0 commit comments

Comments
 (0)