summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-09-05 12:19:50 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-08 12:28:39 +0100
commit0485e18bc4112a3b548baa314c24bfbece4d156b (patch)
tree0b95078c742952272c4c23259e1d6daafcd65172 /arch/arm/common
parent65b4711ff513767341aa1915c822de6ec0de65cb (diff)
downloadlinux-0485e18bc4112a3b548baa314c24bfbece4d156b.tar.gz
linux-0485e18bc4112a3b548baa314c24bfbece4d156b.tar.bz2
linux-0485e18bc4112a3b548baa314c24bfbece4d156b.zip
Revert "[ARM] pxa: remove now unnecessary dma_needs_bounce()"
This reverts commit 4fa5518, which causes a compilation regression for IXP4xx platforms. Reported-by: Richard Cochran <richardcochran@gmail.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/it8152.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index 6c0913562455..7974baacafce 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -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;