diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 16:38:41 (GMT) |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 16:38:41 (GMT) |
commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/m68k/include/asm/zorro.h | |
parent | f0e0059b9c18426cffdcc04161062251a8f9741e (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
download | linux-fsl-qoriq-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/m68k/include/asm/zorro.h')
-rw-r--r-- | arch/m68k/include/asm/zorro.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/zorro.h b/arch/m68k/include/asm/zorro.h new file mode 100644 index 0000000..5ce97c2 --- /dev/null +++ b/arch/m68k/include/asm/zorro.h @@ -0,0 +1,45 @@ +#ifndef _ASM_M68K_ZORRO_H +#define _ASM_M68K_ZORRO_H + +#include <asm/raw_io.h> + +#define z_readb raw_inb +#define z_readw raw_inw +#define z_readl raw_inl + +#define z_writeb raw_outb +#define z_writew raw_outw +#define z_writel raw_outl + +#define z_memset_io(a,b,c) memset((void *)(a),(b),(c)) +#define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) +#define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) + +static inline void __iomem *z_remap_nocache_ser(unsigned long physaddr, + unsigned long size) +{ + return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); +} + +static inline void __iomem *z_remap_nocache_nonser(unsigned long physaddr, + unsigned long size) +{ + return __ioremap(physaddr, size, IOMAP_NOCACHE_NONSER); +} + +static inline void __iomem *z_remap_writethrough(unsigned long physaddr, + unsigned long size) +{ + return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); +} +static inline void __iomem *z_remap_fullcache(unsigned long physaddr, + unsigned long size) +{ + return __ioremap(physaddr, size, IOMAP_FULL_CACHING); +} + +#define z_unmap iounmap +#define z_iounmap iounmap +#define z_ioremap z_remap_nocache_ser + +#endif /* _ASM_M68K_ZORRO_H */ |