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

Commit 0485e18b authored by Russell King's avatar Russell King
Browse files

Revert "[ARM] pxa: remove now unnecessary dma_needs_bounce()" 



This reverts commit 4fa5518c, which causes a compilation regression for
IXP4xx platforms.

Reported-by: default avatarRichard Cochran <richardcochran@gmail.com>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 65b4711f

arch/arm/common/it8152.c

+8 −0
Original line number Diff line number Diff line
@@ -263,6 +263,14 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
	return 0;

}



int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}



int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)

{

	it8152_io.start = IT8152_IO_BASE + 0x12000;

arch/arm/include/asm/dma-mapping.h

+0 −8
Original line number Diff line number Diff line
@@ -288,15 +288,7 @@ extern void dmabounce_unregister_dev(struct device *); 
 * DMA access and 1 if the buffer needs to be bounced.

 *

 */

#ifdef CONFIG_SA1111

extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);

#else

static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr,

				   size_t size)

{

	return 0;

}

#endif



/*

 * The DMA API, implemented by dmabounce.c.  See below for descriptions.