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

Commit f79b8592 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: user generic iomap to support ioread*/iowrite* 



There is no reason we cannot use the generic iomap support to give us
the ioread* and iowrite* family of IO access functions. The m68k arch with
MMU enabled does, so this makes us consistent for all m68k now.

Some potentially valid drivers will fail to compile without these,
for example:

drivers/i2c/busses/i2c-ocores.c:81:2: error: implicit declaration of
function ‘iowrite8’ [-Werror=implicit-function-declaration]
drivers/i2c/busses/i2c-ocores.c:86:2: error: implicit declaration of
function ‘iowrite16’ [-Werror=implicit-function-declaration]
drivers/i2c/busses/i2c-ocores.c:91:2: error: implicit declaration of
function ‘iowrite32’ [-Werror=implicit-function-declaration]
drivers/i2c/busses/i2c-ocores.c:96:2: error: implicit declaration of
function ‘ioread8’ [-Werror=implicit-function-declaration]
drivers/i2c/busses/i2c-ocores.c:101:2: error: implicit declaration of
function ‘ioread16’ [-Werror=implicit-function-declaration]
drivers/i2c/busses/i2c-ocores.c:106:2: error: implicit declaration of
function ‘ioread32’ [-Werror=implicit-function-declaration]

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 42cb38bc

arch/m68k/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config M68K 
	select VIRT_TO_BUS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_STRNCPY_FROM_USER if MMU

	select GENERIC_STRNLEN_USER if MMU

	select FPU if MMU
@@ -72,7 +73,6 @@ source "kernel/Kconfig.freezer" 
config MMU

	bool "MMU-based Paged Memory Management Support"

	default y

	select GENERIC_IOMAP

	help

	  Select if you want MMU-based virtualised addressing space

	  support by paged memory management. If unsure, say 'Y'.

arch/m68k/include/asm/io_no.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#ifdef __KERNEL__



#include <asm/virtconvert.h>

#include <asm-generic/iomap.h>



/*

 * These are for ISA/PCI shared memory _only_ and should never be used