Skip to content

Commit fd0c51f

Browse files
committed
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
2 parents d96c67a + a7d824b commit fd0c51f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,7 @@ static const struct pci_epc_features rockchip_pcie_epc_features = {
695695
.linkup_notifier = true,
696696
.msi_capable = true,
697697
.msix_capable = false,
698+
.intx_capable = true,
698699
.align = ROCKCHIP_PCIE_AT_SIZE_ALIGN,
699700
};
700701

drivers/pci/controller/pcie-rockchip.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,11 +319,12 @@ static const char * const rockchip_pci_pm_rsts[] = {
319319
"aclk",
320320
};
321321

322+
/* NOTE: Do not reorder the deassert sequence of the following reset pins */
322323
static const char * const rockchip_pci_core_rsts[] = {
323-
"mgmt-sticky",
324-
"core",
325-
"mgmt",
326324
"pipe",
325+
"mgmt",
326+
"core",
327+
"mgmt-sticky",
327328
};
328329

329330
struct rockchip_pcie {

0 commit comments

Comments
 (0)