diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-h8300/io.h | 76 |
1 files changed, 51 insertions, 25 deletions
diff --git a/include/asm-h8300/io.h b/include/asm-h8300/io.h index 50e4b6803609..2962f9030413 100644 --- a/include/asm-h8300/io.h +++ b/include/asm-h8300/io.h @@ -6,6 +6,15 @@ #include <linux/config.h> #include <asm/virtconvert.h> +#if defined(CONFIG_H83007) || defined(CONFIG_H83068) +#include <asm/regs306x.h> +#elif defined(CONFIG_H8S2678) +#include <asm/regs2678.h> +#else +#error UNKNOWN CPU TYPE +#endif + + /* * These are for ISA/PCI shared memory _only_ and should never be used * on any other type of memory, including Zorro memory. They are meant to @@ -30,6 +39,7 @@ * 020325 Added some #define's for the COBRA5272 board * (hede) */ + static inline unsigned short _swapw(volatile unsigned short v) { return ((v << 8) | (v >> 8)); @@ -41,20 +51,19 @@ static inline unsigned int _swapl(volatile unsigned long v) } #define readb(addr) \ - ({ unsigned char __v = (*(volatile unsigned char *) (addr & 0x00ffffff)); __v; }) + ({ unsigned char __v = (*(volatile unsigned char *) ((addr) & 0x00ffffff)); __v; }) #define readw(addr) \ - ({ unsigned short __v = (*(volatile unsigned short *) (addr & 0x00ffffff)); __v; }) + ({ unsigned short __v = (*(volatile unsigned short *) ((addr) & 0x00ffffff)); __v; }) #define readl(addr) \ - ({ unsigned int __v = (*(volatile unsigned int *) (addr & 0x00ffffff)); __v; }) + ({ unsigned int __v = (*(volatile unsigned int *) ((addr) & 0x00ffffff)); __v; }) +#define writeb(b,addr) (void)((*(volatile unsigned char *) ((addr) & 0x00ffffff)) = (b)) +#define writew(b,addr) (void)((*(volatile unsigned short *) ((addr) & 0x00ffffff)) = (b)) +#define writel(b,addr) (void)((*(volatile unsigned int *) ((addr) & 0x00ffffff)) = (b)) #define readb_relaxed(addr) readb(addr) #define readw_relaxed(addr) readw(addr) #define readl_relaxed(addr) readl(addr) -#define writeb(b,addr) (void)((*(volatile unsigned char *) (addr & 0x00ffffff)) = (b)) -#define writew(b,addr) (void)((*(volatile unsigned short *) (addr & 0x00ffffff)) = (b)) -#define writel(b,addr) (void)((*(volatile unsigned int *) (addr & 0x00ffffff)) = (b)) - #define __raw_readb readb #define __raw_readw readw #define __raw_readl readl @@ -62,12 +71,24 @@ static inline unsigned int _swapl(volatile unsigned long v) #define __raw_writew writew #define __raw_writel writel +static inline int h8300_buswidth(unsigned int addr) +{ + return (*(volatile unsigned char *)ABWCR & (1 << (addr >> 21) & 7)) == 0; +} + static inline void io_outsb(unsigned int addr, void *buf, int len) { - volatile unsigned char *ap = (volatile unsigned char *) addr; + volatile unsigned char *ap_b = (volatile unsigned char *) addr; + volatile unsigned short *ap_w = (volatile unsigned short *) addr; unsigned char *bp = (unsigned char *) buf; - while (len--) - *ap = *bp++; + + if(h8300_buswidth(addr) && (addr & 1)) { + while (len--) + *ap_w = *bp++; + } else { + while (len--) + *ap_b = *bp++; + } } static inline void io_outsw(unsigned int addr, void *buf, int len) @@ -75,7 +96,7 @@ static inline void io_outsw(unsigned int addr, void *buf, int len) volatile unsigned short *ap = (volatile unsigned short *) addr; unsigned short *bp = (unsigned short *) buf; while (len--) - *ap = _swapw(*bp++); + *ap = *bp++; } static inline void io_outsl(unsigned int addr, void *buf, int len) @@ -83,13 +104,18 @@ static inline void io_outsl(unsigned int addr, void *buf, int len) volatile unsigned int *ap = (volatile unsigned int *) addr; unsigned int *bp = (unsigned int *) buf; while (len--) - *ap = _swapl(*bp++); + *ap = *bp++; } static inline void io_insb(unsigned int addr, void *buf, int len) { - volatile unsigned char *ap = (volatile unsigned char *) addr; + volatile unsigned char *ap; unsigned char *bp = (unsigned char *) buf; + + if(h8300_buswidth(addr)) + ap = (volatile unsigned char *)(addr ^ 1); + else + ap = (volatile unsigned char *)addr; while (len--) *bp++ = *ap; } @@ -99,7 +125,7 @@ static inline void io_insw(unsigned int addr, void *buf, int len) volatile unsigned short *ap = (volatile unsigned short *) addr; unsigned short *bp = (unsigned short *) buf; while (len--) - *bp++ = _swapw(*ap); + *bp++ = *ap; } static inline void io_insl(unsigned int addr, void *buf, int len) @@ -107,7 +133,7 @@ static inline void io_insl(unsigned int addr, void *buf, int len) volatile unsigned int *ap = (volatile unsigned int *) addr; unsigned int *bp = (unsigned int *) buf; while (len--) - *bp++ = _swapl(*ap); + *bp++ = *ap; } /* @@ -119,12 +145,12 @@ static inline void io_insl(unsigned int addr, void *buf, int len) #define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) -#define inb(addr) readb(addr) -#define inw(addr) readw(addr) -#define inl(addr) readl(addr) -#define outb(x,addr) ((void) writeb(x,addr)) -#define outw(x,addr) ((void) writew(x,addr)) -#define outl(x,addr) ((void) writel(x,addr)) +#define inb(addr) ((h8300_buswidth(addr))?readb(addr ^ 1) & 0xff:readb(addr)) +#define inw(addr) _swapw(readw(addr)) +#define inl(addr) _swapl(readl(addr)) +#define outb(x,addr) ((void)((h8300_buswidth(addr) && (addr & 1))?writew(x,addr):writeb(x,addr))) +#define outw(x,addr) ((void) writew(_swapw(x),addr)) +#define outl(x,addr) ((void) writel(_swapl(x),addr)) #define inb_p(addr) inb(addr) #define inw_p(addr) inw(addr) @@ -153,19 +179,19 @@ static inline void io_insl(unsigned int addr, void *buf, int len) extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag); extern void __iounmap(void *addr, unsigned long size); -extern inline void *ioremap(unsigned long physaddr, unsigned long size) +static inline void *ioremap(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -extern inline void *ioremap_nocache(unsigned long physaddr, unsigned long size) +static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -extern inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size) +static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); } -extern inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size) +static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_FULL_CACHING); } |