diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:43 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:43 -0500 |
| commit | e52d38f4abf49f8b63a6ad0ce21e5f495c15897f (patch) | |
| tree | 8df6e7f26ebebdd5f5363bebe87151c1f5a196dd /arch | |
| parent | 1c2bef0a3fd14287a66edd7ead57fd2e439485a2 (diff) | |
| parent | 7304a9a99d7b15fd69b3f00f7e16206bba110b35 (diff) | |
| download | lwn-e52d38f4abf49f8b63a6ad0ce21e5f495c15897f.tar.gz lwn-e52d38f4abf49f8b63a6ad0ce21e5f495c15897f.zip | |
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 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ecf613761e78..17ea72b1b389 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -78,7 +78,8 @@ CONFIG_PCIE_ARMADA_8K=y CONFIG_PCI_AARDVARK=y CONFIG_PCI_TEGRA=y CONFIG_PCIE_RCAR=y -CONFIG_PCIE_ROCKCHIP=m +CONFIG_PCIE_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=m CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y CONFIG_PCI_HOST_THUNDER_PEM=y |