diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-20 11:22:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-20 11:22:49 -0800 |
| commit | 96b34bac41338328cf655743c87f0c1b4a230e40 (patch) | |
| tree | f5c9b019eae04d833e21ca8dc43f448d27b2c8cc /MAINTAINERS | |
| parent | feec214afb53f17554c9c0c85f72de709b7ba3e4 (diff) | |
| parent | e0b70940536a45dea784f2d013f1d796798dc3ba (diff) | |
| download | linux-96b34bac41338328cf655743c87f0c1b4a230e40.tar.gz linux-96b34bac41338328cf655743c87f0c1b4a230e40.tar.bz2 linux-96b34bac41338328cf655743c87f0c1b4a230e40.zip | |
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/20200118032935.1346-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e6321c7ea4aa..06d15ec37dbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> @@ -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> |