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

Merge branch 'pci/controller/rockchip' 

- Reorder rockchip_pci_core_rsts because reset_control_bulk_deassert()
  deasserts in reverse order, to fix a link training regression (Jensen
  Huang)

- Mark RK3399 as being capable of raising INTx interrupts (Niklas Cassel)

* pci/controller/rockchip:
  PCI: rockchip-ep: Mark RK3399 as intx_capable
  PCI: rockchip: Fix order of rockchip_pci_core_rsts
parents d96c67a5 a7d824b2

drivers/pci/controller/pcie-rockchip-ep.c

+1 −0
Original line number Diff line number Diff line
@@ -695,6 +695,7 @@ static const struct pci_epc_features rockchip_pcie_epc_features = { 
	.linkup_notifier = true,

	.msi_capable = true,

	.msix_capable = false,

	.intx_capable = true,

	.align = ROCKCHIP_PCIE_AT_SIZE_ALIGN,

};

drivers/pci/controller/pcie-rockchip.h

+4 −3
Original line number Diff line number Diff line
@@ -319,11 +319,12 @@ static const char * const rockchip_pci_pm_rsts[] = { 
	"aclk",

};



/* NOTE: Do not reorder the deassert sequence of the following reset pins */

static const char * const rockchip_pci_core_rsts[] = {

	"mgmt-sticky",

	"core",

	"mgmt",

	"pipe",

	"mgmt",

	"core",

	"mgmt-sticky",

};



struct rockchip_pcie {