From 53ad835ce7050dc3a3b3343fb07636db86783e26 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 26 Mar 2014 23:07:17 +0100 Subject: Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation" This reverts commit bfdad565ae0a61ac943974b8ae61ec0ed55ceb04. The patch turned out to be incorrect, and will be replaced with a correct patch. Signed-off-by: Arnd Bergmann --- arch/arm/mach-ixp4xx/common-pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/mach-ixp4xx/common-pci.c') diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 055d81694a17..200970d56f6d 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c @@ -481,5 +481,14 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys) return 1; } +int dma_set_coherent_mask(struct device *dev, u64 mask) +{ + if (mask >= SZ_64M - 1) + return 0; + + return -EIO; +} + EXPORT_SYMBOL(ixp4xx_pci_read); EXPORT_SYMBOL(ixp4xx_pci_write); +EXPORT_SYMBOL(dma_set_coherent_mask); -- cgit v1.2.3