diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-14 02:34:39 +0300 | 
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-14 02:34:39 +0300 | 
| commit | 5349abcf8e5f09a178910225a90d4a0329f82a1f (patch) | |
| tree | 69e4f52c272f5e8dbab92158fa3c673161b5a009 /include/linux/fpga/fpga-region.h | |
| parent | 29fa3bbd6c205bb12d1046243af7b9160df73a90 (diff) | |
| parent | 87cb312777b5dc5eece8e1c58d4e0040eeea39fa (diff) | |
| download | linux-5349abcf8e5f09a178910225a90d4a0329f82a1f.tar.xz | |
Merge branch 'remotes/lorenzo/pci/imx'
  - Simplify imx7d_pcie_wait_for_phy_pll_lock() by using
    regmap_read_poll_timeout() (Andrey Smirnov)
  - Drop imx6_pcie_wait_for_link() in favor of the more generic
    dw_pcie_wait_for_link() (Andrey Smirnov)
  - Return -ETIMEDOUT instead of -EINVAL from
    imx6_pcie_wait_for_speed_change() (Andrey Smirnov)
  - Remove unused PCIE_PL_PFLR_* constants from imx6 (Andrey Smirnov)
  - Use shared PHY debug register definitions in imx6 (Andrey Smirnov)
  - Use BIT() in imx6 (Andrey Smirnov)
  - Simplify imx6 PHY bit operations (Andrey Smirnov)
  - Simplify imx6 pcie_phy_poll_ack() (Andrey Smirnov)
  - Use data types that match actual imx6 PHY register width (Andrey
    Smirnov)
  - Mark imx6 suspend support with drvdata flags instead of checking
    variants (Andrey Smirnov)
  - Sleep instead of delay in imx6_pcie_enable_ref_clk() (Andrey Smirnov)
* remotes/lorenzo/pci/imx:
  PCI: imx6: Use usleep_range() in imx6_pcie_enable_ref_clk()
  PCI: imx6: Use flags to indicate support for suspend
  PCI: imx6: Restrict PHY register data to 16-bit
  PCI: imx6: Simplify pcie_phy_poll_ack()
  PCI: imx6: Simplify bit operations in PHY functions
  PCI: imx6: Make use of BIT() in constant definitions
  PCI: dwc: imx6: Share PHY debug register definitions
  PCI: imx6: Remove PCIE_PL_PFLR_* constants
  PCI: imx6: Return -ETIMEOUT from imx6_pcie_wait_for_speed_change()
  PCI: imx6: Drop imx6_pcie_wait_for_link()
  PCI: imx6: Simplify imx7d_pcie_wait_for_phy_pll_lock()
Diffstat (limited to 'include/linux/fpga/fpga-region.h')
0 files changed, 0 insertions, 0 deletions
