Merge branch 'pci/host-rockchip' into next

Browse source

* pci/host-rockchip:
  PCI: rockchip: Set vendor ID from local core config space
  PCI: rockchip: Fix rockchip_pcie_probe() error path to free resource list
  PCI: rockchip: Mark PM functions as __maybe_unused
  PCI: rockchip: Use readl_poll_timeout() instead of open-coding it
  PCI: rockchip: Disable RC's ASPM L0s based on DT "aspm-no-l0s"
  PCI: rockchip: Add system PM support

...

This commit is contained in:

Bjorn Helgaas 2017-02-21 15:15:44 -06:00

parent 56195e9d1d 5800790a92

commit bcea623c65

2 changed files with 138 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/pci/rockchip-pcie.txt

View file

175

drivers/pci/host/pcie-rockchip.c

View file