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

Commit 6b884a8d authored by Grant Likely's avatar Grant Likely
Browse files

of/address: merge of_iomap() 



Merge common code between Microblaze and PowerPC.  This patch creates
new of_address.h and address.c files to containing address translation
and mapping routines.  First routine to be moved it of_iomap()

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
parent a7c194b0

arch/microblaze/include/asm/prom.h

+1 −9
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_fdt.h>

#include <linux/proc_fs.h>
@@ -103,15 +104,6 @@ extern const void *of_get_mac_address(struct device_node *np); 
struct pci_dev;

extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);



/**

 * of_iomap - Maps the memory mapped IO for a given device_node

 * @device:	the device whose io range will be mapped

 * @index:	index of the io range

 *

 * Returns a pointer to the mapped memory

 */

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



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_MICROBLAZE_PROM_H */

arch/microblaze/kernel/prom_parse.c

+0 −11
Original line number Diff line number Diff line
@@ -681,14 +681,3 @@ const void *of_get_mac_address(struct device_node *np) 
	return NULL;

}

EXPORT_SYMBOL(of_get_mac_address);
 


void __iomem *of_iomap(struct device_node *np, int index)

{

	struct resource res;



	if (of_address_to_resource(np, index, &res))

		return NULL;



	return ioremap(res.start, 1 + res.end - res.start);

}

EXPORT_SYMBOL(of_iomap);

arch/powerpc/include/asm/prom.h

+1 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */

#include <linux/types.h>

#include <linux/of_fdt.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/proc_fs.h>

#include <linux/platform_device.h>
@@ -119,14 +120,5 @@ extern const void *of_get_mac_address(struct device_node *np); 
struct pci_dev;

extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);



/**

 * of_iomap - Maps the memory mapped IO for a given device_node

 * @device:	the device whose io range will be mapped

 * @index:	index of the io range

 *

 * Returns a pointer to the mapped memory

 */

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



#endif /* __KERNEL__ */

#endif /* _POWERPC_PROM_H */

arch/powerpc/kernel/prom_parse.c

+0 −11
Original line number Diff line number Diff line
@@ -715,14 +715,3 @@ const void *of_get_mac_address(struct device_node *np) 
	return NULL;

}

EXPORT_SYMBOL(of_get_mac_address);
 


void __iomem *of_iomap(struct device_node *np, int index)

{

	struct resource res;



	if (of_address_to_resource(np, index, &res))

		return NULL;



	return ioremap(res.start, 1 + res.end - res.start);

}

EXPORT_SYMBOL(of_iomap);

drivers/of/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ config OF_DYNAMIC 
	def_bool y

	depends on OF && PPC_OF



config OF_ADDRESS

	def_bool y

	depends on OF && !SPARC



config OF_IRQ

	def_bool y

	depends on OF && !SPARC