Merge branch 'lorenzo/pci/dwc'

  - reduce Keystone "link already up" log level (Fabio Estevam)

  - move private DT functions to drivers/pci/ (Rob Herring)

  - factor out dwc CONFIG_PCI Kconfig dependencies (Rob Herring)

  - add DesignWare support to the endpoint test driver (Gustavo Pimentel)

  - add DesignWare support for endpoint mode (Gustavo Pimentel)

  - use devm_ioremap_resource() instead of devm_ioremap() in dra7xx and
    artpec6 (Gustavo Pimentel)

  - fix Qualcomm bitwise NOT issue (Dan Carpenter)

  - add Qualcomm runtime PM support (Srinivas Kandagatla)

* lorenzo/pci/dwc:
  PCI: qcom: add runtime pm support to pcie_port
  PCI: qcom: Fix a bitwise vs logical NOT typo
  PCI: dwc: dra7xx: Use devm_ioremap_resource() instead of devm_ioremap()
  PCI: dwc: artpec6: Use devm_ioremap_resource() instead of devm_ioremap()
  misc: pci_endpoint_test: Add DesignWare EP entry
  dt-bindings: PCI: designware: Add support for EP in DesignWare driver
  PCI: dwc: Add support for EP mode
  dt-bindings: PCI: designware: Example update
  PCI: Move private DT related functions into private header
  PCI: dwc: Move CONFIG_PCI depends to menu
  PCI: dwc: Replace magic number by defines
  PCI: dwc: Small computation improvement
  PCI: dwc: Replace lower into upper case characters
  PCI: dwc: Define maximum number of vectors
  PCI: imx6: Remove space before tabs
  PCI: keystone: Do not treat link up message as error

# Conflicts:
#	include/linux/of_pci.h

diff --cc drivers/pci/dwc/pcie-designware-host.c
Simple merge

diff --cc drivers/pci/host/pci-aardvark.c
Simple merge

diff --cc drivers/pci/host/pci-ftpci100.c
Simple merge

diff --cc drivers/pci/host/pci-v3-semi.c
Simple merge

diff --cc drivers/pci/host/pci-versatile.c
index ff2cd12,5b3876f..994f320
--- 1/drivers/pci/host/pci-versatile.c
--- 2/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@@ -15,6 -15,6 +15,8 @@@
  #include <linux/pci.h>
  #include <linux/platform_device.h>
  
++#include "../pci.h"
++
  static void __iomem *versatile_pci_base;
  static void __iomem *versatile_cfg_base[2];
  

diff --cc drivers/pci/host/pci-xgene.c
Simple merge

diff --cc drivers/pci/host/pcie-altera.c
Simple merge

diff --cc drivers/pci/host/pcie-iproc-platform.c
Simple merge

diff --cc drivers/pci/host/pcie-rcar.c
Simple merge

diff --cc drivers/pci/host/pcie-rockchip.c
Simple merge

diff --cc drivers/pci/host/pcie-xilinx-nwl.c
Simple merge

diff --cc drivers/pci/host/pcie-xilinx.c
Simple merge

diff --cc drivers/pci/pci.h
index 6af7595,6c7cd16..c358e7a
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -412,4 -407,44 +412,44 @@@ static inline u64 pci_rebar_size_to_byt
        return 1ULL << (size + 20);
  }
  
 -int of_pci_get_host_bridge_resources(struct device_node *dev,
+ struct device_node;
+ 
+ #ifdef CONFIG_OF
+ int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
+ int of_get_pci_domain_nr(struct device_node *node);
+ int of_pci_get_max_link_speed(struct device_node *node);
+ 
+ #else
+ static inline int
+ of_pci_parse_bus_range(struct device_node *node, struct resource *res)
+ {
+       return -EINVAL;
+ }
+ 
+ static inline int
+ of_get_pci_domain_nr(struct device_node *node)
+ {
+       return -1;
+ }
+ 
+ static inline int
+ of_pci_get_max_link_speed(struct device_node *node)
+ {
+       return -EINVAL;
+ }
+ #endif /* CONFIG_OF */
+ 
+ #if defined(CONFIG_OF_ADDRESS)
 -static inline int of_pci_get_host_bridge_resources(struct device_node *dev,
++int devm_of_pci_get_host_bridge_resources(struct device *dev,
+                       unsigned char busno, unsigned char bus_max,
+                       struct list_head *resources, resource_size_t *io_base);
+ #else
++static inline int devm_of_pci_get_host_bridge_resources(struct device *dev,
+                       unsigned char busno, unsigned char bus_max,
+                       struct list_head *resources, resource_size_t *io_base)
+ {
+       return -EINVAL;
+ }
+ #endif
+ 
  #endif /* DRIVERS_PCI_H */