Commit f8ca62bf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/imx6' 

- Fix a code restructuring error that caused i.MX8MM and i.MX8MP Endpoints
  to fail to establish link (Richard Zhu)

- Fix i.MX8MP Endpoint occasional failure to trigger MSI by enforcing
  outbound alignment requirement (Richard Zhu)

- Call phy_power_off() in the .probe() error path (Frank Li)

- Rename internal names from imx6_* to imx_* since i.MX7/8/9 are also
  supported (Frank Li)

- Manage Refclk by using SoC-specific callbacks instead of switch
  statements (Frank Li)

- Manage core reset by using SoC-specific callbacks instead of switch
  statements (Frank Li)

- Expand comments for erratum ERR010728 workaround (Frank Li)

- Use generic PHY APIs to configure mode, speed, and submode, which is
  harmless for devices that implement their own internal PHY management and
  don't set the generic imx_pcie->phy (Frank Li)

- Add i.MX8Q (i.MX8QM, i.MX8QXP, and i.MX8DXL) DT binding and driver Root
  Complex support (Richard Zhu)

* pci/controller/imx6:
  PCI: imx6: Add i.MX8Q PCIe Root Complex (RC) support
  PCI: imx6: Call common PHY API to set mode, speed, and submode
  dt-bindings: PCI: imx6q-pcie: Add i.MX8Q PCIe compatible string
  PCI: imx6: Consolidate redundant if-checks
  PCI: imx6: Improve comment for workaround ERR010728
  PCI: imx6: Simplify switch-case logic by involve core_reset callback
  PCI: imx6: Introduce SoC specific callbacks for controlling REFCLK
  PCI: imx6: Rename imx6_* with imx_*
  PCI: imx6: Fix missing call to phy_power_off() in error handling
  PCI: imx6: Fix i.MX8MP PCIe EP's occasional failure to trigger MSI
  PCI: imx6: Fix establish link failure in EP mode for i.MX8MM and i.MX8MP
parents 5ec58799 c2699778

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

+16 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ properties: 
      - fsl,imx8mm-pcie

      - fsl,imx8mp-pcie

      - fsl,imx95-pcie

      - fsl,imx8q-pcie



  clocks:

    minItems: 3
@@ -184,6 +185,21 @@ allOf: 
            - const: pcie_bus

            - const: pcie_aux



  - if:

      properties:

        compatible:

          enum:

            - fsl,imx8q-pcie

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: dbi

            - const: mstr

            - const: slv



unevaluatedProperties: false



examples:

drivers/pci/controller/dwc/pci-imx6.c

+526 −464

File changed.

Preview size limit exceeded, changes collapsed.