From fedc33e36406c4e50592a286169583d0d3d25a2e Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 21 Mar 2018 23:36:11 +1000 Subject: m68k: move *_relaxed macros into io_no.h and io_mm.h Move a copy of the definitions of the *_relaxed() macros into io_no.h and io_mm.h. This precedes a change to the io_no.h file to use asm-generic/io.h. They will be removed from io_no.h at that point. Signed-off-by: Greg Ungerer Reviewed-by: Geert Uytterhoeven Reviewed-by: Angelo Dureghello Tested-by: Angelo Dureghello --- arch/m68k/include/asm/io.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'arch/m68k/include/asm/io.h') diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 756089cc019c..00b45155969c 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -4,11 +4,3 @@ #else #include #endif - -#define readb_relaxed(addr) readb(addr) -#define readw_relaxed(addr) readw(addr) -#define readl_relaxed(addr) readl(addr) - -#define writeb_relaxed(b, addr) writeb(b, addr) -#define writew_relaxed(b, addr) writew(b, addr) -#define writel_relaxed(b, addr) writel(b, addr) -- cgit From dfbc5cb39928c872c299f4718674e3f1215b07ae Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Sun, 25 Mar 2018 22:37:11 +1000 Subject: m68k: use io_no.h for MMU and non-MMU enabled ColdFire Use the io_no.h IO access support for all ColdFire systems, no matter whether configured with MMU enabled or disabled. Previously there was subtle differences in IO access functions used in both cases, and these resulted in broken behavior for some drivers. As observed and reported by Angelo when using MMU enabled systems the read/write family of functions was using little endian access, while the non-MMU enabled systems were using native endian. This results in drivers that are shared across Freescale processors (for some of the common internal SoC peripherals) not working - since they are wired up for native endian access. This problem brings to light issues with PCI bus access and local peripheral access - but these are not addressed with this fix. Reported-by: Angelo Dureghello Signed-off-by: Greg Ungerer Reviewed-by: Angelo Dureghello Tested-by: Angelo Dureghello --- arch/m68k/include/asm/io.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m68k/include/asm/io.h') diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 00b45155969c..ca2849afb087 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifdef __uClinux__ +#if defined(__uClinux__) || defined(CONFIG_COLDFIRE) #include #else #include -- cgit