Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k/nommu: stop using GENERIC_IOMAP
There is no need to go through the GENERIC_IOMAP wrapper for PIO on
nommu platforms, since these always come from PCI I/O space that is
itself memory mapped.
Instead, the generic ioport_map() can just return the MMIO location
of the ports directly by applying the PCI_IO_PA offset, while
ioread32/iowrite32 trivially turn into readl/writel as they do
on most other architectures.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+1
-5
+1
-1
arch/m68k/Kconfig
+1
-1
arch/m68k/Kconfig
···
18
18
select DMA_DIRECT_REMAP if M68K_NONCOHERENT_DMA && !COLDFIRE
19
19
select GENERIC_ATOMIC64
20
20
select GENERIC_CPU_DEVICES
21
-
select GENERIC_IOMAP if HAS_IOPORT
21
+
select GENERIC_IOMAP if HAS_IOPORT && MMU
22
22
select GENERIC_IRQ_SHOW
23
23
select GENERIC_LIB_ASHLDI3
24
24
select GENERIC_LIB_ASHRDI3
-4
arch/m68k/include/asm/io_no.h
-4
arch/m68k/include/asm/io_no.h
···
123
123
#define PCI_IO_SIZE 0x00010000 /* 64k */
124
124
#define PCI_IO_MASK (PCI_IO_SIZE - 1)
125
125
126
-
#define HAVE_ARCH_PIO_SIZE
127
-
#define PIO_OFFSET 0
128
-
#define PIO_MASK 0xffff
129
-
#define PIO_RESERVED 0x10000
130
126
#define PCI_IOBASE ((void __iomem *) PCI_IO_PA)
131
127
#define PCI_SPACE_LIMIT PCI_IO_MASK
132
128
#endif /* CONFIG_PCI */