OSDN Git Service

Merge branch 'lorenzo/pci/rockchip'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:43 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:43 +0000 (16:10 -0500)
commite52d38f4abf49f8b63a6ad0ce21e5f495c15897f
tree8df6e7f26ebebdd5f5363bebe87151c1f5a196dd
parent1c2bef0a3fd14287a66edd7ead57fd2e439485a2
parent7304a9a99d7b15fd69b3f00f7e16206bba110b35
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
MAINTAINERS
drivers/pci/host/Kconfig
drivers/pci/host/pcie-rockchip-host.c
drivers/pci/host/pcie-rockchip.c