diff options
| author | Bjorn Helgaas | 2018-06-06 16:10:43 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2018-06-06 16:10:43 -0500 |
| commit | e52d38f4abf49f8b63a6ad0ce21e5f495c15897f (patch) | |
| tree | 8df6e7f26ebebdd5f5363bebe87151c1f5a196dd /MAINTAINERS | |
| parent | 1c2bef0a3fd14287a66edd7ead57fd2e439485a2 (diff) | |
| parent | 7304a9a99d7b15fd69b3f00f7e16206bba110b35 (diff) | |
Merge branch 'lorenzo/pci/rockchip'
- update arm64 defconfig for Rockchip (Shawn Lin)
- refactor Rockchip code to facilitate both root port and endpoint mode
(Shawn Lin)
- add Rockchip endpoint mode driver (Shawn Lin)
* lorenzo/pci/rockchip:
arm64: defconfig: update config for Rockchip PCIe
dt-bindings: PCI: rockchip: Add DT bindings for Rockchip PCIe EP driver
PCI: rockchip: Add EP driver for Rockchip PCIe controller
dt-bindings: PCI: rockchip: Rename rockchip-pcie.txt to rockchip-pcie-host.txt
PCI: rockchip: Split out common function to init controller
PCI: rockchip: Split out rockchip_pcie_parse_dt() to parse DT
PCI: rockchip: Separate common code from RC driver
# Conflicts:
# drivers/pci/host/pcie-rockchip.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0395ad608fc9..d70a026ccb84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10947,8 +10947,8 @@ M: Shawn Lin <shawn.lin@rock-chips.com> L: linux-pci@vger.kernel.org L: linux-rockchip@lists.infradead.org S: Maintained -F: Documentation/devicetree/bindings/pci/rockchip-pcie.txt -F: drivers/pci/host/pcie-rockchip.c +F: Documentation/devicetree/bindings/pci/rockchip-pcie* +F: drivers/pci/host/pcie-rockchip* PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC M: Linus Walleij <linus.walleij@linaro.org> |