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

Commit 19260896 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "of/address: Add new API of_iomap_by_name and of_get_address_by_name"

parents 6b5e1621 202e9ebf

drivers/of/address.c

+32 −0
Original line number Diff line number Diff line
@@ -552,6 +552,22 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, 
}

EXPORT_SYMBOL(of_get_address);



const __be32 *of_get_address_by_name(struct device_node *dev, const char *name,

		u64 *size, unsigned int *flags)

{

	int index;

	if (!name)

		return NULL;



	/* Try to read "reg-names" property and get the index by name */

	index = of_property_match_string(dev, "reg-names", name);

	if (index < 0)

		return NULL;



	return of_get_address(dev, index, size, flags);

}

EXPORT_SYMBOL(of_get_address_by_name);



static int __of_address_to_resource(struct device_node *dev,

		const __be32 *addrp, u64 size, unsigned int flags,

		const char *name, struct resource *r)
@@ -644,3 +660,19 @@ void __iomem *of_iomap(struct device_node *np, int index) 
	return ioremap(res.start, resource_size(&res));

}

EXPORT_SYMBOL(of_iomap);



void __iomem *of_iomap_by_name(struct device_node *np, const char *name)

{

	int index;



	if (!name)

		return NULL;



	/* Try to read "reg-names" property and get the index by name */

	index = of_property_match_string(np, "reg-names", name);

	if (index < 0)

		return NULL;



	return of_iomap(np, index);

}

EXPORT_SYMBOL(of_iomap_by_name);

include/linux/of_address.h

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ extern struct device_node *of_find_matching_node_by_address( 
					const struct of_device_id *matches,

					u64 base_address);

extern void __iomem *of_iomap(struct device_node *device, int index);

extern void __iomem *of_iomap_by_name(struct device_node *device,

					const char *name);



/* Extract an address from a device, returns the region size and

 * the address space flags too. The PCI version uses a BAR number
@@ -21,6 +23,8 @@ extern void __iomem *of_iomap(struct device_node *device, int index); 
 */

extern const __be32 *of_get_address(struct device_node *dev, int index,

			   u64 *size, unsigned int *flags);

extern const __be32 *of_get_address_by_name(struct device_node *dev,

			   const char *name, u64 *size, unsigned int *flags);



#ifndef pci_address_to_pio

static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; }