aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of/address.c
diff options
context:
space:
mode:
authorLiviu Dudau <Liviu.Dudau@arm.com>2014-09-29 10:29:24 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-09-30 15:29:09 -0400
commit83bbde1cc0ec9d156b9271e29ffe0dc89c687feb (patch)
tree379436a87c6b9188434ed5ab87d5d9b6c30ba684 /drivers/of/address.c
parentdad13e3c08e7005854271e562eda4ffa5c71bc38 (diff)
of/pci: Move of_pci_range_to_resource() to of/address.c
We need to enhance of_pci_range_to_resources() enough that it won't make sense for it to be inline anymore. Move it to drivers/of/address.c, under #ifdef CONFIG_PCI. of_address.h previously implemented of_pci_range_to_resources() unconditionally, regardless of any config options. The implementation in address.c is defined only when CONFIG_OF_ADDRESS=y and CONFIG_PCI=y, so add a dummy version to avoid build errors when CONFIG_OF or CONFIG_OF_ADDRESS is not defined. [bhelgaas: drop extra detail from changelog, move def under CONFIG_PCI, add dummy of_pci_range_to_resource() for build errors (from Arnd)] Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Grant Likely <grant.likely@linaro.org> CC: Rob Herring <robh+dt@kernel.org> CC: Arnd Bergmann <arnd@arndb.de> CC: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'drivers/of/address.c')
-rw-r--r--drivers/of/address.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 758d4f04d4aa..327a57410797 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -295,6 +295,15 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
295} 295}
296EXPORT_SYMBOL_GPL(of_pci_range_parser_one); 296EXPORT_SYMBOL_GPL(of_pci_range_parser_one);
297 297
298void of_pci_range_to_resource(struct of_pci_range *range,
299 struct device_node *np, struct resource *res)
300{
301 res->flags = range->flags;
302 res->start = range->cpu_addr;
303 res->end = range->cpu_addr + range->size - 1;
304 res->parent = res->child = res->sibling = NULL;
305 res->name = np->full_name;
306}
298#endif /* CONFIG_PCI */ 307#endif /* CONFIG_PCI */
299 308
300/* 309/*