Merge "pci: Add environment varibale to skip pci enumeration"

This commit is contained in:
Linux Build Service Account 2023-01-28 10:23:30 -08:00 committed by Gerrit - the friendly Code Review server
commit a04c25d601
3 changed files with 9 additions and 15 deletions

View file

@ -210,21 +210,6 @@
};
};
pci3: pci@18000000 {
status = "ok";
perst_gpio = <32>;
pci_gpio {
pci_rst {
gpio = <32>;
func = <0>;
pull = <GPIO_PULL_UP>;
oe = <GPIO_OD_ENABLE>;
od_en = <GPIO_OD_DISABLE>;
drvstr = <GPIO_8MA>;
};
};
};
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_PSGMII>;
switch_mac_mode1 = <PORT_WRAPPER_USXGMII>;

View file

@ -36,4 +36,6 @@
};
};
};
/delete-node/ pci@18000000;
};

View file

@ -1853,6 +1853,7 @@ void pci_init_board (void)
struct ipq_pcie *pcie;
int i, bus = 0, ret;
const struct udevice_id *of_match = pcie_ver_ids;
unsigned int skip_pci_mask;
pcie = malloc(sizeof(*pcie));
if (pcie == NULL) {
@ -1871,8 +1872,14 @@ void pci_init_board (void)
break;
}
skip_pci_mask = getenv_hex("skip_pci_mask", 0UL);
ipq_wifi_pci_power_enable();
for (i = 0; i < PCI_MAX_DEVICES; i++) {
if (skip_pci_mask & (1UL << i)) {
printf("Skipping PCI%d\n", i);
continue;
}
pcie->linkup = 0;
pci_ipq_ofdata_to_platdata(i, pcie);
if (pcie->linkup) {