aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Wu <bryan.wu@analog.com>2007-10-09 03:09:49 -0400
committerBryan Wu <bryan.wu@analog.com>2007-10-09 03:09:49 -0400
commitb7b2d344e7f7027497547a8b786a407047ee5e26 (patch)
tree27be534c3879b49a25dd94775189fa6c59f1cad5
parentc11b5776bfef671cd6eea4479f345ec042638643 (diff)
Blackfin arch: modify the insX/outsX and dma_insX/dma_outsX to be compatible with other archs
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
-rw-r--r--arch/blackfin/kernel/bfin_dma_5xx.c12
-rw-r--r--include/asm-blackfin/io.h24
2 files changed, 18 insertions, 18 deletions
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 858cca6a2afc..17edd6599959 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -583,7 +583,7 @@ void *safe_dma_memcpy(void *dest, const void *src, size_t size)
583} 583}
584EXPORT_SYMBOL(safe_dma_memcpy); 584EXPORT_SYMBOL(safe_dma_memcpy);
585 585
586void dma_outsb(const void __iomem *addr, const void *buf, unsigned short len) 586void dma_outsb(unsigned long addr, const void *buf, unsigned short len)
587{ 587{
588 unsigned long flags; 588 unsigned long flags;
589 589
@@ -616,7 +616,7 @@ void dma_outsb(const void __iomem *addr, const void *buf, unsigned short len)
616EXPORT_SYMBOL(dma_outsb); 616EXPORT_SYMBOL(dma_outsb);
617 617
618 618
619void dma_insb(const void __iomem *addr, void *buf, unsigned short len) 619void dma_insb(unsigned long addr, void *buf, unsigned short len)
620{ 620{
621 unsigned long flags; 621 unsigned long flags;
622 622
@@ -647,7 +647,7 @@ void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
647} 647}
648EXPORT_SYMBOL(dma_insb); 648EXPORT_SYMBOL(dma_insb);
649 649
650void dma_outsw(const void __iomem *addr, const void *buf, unsigned short len) 650void dma_outsw(unsigned long addr, const void *buf, unsigned short len)
651{ 651{
652 unsigned long flags; 652 unsigned long flags;
653 653
@@ -679,7 +679,7 @@ void dma_outsw(const void __iomem *addr, const void *buf, unsigned short len)
679} 679}
680EXPORT_SYMBOL(dma_outsw); 680EXPORT_SYMBOL(dma_outsw);
681 681
682void dma_insw(const void __iomem *addr, void *buf, unsigned short len) 682void dma_insw(unsigned long addr, void *buf, unsigned short len)
683{ 683{
684 unsigned long flags; 684 unsigned long flags;
685 685
@@ -711,7 +711,7 @@ void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
711} 711}
712EXPORT_SYMBOL(dma_insw); 712EXPORT_SYMBOL(dma_insw);
713 713
714void dma_outsl(const void __iomem *addr, const void *buf, unsigned short len) 714void dma_outsl(unsigned long addr, const void *buf, unsigned short len)
715{ 715{
716 unsigned long flags; 716 unsigned long flags;
717 717
@@ -743,7 +743,7 @@ void dma_outsl(const void __iomem *addr, const void *buf, unsigned short len)
743} 743}
744EXPORT_SYMBOL(dma_outsl); 744EXPORT_SYMBOL(dma_outsl);
745 745
746void dma_insl(const void __iomem *addr, void *buf, unsigned short len) 746void dma_insl(unsigned long addr, void *buf, unsigned short len)
747{ 747{
748 unsigned long flags; 748 unsigned long flags;
749 749
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h
index 3f48f8feb5c9..525179bf43d7 100644
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
@@ -115,21 +115,21 @@ static inline unsigned int readl(const volatile void __iomem *addr)
115 115
116#ifndef __ASSEMBLY__ 116#ifndef __ASSEMBLY__
117 117
118extern void outsb(const void __iomem *port, const void *addr, unsigned short count); 118extern void outsb(unsigned long port, const void *addr, unsigned long count);
119extern void outsw(const void __iomem *port, const void *addr, unsigned short count); 119extern void outsw(unsigned long port, const void *addr, unsigned long count);
120extern void outsl(const void __iomem *port, const void *addr, unsigned short count); 120extern void outsl(unsigned long port, const void *addr, unsigned long count);
121 121
122extern void insb(const void __iomem *port, void *addr, unsigned short count); 122extern void insb(unsigned long port, void *addr, unsigned long count);
123extern void insw(const void __iomem *port, void *addr, unsigned short count); 123extern void insw(unsigned long port, void *addr, unsigned long count);
124extern void insl(const void __iomem *port, void *addr, unsigned short count); 124extern void insl(unsigned long port, void *addr, unsigned long count);
125 125
126extern void dma_outsb(const void __iomem *port, const void *addr, unsigned short count); 126extern void dma_outsb(unsigned long port, const void *addr, unsigned short count);
127extern void dma_outsw(const void __iomem *port, const void *addr, unsigned short count); 127extern void dma_outsw(unsigned long port, const void *addr, unsigned short count);
128extern void dma_outsl(const void __iomem *port, const void *addr, unsigned short count); 128extern void dma_outsl(unsigned long port, const void *addr, unsigned short count);
129 129
130extern void dma_insb(const void __iomem *port, void *addr, unsigned short count); 130extern void dma_insb(unsigned long port, void *addr, unsigned short count);
131extern void dma_insw(const void __iomem *port, void *addr, unsigned short count); 131extern void dma_insw(unsigned long port, void *addr, unsigned short count);
132extern void dma_insl(const void __iomem *port, void *addr, unsigned short count); 132extern void dma_insl(unsigned long port, void *addr, unsigned short count);
133 133
134/* 134/*
135 * Map some physical address range into the kernel address space. 135 * Map some physical address range into the kernel address space.