]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: pci: Extract vendor/device id in child_post_bind()
authorBin Meng <bmeng.cn@gmail.com>
Fri, 3 Aug 2018 08:14:36 +0000 (01:14 -0700)
committerSimon Glass <sjg@chromium.org>
Wed, 8 Aug 2018 11:49:31 +0000 (12:49 +0100)
Currently only devfn is extracted in child_post_bind(). Now that
we have the live-tree version API to look up PCI vendor and device
id from the compatible string, let's extract and save them too.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/pci/pci-uclass.c

index 46e9c71bdfba5b729303ad3666ea9491bebfb59c..b2909a325ac3773f17549dda02d42988c04f564d 100644 (file)
@@ -987,19 +987,18 @@ static int pci_uclass_child_post_bind(struct udevice *dev)
        if (!dev_of_valid(dev))
                return 0;
 
-       /*
-        * We could read vendor, device, class if available. But for now we
-        * just check the address.
-        */
        pplat = dev_get_parent_platdata(dev);
+
+       /* Extract vendor id and device id if available */
+       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 {
-               /* extract the devfn from fdt_pci_addr */
                pplat->devfn = addr.phys_hi & 0xff00;
        }