Commit 2171a19a authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

m68k: remove the dead PCI code

This patch removes the no longer used m68k PCI code.
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29c8a246
...@@ -122,10 +122,6 @@ config ATARI ...@@ -122,10 +122,6 @@ config ATARI
this kernel on an Atari, say Y here and browse the material this kernel on an Atari, say Y here and browse the material
available in <file:Documentation/m68k>; otherwise say N. available in <file:Documentation/m68k>; otherwise say N.
config PCI
bool
help
config MAC config MAC
bool "Macintosh support" bool "Macintosh support"
select MMU_MOTOROLA if MMU select MMU_MOTOROLA if MMU
......
...@@ -14,5 +14,4 @@ obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \ ...@@ -14,5 +14,4 @@ obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
devres-y = ../../../kernel/irq/devres.o devres-y = ../../../kernel/irq/devres.o
obj-$(CONFIG_PCI) += bios32.o
obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo
This diff is collapsed.
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */
extern void free_dma(unsigned int dmanr); /* release it again */ extern void free_dma(unsigned int dmanr); /* release it again */
#ifdef CONFIG_PCI
extern int isa_dma_bridge_buggy;
#else
#define isa_dma_bridge_buggy (0) #define isa_dma_bridge_buggy (0)
#endif
#endif /* _M68K_DMA_H */ #endif /* _M68K_DMA_H */
...@@ -7,15 +7,12 @@ ...@@ -7,15 +7,12 @@
* - added skeleton for GG-II and Amiga PCMCIA * - added skeleton for GG-II and Amiga PCMCIA
* 2/3/01 RZ: - moved a few more defs into raw_io.h * 2/3/01 RZ: - moved a few more defs into raw_io.h
* *
* inX/outX/readX/writeX should not be used by any driver unless it does * inX/outX should not be used by any driver unless it does
* ISA or PCI access. Other drivers should use function defined in raw_io.h * ISA access. Other drivers should use function defined in raw_io.h
* or define its own macros on top of these. * or define its own macros on top of these.
* *
* inX(),outX() are for PCI and ISA I/O * inX(),outX() are for ISA I/O
* readX(),writeX() are for PCI memory
* isa_readX(),isa_writeX() are for ISA memory * isa_readX(),isa_writeX() are for ISA memory
*
* moved mem{cpy,set}_*io inside CONFIG_PCI
*/ */
#ifndef _IO_H #ifndef _IO_H
...@@ -256,10 +253,7 @@ static inline void isa_delay(void) ...@@ -256,10 +253,7 @@ static inline void isa_delay(void)
(ISA_SEX ? raw_outsl(isa_itl(port), (u32 *)(buf), (nr)) : \ (ISA_SEX ? raw_outsl(isa_itl(port), (u32 *)(buf), (nr)) : \
raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1))
#endif /* CONFIG_ISA */
#if defined(CONFIG_ISA) && !defined(CONFIG_PCI)
#define inb isa_inb #define inb isa_inb
#define inb_p isa_inb_p #define inb_p isa_inb_p
#define outb isa_outb #define outb isa_outb
...@@ -282,55 +276,9 @@ static inline void isa_delay(void) ...@@ -282,55 +276,9 @@ static inline void isa_delay(void)
#define readw isa_readw #define readw isa_readw
#define writeb isa_writeb #define writeb isa_writeb
#define writew isa_writew #define writew isa_writew
#endif /* CONFIG_ISA */
#if defined(CONFIG_PCI)
#define readl(addr) in_le32(addr)
#define writel(val,addr) out_le32((addr),(val))
/* those can be defined for both ISA and PCI - it won't work though */
#define readb(addr) in_8(addr)
#define readw(addr) in_le16(addr)
#define writeb(val,addr) out_8((addr),(val))
#define writew(val,addr) out_le16((addr),(val))
#define readb_relaxed(addr) readb(addr) #else /* CONFIG_ISA */
#define readw_relaxed(addr) readw(addr)
#define readl_relaxed(addr) readl(addr)
#ifndef CONFIG_ISA
#define inb(port) in_8(port)
#define outb(val,port) out_8((port),(val))
#define inw(port) in_le16(port)
#define outw(val,port) out_le16((port),(val))
#define inl(port) in_le32(port)
#define outl(val,port) out_le32((port),(val))
#else
/*
* kernel with both ISA and PCI compiled in, those have
* conflicting defs for in/out. Simply consider port < 1024
* ISA and everything else PCI. read,write not defined
* in this case
*/
#define inb(port) ((port)<1024 ? isa_inb(port) : in_8(port))
#define inb_p(port) ((port)<1024 ? isa_inb_p(port) : in_8(port))
#define inw(port) ((port)<1024 ? isa_inw(port) : in_le16(port))
#define inw_p(port) ((port)<1024 ? isa_inw_p(port) : in_le16(port))
#define inl(port) ((port)<1024 ? isa_inl(port) : in_le32(port))
#define inl_p(port) ((port)<1024 ? isa_inl_p(port) : in_le32(port))
#define outb(val,port) ((port)<1024 ? isa_outb((val),(port)) : out_8((port),(val)))
#define outb_p(val,port) ((port)<1024 ? isa_outb_p((val),(port)) : out_8((port),(val)))
#define outw(val,port) ((port)<1024 ? isa_outw((val),(port)) : out_le16((port),(val)))
#define outw_p(val,port) ((port)<1024 ? isa_outw_p((val),(port)) : out_le16((port),(val)))
#define outl(val,port) ((port)<1024 ? isa_outl((val),(port)) : out_le32((port),(val)))
#define outl_p(val,port) ((port)<1024 ? isa_outl_p((val),(port)) : out_le32((port),(val)))
#endif
#endif /* CONFIG_PCI */
#if !defined(CONFIG_ISA) && !defined(CONFIG_PCI)
/* /*
* We need to define dummy functions for GENERIC_IOMAP support. * We need to define dummy functions for GENERIC_IOMAP support.
*/ */
...@@ -357,11 +305,11 @@ static inline void isa_delay(void) ...@@ -357,11 +305,11 @@ static inline void isa_delay(void)
#define writeb(val,addr) out_8((addr),(val)) #define writeb(val,addr) out_8((addr),(val))
#define readw(addr) in_le16(addr) #define readw(addr) in_le16(addr)
#define writew(val,addr) out_le16((addr),(val)) #define writew(val,addr) out_le16((addr),(val))
#endif
#if !defined(CONFIG_PCI) #endif /* CONFIG_ISA */
#define readl(addr) in_le32(addr) #define readl(addr) in_le32(addr)
#define writel(val,addr) out_le32((addr),(val)) #define writel(val,addr) out_le32((addr),(val))
#endif
#define mmiowb() #define mmiowb()
......
#ifndef _ASM_M68K_PCI_H #ifndef _ASM_M68K_PCI_H
#define _ASM_M68K_PCI_H #define _ASM_M68K_PCI_H
/*
* asm-m68k/pci_m68k.h - m68k specific PCI declarations.
*
* Written by Wout Klaren.
*/
#include <asm/scatterlist.h>
#include <asm-generic/pci-dma-compat.h> #include <asm-generic/pci-dma-compat.h>
struct pci_ops;
/*
* Structure with hardware dependent information and functions of the
* PCI bus.
*/
struct pci_bus_info
{
/*
* Resources of the PCI bus.
*/
struct resource mem_space;
struct resource io_space;
/*
* System dependent functions.
*/
struct pci_ops *m68k_pci_ops;
void (*fixup)(int pci_modify);
void (*conf_device)(struct pci_dev *dev);
};
#define pcibios_assign_all_busses() 0
#define pcibios_scan_all_fns(a, b) 0
static inline void pcibios_set_master(struct pci_dev *dev)
{
/* No special bus mastering setup handling */
}
static inline void pcibios_penalize_isa_irq(int irq, int active)
{
/* We don't do dynamic PCI IRQ allocation */
}
/* The PCI address space does equal the physical memory /* The PCI address space does equal the physical memory
* address space. The networking and block device layers use * address space. The networking and block device layers use
* this boolean for bounce buffer decisions. * this boolean for bounce buffer decisions.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment