Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7b2d344 authored by Bryan Wu's avatar Bryan Wu
Browse files

Blackfin arch: modify the insX/outsX and dma_insX/dma_outsX to be compatible with other archs 



Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent c11b5776

arch/blackfin/kernel/bfin_dma_5xx.c

+6 −6
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ void *safe_dma_memcpy(void *dest, const void *src, size_t size) 
}

EXPORT_SYMBOL(safe_dma_memcpy);



void dma_outsb(const void __iomem *addr, const void *buf, unsigned short len)

void dma_outsb(unsigned long addr, const void *buf, unsigned short len)

{

	unsigned long flags;
@@ -616,7 +616,7 @@ void dma_outsb(const void __iomem *addr, const void *buf, unsigned short len) 
EXPORT_SYMBOL(dma_outsb);





void dma_insb(const void __iomem *addr, void *buf, unsigned short len)

void dma_insb(unsigned long addr, void *buf, unsigned short len)

{

	unsigned long flags;
@@ -647,7 +647,7 @@ void dma_insb(const void __iomem *addr, void *buf, unsigned short len) 
}

EXPORT_SYMBOL(dma_insb);



void dma_outsw(const void __iomem *addr, const void  *buf, unsigned short len)

void dma_outsw(unsigned long addr, const void  *buf, unsigned short len)

{

	unsigned long flags;
@@ -679,7 +679,7 @@ void dma_outsw(const void __iomem *addr, const void *buf, unsigned short len) 
}

EXPORT_SYMBOL(dma_outsw);



void dma_insw(const void __iomem *addr, void *buf, unsigned short len)

void dma_insw(unsigned long addr, void *buf, unsigned short len)

{

	unsigned long flags;
@@ -711,7 +711,7 @@ void dma_insw(const void __iomem *addr, void *buf, unsigned short len) 
}

EXPORT_SYMBOL(dma_insw);



void dma_outsl(const void __iomem *addr, const void *buf, unsigned short len)

void dma_outsl(unsigned long addr, const void *buf, unsigned short len)

{

	unsigned long flags;
@@ -743,7 +743,7 @@ void dma_outsl(const void __iomem *addr, const void *buf, unsigned short len) 
}

EXPORT_SYMBOL(dma_outsl);



void dma_insl(const void __iomem *addr, void *buf, unsigned short len)

void dma_insl(unsigned long addr, void *buf, unsigned short len)

{

	unsigned long flags;

include/asm-blackfin/io.h

+12 −12
Original line number Diff line number Diff line
@@ -115,21 +115,21 @@ static inline unsigned int readl(const volatile void __iomem *addr) 


#ifndef __ASSEMBLY__



extern void outsb(const void __iomem *port, const void *addr, unsigned short count);

extern void outsw(const void __iomem *port, const void *addr, unsigned short count);

extern void outsl(const void __iomem *port, const void *addr, unsigned short count);

extern void outsb(unsigned long port, const void *addr, unsigned long count);

extern void outsw(unsigned long port, const void *addr, unsigned long count);

extern void outsl(unsigned long port, const void *addr, unsigned long count);



extern void insb(const void __iomem *port, void *addr, unsigned short count);

extern void insw(const void __iomem *port, void *addr, unsigned short count);

extern void insl(const void __iomem *port, void *addr, unsigned short count);

extern void insb(unsigned long port, void *addr, unsigned long count);

extern void insw(unsigned long port, void *addr, unsigned long count);

extern void insl(unsigned long port, void *addr, unsigned long count);



extern void dma_outsb(const void __iomem *port, const void *addr, unsigned short count);

extern void dma_outsw(const void __iomem *port, const void *addr, unsigned short count);

extern void dma_outsl(const void __iomem *port, const void *addr, unsigned short count);

extern void dma_outsb(unsigned long port, const void *addr, unsigned short count);

extern void dma_outsw(unsigned long port, const void *addr, unsigned short count);

extern void dma_outsl(unsigned long port, const void *addr, unsigned short count);



extern void dma_insb(const void __iomem *port, void *addr, unsigned short count);

extern void dma_insw(const void __iomem *port, void *addr, unsigned short count);

extern void dma_insl(const void __iomem *port, void *addr, unsigned short count);

extern void dma_insb(unsigned long port, void *addr, unsigned short count);

extern void dma_insw(unsigned long port, void *addr, unsigned short count);

extern void dma_insl(unsigned long port, void *addr, unsigned short count);



/*

 * Map some physical address range into the kernel address space.