diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-09-07 14:07:11 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 20:04:06 -0500 |
| commit | 25ff79443cbfa924b8df1d4a8a0fbff83816938a (patch) | |
| tree | e7a9ac5cb39449b55d132c0838f7d866bc7d703c /drivers | |
| parent | ba904f0649357a3cbd67e752d30898c42b1fc91a (diff) | |
| download | linux-25ff79443cbfa924b8df1d4a8a0fbff83816938a.tar.gz linux-25ff79443cbfa924b8df1d4a8a0fbff83816938a.tar.bz2 linux-25ff79443cbfa924b8df1d4a8a0fbff83816938a.zip | |
of: implement pci_address_to_pio as weak function
Implement pci_address_to_pio as weak function to remove the dependency on
asm/prom.h. This is in preparation to make prom.h optional.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/address.c | 8 | ||||
| -rw-r--r-- | drivers/of/of_pci.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index b55c21890760..556a7fb6ead3 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -626,6 +626,14 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, } EXPORT_SYMBOL(of_get_address); +unsigned long __weak pci_address_to_pio(phys_addr_t address) +{ + if (address > IO_SPACE_LIMIT) + return (unsigned long)-1; + + return (unsigned long) address; +} + static int __of_address_to_resource(struct device_node *dev, const __be32 *addrp, u64 size, unsigned int flags, const char *name, struct resource *r) diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index e5ca00893c0c..848199633798 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -2,7 +2,6 @@ #include <linux/export.h> #include <linux/of.h> #include <linux/of_pci.h> -#include <asm/prom.h> static inline int __of_pci_pci_compare(struct device_node *node, unsigned int data) |