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

Commit e6be3a25 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: pass through ioremap() for non-mmu processors. 



All 32-bit SuperH processors currently go through __ioremap_mode()
and check for IO_TRAPPED and directly mapped segments. With this
patch we simplify the MMU less case with a pass through version of
 __ioremap_mode() which just returns the physical address.

The effects of this is change are:
 - fix non-MMU ioremap() of high address hardware blocks (sh7203 CMT)
 - make sure IO_TRAPPED is not selected

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 42786006

arch/sh/boards/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ config SH_RTS7751R2D 
	bool "RTS7751R2D"

	depends on CPU_SUBTYPE_SH7751R

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED

	select IO_TRAPPED if MMU

	help

	  Select RTS7751R2D if configuring for a Renesas Technology

	  Sales SH-Graphics board.
@@ -145,13 +145,13 @@ config SH_HIGHLANDER 
	bool "Highlander"

	depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED

	select IO_TRAPPED if MMU



config SH_SH7785LCR

	bool "SH7785LCR"

	depends on CPU_SUBTYPE_SH7785

	select SYS_SUPPORTS_PCI

	select IO_TRAPPED

	select IO_TRAPPED if MMU



config SH_SH7785LCR_29BIT_PHYSMAPS

	bool "SH7785LCR 29bit physmaps"

arch/sh/include/asm/io.h

+6 −6
Original line number Diff line number Diff line
@@ -228,12 +228,6 @@ void __iounmap(void __iomem *addr); 
unsigned long onchip_remap(unsigned long addr, unsigned long size,

			   const char *name);

extern void onchip_unmap(unsigned long vaddr);

#else

#define __ioremap(offset, size, flags)	((void __iomem *)(offset))

#define __iounmap(addr)			do { } while (0)

#define onchip_remap(addr, size, name)	(addr)

#define onchip_unmap(addr)		do { } while (0)

#endif /* CONFIG_MMU */



static inline void __iomem *

__ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
@@ -268,6 +262,12 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags) 


	return __ioremap(offset, size, flags);

}

#else

#define onchip_remap(addr, size, name)		(addr)

#define onchip_unmap(addr)			do { } while (0)

#define __ioremap_mode(offset, size, flags)	((void __iomem *)(offset))

#define __iounmap(addr)				do { } while (0)

#endif /* CONFIG_MMU */



#define ioremap(offset, size)				\

	__ioremap_mode((offset), (size), 0)