renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

m68k: use the mmu pci.h for m68knommu as well

Browse Source 
The (m68knommu) COMEMPCI support has been removed from the kernel,
so now the mmu pci.h can be used on non-mmu setups as well.
Remove the non-mmu pci_no.h and revert the pci_mm.h to be pci.h.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Greg Ungerer 2009-01-29 15:33:15 +10:00
parent bf5fe9ed73
commit 76fdb7d6bd
3 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/m68k/include/asm/pci.h
View File

@ -1,5 +1,12 @@
#ifdef __uClinux__ #ifndef _ASM_M68K_PCI_H
#include "pci_no.h" #define _ASM_M68K_PCI_H
#else
#include "pci_mm.h" #include <asm-generic/pci-dma-compat.h>
#endif
/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
*/
#define PCI_DMA_BUS_IS_PHYS (1)
#endif /* _ASM_M68K_PCI_H */

12
arch/m68k/include/asm/pci_mm.h
View File

@ -1,12 +0,0 @@
#ifndef _ASM_M68K_PCI_H
#define _ASM_M68K_PCI_H
#include <asm-generic/pci-dma-compat.h>
/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
*/
#define PCI_DMA_BUS_IS_PHYS (1)
#endif /* _ASM_M68K_PCI_H */

29
arch/m68k/include/asm/pci_no.h
View File

@ -1,29 +0,0 @@
#ifndef M68KNOMMU_PCI_H
#define M68KNOMMU_PCI_H
#include <asm/pci_mm.h>
#ifdef CONFIG_COMEMPCI
/*
* These are pretty much arbitary with the CoMEM implementation.
* We have the whole address space to ourselves.
*/
#define PCIBIOS_MIN_IO 0x100
#define PCIBIOS_MIN_MEM 0x00010000
#define pcibios_scan_all_fns(a, b) 0
/*
* Return whether the given PCI device DMA address mask can
* be supported properly. For example, if your device can
* only drive the low 24-bits during PCI bus mastering, then
* you would pass 0x00ffffff as the mask to this function.
*/
static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
{
return 1;
}
#endif /* CONFIG_COMEMPCI */
#endif /* M68KNOMMU_PCI_H */