Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a850a755 authored by Grant Likely's avatar Grant Likely
Browse files

of/address: add empty static inlines for !CONFIG_OF 



As the title says, this patch adds empty implementations for the address
translation functions so that they can be used when CONFIG_OF is disabled.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
parent 1bc04f2c

include/linux/of_address.h

+29 −4
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/of.h>

#include <linux/of.h>





#ifdef CONFIG_OF_ADDRESS

extern u64 of_translate_address(struct device_node *np, const __be32 *addr);

extern u64 of_translate_address(struct device_node *np, const __be32 *addr);

extern int of_address_to_resource(struct device_node *dev, int index,

extern int of_address_to_resource(struct device_node *dev, int index,

				  struct resource *r);

				  struct resource *r);
@@ -25,12 +26,37 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } 
#define pci_address_to_pio pci_address_to_pio

#define pci_address_to_pio pci_address_to_pio

#endif

#endif





#ifdef CONFIG_PCI

#else /* CONFIG_OF_ADDRESS */

static inline int of_address_to_resource(struct device_node *dev, int index,

					 struct resource *r)

{

	return -EINVAL;

}

static inline struct device_node *of_find_matching_node_by_address(

					struct device_node *from,

					const struct of_device_id *matches,

					u64 base_address)

{

	return NULL;

}

static inline void __iomem *of_iomap(struct device_node *device, int index)

{

	return NULL;

}

static inline const u32 *of_get_address(struct device_node *dev, int index,

					u64 *size, unsigned int *flags)

{

	return NULL;

}

#endif /* CONFIG_OF_ADDRESS */





#if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)

extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,

extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,

			       u64 *size, unsigned int *flags);

			       u64 *size, unsigned int *flags);

extern int of_pci_address_to_resource(struct device_node *dev, int bar,

extern int of_pci_address_to_resource(struct device_node *dev, int bar,

				      struct resource *r);

				      struct resource *r);

#else /* CONFIG_PCI */

#else /* CONFIG_OF_ADDRESS && CONFIG_PCI */

static inline int of_pci_address_to_resource(struct device_node *dev, int bar,

static inline int of_pci_address_to_resource(struct device_node *dev, int bar,

				             struct resource *r)

				             struct resource *r)

{

{
@@ -42,8 +68,7 @@ static inline const __be32 *of_get_pci_address(struct device_node *dev, 
{

{

	return NULL;

	return NULL;

}

}

#endif /* CONFIG_PCI */

#endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */







#endif /* __OF_ADDRESS_H */

#endif /* __OF_ADDRESS_H */