diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 08:36:26 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-12 08:36:26 +0100 |
| commit | e9c58fc57b17bfa75c256fb4f45ce22de6626858 (patch) | |
| tree | 0617f394e34af76156a8b1c10435b6cb5753c8fe /arch/sh/include/asm/io.h | |
| parent | sh: Fix up the CONFIG_PERF_EVENTS=n build for SH-4. (diff) | |
| download | linux-e9c58fc57b17bfa75c256fb4f45ce22de6626858.tar.xz linux-e9c58fc57b17bfa75c256fb4f45ce22de6626858.zip | |
sh: Use the generic I/O port base for slowdown.
This fixes up the build and behaviour for various configurations. Namely
the CONFIG_32BIT cases where legacy mappings do not exist, as well as the
sh64 build.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/io.h')
| -rw-r--r-- | arch/sh/include/asm/io.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h index 0cf2a5708e26..512cd3e9d0ca 100644 --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -90,15 +90,11 @@ #define ctrl_outl __raw_writel #define ctrl_outq __raw_writeq +extern unsigned long generic_io_base; + static inline void ctrl_delay(void) { -#ifdef CONFIG_CPU_SH4 - __raw_readw(CCN_PVR); -#elif defined(P2SEG) - __raw_readw(P2SEG); -#else -#error "Need a dummy address for delay" -#endif + __raw_readw(generic_io_base); } #define __BUILD_MEMORY_STRING(bwlq, type) \ @@ -186,8 +182,6 @@ __BUILD_MEMORY_STRING(q, u64) #define IO_SPACE_LIMIT 0xffffffff -extern unsigned long generic_io_base; - /* * This function provides a method for the generic case where a * board-specific ioport_map simply needs to return the port + some |