mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
Merge branch 'pci/controller/brcmstb'
- Assert PERST# when probing BCM2711 because some bootloaders don't do it (Jim Quinlan) * pci/controller/brcmstb: PCI: brcmstb: Remove stale comment PCI: brcmstb: Assert PERST# on BCM2711
This commit is contained in:
commit
4b3f481c7a
1 changed files with 5 additions and 1 deletions
|
@ -439,7 +439,6 @@ static struct irq_chip brcm_msi_irq_chip = {
|
|||
};
|
||||
|
||||
static struct msi_domain_info brcm_msi_domain_info = {
|
||||
/* Multi MSI is supported by the controller, but not by this driver */
|
||||
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
|
||||
MSI_FLAG_MULTI_PCI_MSI),
|
||||
.chip = &brcm_msi_irq_chip,
|
||||
|
@ -874,6 +873,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
|
|||
|
||||
/* Reset the bridge */
|
||||
pcie->bridge_sw_init_set(pcie, 1);
|
||||
|
||||
/* Ensure that PERST# is asserted; some bootloaders may deassert it. */
|
||||
if (pcie->type == BCM2711)
|
||||
pcie->perst_set(pcie, 1);
|
||||
|
||||
usleep_range(100, 200);
|
||||
|
||||
/* Take the bridge out of reset */
|
||||
|
|
Loading…
Reference in a new issue