mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 12:03:54 +02:00
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
This commit is contained in:
commit
fd0c51f7eb
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user