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

Commit 3807ef3f authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Ralf Baechle
Browse files

MIPS: Pass struct device to plat_dma_addr_to_phys() 



Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d3f634b9

arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, 
	return octeon_map_dma_mem(dev, page_address(page), PAGE_SIZE);

}



static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)

static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	return dma_addr;

}

arch/mips/include/asm/mach-generic/dma-coherence.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, 
	return page_to_phys(page);

}



static inline unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)

static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	return dma_addr;

}

arch/mips/include/asm/mach-ip27/dma-coherence.h

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) 
	return pa;

}



static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)

static unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	return dma_addr & ~(0xffUL << 56);

}

arch/mips/include/asm/mach-ip32/dma-coherence.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) 
}



/* This is almost certainly wrong but it's what dma-ip32.c used to use  */

static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)

static unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	unsigned long addr = dma_addr & RAM_OFFSET_MASK;

arch/mips/include/asm/mach-jazz/dma-coherence.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) 
	return vdma_alloc(page_to_phys(page), PAGE_SIZE);

}



static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)

static unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

	return vdma_log2phys(dma_addr);

}