diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2025-06-04 18:50:43 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-06-04 18:50:43 +0300 |
| commit | fd0c51f7eb4b4ad9d7ed971757e76ce3fe346c85 (patch) | |
| tree | f5cb25cb0f5f3e0d59194ce3cd830b73c49a243f | |
| parent | d96c67a57ca60ba6535ab5459924fe9bd85f34ff (diff) | |
| parent | a7d824b2df0d8b9e19c334594cdbffab97ff8d66 (diff) | |
| download | linux-fd0c51f7eb4b4ad9d7ed971757e76ce3fe346c85.tar.xz | |
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
| -rw-r--r-- | drivers/pci/controller/pcie-rockchip-ep.c | 1 | ||||
| -rw-r--r-- | drivers/pci/controller/pcie-rockchip.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/pci/controller/pcie-rockchip-ep.c b/drivers/pci/controller/pcie-rockchip-ep.c index a0a85080c31d..55416b8311dd 100644 --- a/drivers/pci/controller/pcie-rockchip-ep.c +++ b/drivers/pci/controller/pcie-rockchip-ep.c @@ -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, }; diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h index 14954f43e5e9..5864a20323f2 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -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 { |