diff options
Diffstat (limited to 'include/asm-sh/io.h')
| -rw-r--r-- | include/asm-sh/io.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h index 2c3afe71323da3..256fbc0ba9700a 100644 --- a/include/asm-sh/io.h +++ b/include/asm-sh/io.h @@ -138,17 +138,17 @@ #define readl_relaxed(a) readl(a) /* Simple MMIO */ -#define ioread8(a) readb(a) -#define ioread16(a) readw(a) -#define ioread16be(a) be16_to_cpu(__raw_readw((a))) -#define ioread32(a) readl(a) -#define ioread32be(a) be32_to_cpu(__raw_readl((a))) - -#define iowrite8(v,a) writeb((v),(a)) -#define iowrite16(v,a) writew((v),(a)) -#define iowrite16be(v,a) __raw_writew(cpu_to_be16((v)),(a)) -#define iowrite32(v,a) writel((v),(a)) -#define iowrite32be(v,a) __raw_writel(cpu_to_be32((v)),(a)) +#define ioread8(a) inb(a) +#define ioread16(a) inw(a) +#define ioread16be(a) be16_to_cpu(inw((a))) +#define ioread32(a) inl(a) +#define ioread32be(a) be32_to_cpu(inl((a))) + +#define iowrite8(v,a) outb((v),(a)) +#define iowrite16(v,a) outw((v),(a)) +#define iowrite16be(v,a) outw(cpu_to_be16((v)),(a)) +#define iowrite32(v,a) outl((v),(a)) +#define iowrite32be(v,a) outl(cpu_to_be32((v)),(a)) #define ioread8_rep(a,d,c) insb((a),(d),(c)) #define ioread16_rep(a,d,c) insw((a),(d),(c)) @@ -210,6 +210,11 @@ static inline void ctrl_outl(unsigned int b, unsigned long addr) *(volatile unsigned long*)addr = b; } +static inline void ctrl_delay(void) +{ + ctrl_inw(P2SEG); +} + #define IO_SPACE_LIMIT 0xffffffff /* |