• Bjorn Helgaas's avatar
    Merge branch 'pci/controller/microchip' · 325b9a3e
    Bjorn Helgaas authored
    - Move PLDA XpressRICH generic DT binding properties to
      plda,xpressrich3-axi-common.yaml where they can be shared across
      PLDA-based drivers (Minda Chen)
    
    - Create a drivers/pci/controller/plda/ directory for PLDA-based drivers
      and move pcie-microchip-host.c there (Minda Chen)
    
    - Move PLDA generic macros to pcie-plda.h where they can be shared across
      drivers (Minda Chen)
    
    - Extract PLDA generic structures from pcie-microchip-host.c, rename them
      to be generic, and move them to pcie-plda-host.c where they can be shared
      across drivers (Minda Chen)
    
    - Add a .request_event_irq() callback for requesting device-specific
      interrupts in addition to PLDA-generic interrupts (Minda Chen)
    
    - Add DT binding and driver for the StarFive JH7110 SoC, based on PLDA IP
      (Minda Chen)
    
    * pci/controller/microchip:
      PCI: starfive: Add JH7110 PCIe controller
      dt-bindings: PCI: Add StarFive JH7110 PCIe controller
      PCI: Add PCIE_RESET_CONFIG_DEVICE_WAIT_MS waiting time value
      PCI: plda: Pass pci_host_bridge to plda_pcie_setup_iomems()
      PCI: plda: Add host init/deinit and map bus functions
      PCI: plda: Add event bitmap field to struct plda_pcie_rp
      PCI: microchip: Move IRQ functions to pcie-plda-host.c
      PCI: microchip: Add event irqchip field to host port and add PLDA irqchip
      PCI: microchip: Add get_events() callback and PLDA get_event()
      PCI: microchip: Add INTx and MSI event num to struct plda_event
      PCI: microchip: Add request_event_irq() callback function
      PCI: microchip: Add num_events field to struct plda_pcie_rp
      PCI: microchip: Rename interrupt related functions
      PCI: microchip: Move PLDA functions to pcie-plda-host.c
      PCI: microchip: Rename PLDA functions to be generic
      PCI: microchip: Move PLDA structures to plda-pcie.h
      PCI: microchip: Rename PLDA structures to be generic
      PCI: microchip: Add bridge_addr field to struct mc_pcie
      PCI: microchip: Move PLDA IP register macros to pcie-plda.h
      PCI: microchip: Move pcie-microchip-host.c to PLDA directory
      dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties
    
    # Conflicts:
    #	drivers/pci/pci.h
    325b9a3e
pci.h 29.5 KB