aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ixp4xx/common-pci.c9
-rw-r--r--arch/arm/mach-ixp4xx/common.c12
2 files changed, 9 insertions, 12 deletions
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)
481 return 1; 481 return 1;
482} 482}
483 483
484int dma_set_coherent_mask(struct device *dev, u64 mask)
485{
486 if (mask >= SZ_64M - 1)
487 return 0;
488
489 return -EIO;
490}
491
484EXPORT_SYMBOL(ixp4xx_pci_read); 492EXPORT_SYMBOL(ixp4xx_pci_read);
485EXPORT_SYMBOL(ixp4xx_pci_write); 493EXPORT_SYMBOL(ixp4xx_pci_write);
494EXPORT_SYMBOL(dma_set_coherent_mask);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index df82a2b4a546..6d68aed6548a 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -31,7 +31,6 @@
31#include <linux/gpio.h> 31#include <linux/gpio.h>
32#include <linux/cpu.h> 32#include <linux/cpu.h>
33#include <linux/sched_clock.h> 33#include <linux/sched_clock.h>
34#include <linux/pci.h>
35 34
36#include <mach/udc.h> 35#include <mach/udc.h>
37#include <mach/hardware.h> 36#include <mach/hardware.h>
@@ -579,17 +578,6 @@ void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
579 } 578 }
580} 579}
581 580
582int dma_set_coherent_mask(struct device *dev, u64 mask)
583{
584 if (dev_is_pci(dev) && mask >= SZ_64M)
585 return -EIO;
586
587 dev->coherent_dma_mask = mask;
588
589 return 0;
590}
591EXPORT_SYMBOL(dma_set_coherent_mask);
592
593#ifdef CONFIG_IXP4XX_INDIRECT_PCI 581#ifdef CONFIG_IXP4XX_INDIRECT_PCI
594/* 582/*
595 * In the case of using indirect PCI, we simply return the actual PCI 583 * In the case of using indirect PCI, we simply return the actual PCI