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

Commit 25ff7944 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant 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>
parent ba904f06

arch/microblaze/include/asm/prom.h

+0 −9
Original line number Diff line number Diff line
@@ -26,13 +26,4 @@ enum early_consoles { 


extern int of_early_console(void *version);



/*

 * OF address retreival & translation

 */



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#define pci_address_to_pio pci_address_to_pio

#endif	/* CONFIG_PCI */



#endif /* _ASM_MICROBLAZE_PROM_H */

arch/mips/include/asm/prom.h

+0 −11
Original line number Diff line number Diff line
@@ -19,17 +19,6 @@ 


extern void device_tree_init(void);



static inline unsigned long pci_address_to_pio(phys_addr_t address)

{

	/*

	 * The ioport address can be directly used by inX() / outX()

	 */

	BUG_ON(address > IO_SPACE_LIMIT);



	return (unsigned long) address;

}

#define pci_address_to_pio pci_address_to_pio



struct boot_param_header;



extern void __dt_setup_arch(struct boot_param_header *bph);

arch/powerpc/include/asm/prom.h

+0 −5
Original line number Diff line number Diff line
@@ -30,11 +30,6 @@ 
extern u64 of_translate_dma_address(struct device_node *dev,

				    const __be32 *in_addr);



#ifdef CONFIG_PCI

extern unsigned long pci_address_to_pio(phys_addr_t address);

#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

 * size parameters.

 */

arch/x86/include/asm/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ static inline void x86_dtb_init(void) { } 


extern char cmd_line[COMMAND_LINE_SIZE];



#define pci_address_to_pio pci_address_to_pio

unsigned long pci_address_to_pio(phys_addr_t addr);



#define HAVE_ARCH_DEVTREE_FIXUPS



#endif /* __ASSEMBLY__ */

arch/x86/kernel/devicetree.c

+0 −10
Original line number Diff line number Diff line
@@ -27,16 +27,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE]; 


int __initdata of_ioapic;



unsigned long pci_address_to_pio(phys_addr_t address)

{

	/*

	 * The ioport address can be directly used by inX / outX

	 */

	BUG_ON(address >= (1 << 16));

	return (unsigned long)address;

}

EXPORT_SYMBOL_GPL(pci_address_to_pio);



void __init early_init_dt_scan_chosen_arch(unsigned long node)

{

	BUG();