diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-19 17:22:23 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-19 17:22:23 (GMT) |
| commit | 0675f992dbf4a785a05a1baf149c2bce6aa5fe90 (patch) | |
| tree | b8868ec70ff6b2b20f8f0fb87df9438906020a08 /drivers/pci/pci_common.c | |
| parent | 755b06d1c0f3b16318c7580bec066efbb9ec6ccf (diff) | |
| parent | 5e4a6db8f428cb1f8ced74bc77241144ac0c5b1a (diff) | |
| download | u-boot-0675f992dbf4a785a05a1baf149c2bce6aa5fe90.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/pci/pci_common.c')
| -rw-r--r-- | drivers/pci/pci_common.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index 1755914..6526de8 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -181,11 +181,6 @@ phys_addr_t pci_hose_bus_to_phys(struct pci_controller *hose, return phys_addr; } -#ifdef CONFIG_DM_PCI - /* The root controller has the region information */ - hose = pci_bus_to_hose(0); -#endif - /* * if PCI_REGION_MEM is set we do a two pass search with preference * on matches that don't have PCI_REGION_SYS_MEMORY set @@ -236,6 +231,13 @@ int __pci_hose_phys_to_bus(struct pci_controller *hose, return 1; } +/* + * pci_hose_phys_to_bus(): Convert physical address to bus address + * @hose: PCI hose of the root PCI controller + * @phys_addr: physical address to convert + * @flags: flags of pci regions + * @return bus address if OK, 0 on error + */ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, phys_addr_t phys_addr, unsigned long flags) @@ -248,11 +250,6 @@ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose, return bus_addr; } -#ifdef CONFIG_DM_PCI - /* The root controller has the region information */ - hose = pci_bus_to_hose(0); -#endif - /* * if PCI_REGION_MEM is set we do a two pass search with preference * on matches that don't have PCI_REGION_SYS_MEMORY set |