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

Commit 38e9d36b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc: Move isa bridge definitions to separate include 



We'll be adding non-PCI isa bridge support so let's not
have all the definition in pci-bridge.h

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b48ff520

arch/powerpc/include/asm/isa-bridge.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#ifndef __ISA_BRIDGE_H

#define __ISA_BRIDGE_H



#ifdef CONFIG_PPC64



extern void isa_bridge_find_early(struct pci_controller *hose);



static inline int isa_vaddr_is_ioport(void __iomem *address)

{

	/* Check if address hits the reserved legacy IO range */

	unsigned long ea = (unsigned long)address;

	return ea >= ISA_IO_BASE && ea < ISA_IO_END;

}



#else



static inline int isa_vaddr_is_ioport(void __iomem *address)

{

	/* No specific ISA handling on ppc32 at this stage, it

	 * all goes through PCI

	 */

	return 0;

}



#endif



#endif /* __ISA_BRIDGE_H */

arch/powerpc/include/asm/pci-bridge.h

+0 −18
Original line number Diff line number Diff line
@@ -174,14 +174,6 @@ extern int pci_device_from_OF_node(struct device_node *node, 
				   u8 *bus, u8 *devfn);

extern void pci_create_OF_bus_map(void);



static inline int isa_vaddr_is_ioport(void __iomem *address)

{

	/* No specific ISA handling on ppc32 at this stage, it

	 * all goes through PCI

	 */

	return 0;

}



#else	/* CONFIG_PPC64 */



/*
@@ -269,16 +261,6 @@ extern void pci_hp_remove_devices(struct pci_bus *bus); 
/** Discover new pci devices under this bus, and add them */

extern void pci_hp_add_devices(struct pci_bus *bus);





extern void isa_bridge_find_early(struct pci_controller *hose);



static inline int isa_vaddr_is_ioport(void __iomem *address)

{

	/* Check if address hits the reserved legacy IO range */

	unsigned long ea = (unsigned long)address;

	return ea >= ISA_IO_BASE && ea < ISA_IO_END;

}



extern int pcibios_unmap_io_space(struct pci_bus *bus);

extern int pcibios_map_io_space(struct pci_bus *bus);

arch/powerpc/kernel/iomap.c

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

#include <asm/io.h>

#include <asm/pci-bridge.h>

#include <asm/isa-bridge.h>



/*

 * Here comes the ppc64 implementation of the IOMAP

arch/powerpc/kernel/isa-bridge.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/pci-bridge.h>

#include <asm/machdep.h>

#include <asm/ppc-pci.h>

#include <asm/isa-bridge.h>



unsigned long isa_io_base;	/* NULL if no ISA bus */

EXPORT_SYMBOL(isa_io_base);

arch/powerpc/platforms/maple/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/machdep.h>

#include <asm/iommu.h>

#include <asm/ppc-pci.h>

#include <asm/isa-bridge.h>



#include "maple.h"