Commit 22ae782f authored by Grant Likely's avatar Grant Likely
Browse files

of/address: Clean up function declarations 



This patch moves the declaration of of_get_address(), of_get_pci_address(),
and of_pci_address_to_resource() out of arch code and into the common
linux/of_address header file.

This patch also fixes some of the asm/prom.h ordering issues.  It still
includes some header files that it ideally shouldn't be, but at least the
ordering is consistent now so that of_* overrides work.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 12b15e83

arch/microblaze/include/asm/prom.h

+11 −22
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ 
#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>

#include <linux/platform_device.h>

#include <asm/irq.h>

#include <asm/atomic.h>
@@ -52,25 +47,9 @@ extern void pci_create_OF_bus_map(void); 
 * OF address retreival & translation

 */



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

 * the address space flags too. The PCI version uses a BAR number

 * instead of an absolute index

 */

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

			u64 *size, unsigned int *flags);

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

			u64 *size, unsigned int *flags);



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

				struct resource *r);



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

#define pci_address_to_pio pci_address_to_pio

#endif	/* CONFIG_PCI */



/* Parse the ibm,dma-window property of an OF node into the busno, phys and
@@ -99,8 +78,18 @@ extern const void *of_get_mac_address(struct device_node *np); 
 * resolving using the OF tree walking.

 */

struct pci_dev;

struct of_irq;

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



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */



/* These includes are put at the bottom because they may contain things

 * that are overridden by this file.  Ideally they shouldn't be included

 * by this file, but there are a bunch of .c files that currently depend

 * on it.  Eventually they will be cleaned up. */

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>



#endif /* _ASM_MICROBLAZE_PROM_H */

arch/powerpc/include/asm/prom.h

+11 −38
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
 * 2 of the License, or (at your option) any later version.

 */

#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>

#include <asm/irq.h>

#include <asm/atomic.h>
@@ -49,41 +44,9 @@ extern void pci_create_OF_bus_map(void); 
extern u64 of_translate_dma_address(struct device_node *dev,

				    const u32 *in_addr);



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

 * the address space flags too. The PCI version uses a BAR number

 * instead of an absolute index

 */

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

			   u64 *size, unsigned int *flags);

#ifdef CONFIG_PCI

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

			       u64 *size, unsigned int *flags);

#else

static inline const u32 *of_get_pci_address(struct device_node *dev,

		int bar_no, u64 *size, unsigned int *flags)

{

	return NULL;

}

#endif /* CONFIG_PCI */



#ifdef CONFIG_PCI

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

				      struct resource *r);

#else

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

		struct resource *r)

{

	return -ENOSYS;

}

#endif /* CONFIG_PCI */



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#else

static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	return (unsigned long)-1;

}

#define pci_address_to_pio pci_address_to_pio

#endif	/* CONFIG_PCI */



/* Parse the ibm,dma-window property of an OF node into the busno, phys and
@@ -122,9 +85,19 @@ static inline int of_node_to_nid(struct device_node *device) { return 0; } 
 * resolving using the OF tree walking.

 */

struct pci_dev;

struct of_irq;

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



extern void of_instantiate_rtc(void);



/* These includes are put at the bottom because they may contain things

 * that are overridden by this file.  Ideally they shouldn't be included

 * by this file, but there are a bunch of .c files that currently depend

 * on it.  Eventually they will be cleaned up. */

#include <linux/of_fdt.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>



#endif /* __KERNEL__ */

#endif /* _POWERPC_PROM_H */

arch/powerpc/kernel/legacy_serial.c

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

#include <linux/console.h>

#include <linux/pci.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <asm/io.h>

#include <asm/mmu.h>

arch/powerpc/kernel/pci-common.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/string.h>

#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/of_address.h>

#include <linux/mm.h>

#include <linux/list.h>

#include <linux/syscalls.h>

arch/powerpc/platforms/52xx/lite5200.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/init.h>

#include <linux/pci.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/root_dev.h>

#include <linux/initrd.h>

#include <asm/time.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE