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

Commit 76fdb7d6 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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



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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent bf5fe9ed

arch/m68k/include/asm/pci.h

+12 −5
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "pci_no.h"

#else

#include "pci_mm.h"

#endif
 
#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 */

arch/m68k/include/asm/pci_mm.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#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 */

arch/m68k/include/asm/pci_no.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
#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 */