Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-5.6/maintainers' of https://github.com/Broadco…
Browse files Browse the repository at this point in the history
…m/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/20200118032935.1346-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Jan 20, 2020
2 parents feec214 + e0b7094 commit 96b34ba
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3238,6 +3238,8 @@ S: Maintained
N: bcm2711
N: bcm2835
F: drivers/staging/vc04_services
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
F: drivers/pci/controller/pcie-brcmstb.c

BROADCOM BCM47XX MIPS ARCHITECTURE
M: Hauke Mehrtens <hauke@hauke-m.de>
Expand Down Expand Up @@ -3293,6 +3295,8 @@ F: drivers/bus/brcmstb_gisb.c
F: arch/arm/mm/cache-b15-rac.c
F: arch/arm/include/asm/hardware/cache-b15-rac.h
N: brcmstb
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
F: drivers/pci/controller/pcie-brcmstb.c

BROADCOM BMIPS CPUFREQ DRIVER
M: Markus Mayer <mmayer@broadcom.com>
Expand Down

0 comments on commit 96b34ba

Please sign in to comment.