diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-05 08:37:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-05 12:29:59 -0500 |
| commit | bdac5e18a80427e1f44413dce78aefece956ffc2 (patch) | |
| tree | 769c69845b4e6643209b60d3959db2616159d4af /drivers/pci/pci-uclass.c | |
| parent | c0bf3968d7fffa135305ba58644773d32f51090a (diff) | |
| parent | f18220919079eeb8e79f4791e152f1db073574a8 (diff) | |
Merge git://git.denx.de/u-boot-marvell
- Move Armada XP / 38x PCIe driver to DM_PCI from me
- Move Armada XP / 38x LCD driver to DM_VIDEO from me
- Add uDPU board (Armada-3720) from Vladimir
[trini: Fix warning in pci-uclass.c by removing ret from
pci_uclass_child_post_bind as it no longer calls functions with
a return code to catch.]
Signed-off-by: Tom Rini <trini@konsulko.com>II
Diffstat (limited to 'drivers/pci/pci-uclass.c')
| -rw-r--r-- | drivers/pci/pci-uclass.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 2cf55cb743d..824fa119074 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1007,12 +1007,26 @@ static int pci_uclass_post_probe(struct udevice *bus) return 0; } -static int pci_uclass_child_post_bind(struct udevice *dev) +int pci_get_devfn(struct udevice *dev) { - struct pci_child_platdata *pplat; struct fdt_pci_addr addr; int ret; + /* Extract the devfn from fdt_pci_addr */ + ret = ofnode_read_pci_addr(dev_ofnode(dev), FDT_PCI_SPACE_CONFIG, + "reg", &addr); + if (ret) { + if (ret != -ENOENT) + return -EINVAL; + } + + return addr.phys_hi & 0xff00; +} + +static int pci_uclass_child_post_bind(struct udevice *dev) +{ + struct pci_child_platdata *pplat; + if (!dev_of_valid(dev)) return 0; @@ -1022,14 +1036,7 @@ static int pci_uclass_child_post_bind(struct udevice *dev) ofnode_read_pci_vendev(dev_ofnode(dev), &pplat->vendor, &pplat->device); /* Extract the devfn from fdt_pci_addr */ - ret = ofnode_read_pci_addr(dev_ofnode(dev), FDT_PCI_SPACE_CONFIG, "reg", - &addr); - if (ret) { - if (ret != -ENOENT) - return -EINVAL; - } else { - pplat->devfn = addr.phys_hi & 0xff00; - } + pplat->devfn = pci_get_devfn(dev); return 0; } |