Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
This reverts commit bfdad565ae
.
The patch turned out to be incorrect, and will be replaced
with a correct patch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
e1a4018f93
commit
53ad835ce7
|
@ -481,5 +481,14 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
|
||||||
return 1;
|
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_read);
|
||||||
EXPORT_SYMBOL(ixp4xx_pci_write);
|
EXPORT_SYMBOL(ixp4xx_pci_write);
|
||||||
|
EXPORT_SYMBOL(dma_set_coherent_mask);
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
#include <linux/sched_clock.h>
|
#include <linux/sched_clock.h>
|
||||||
#include <linux/pci.h>
|
|
||||||
|
|
||||||
#include <mach/udc.h>
|
#include <mach/udc.h>
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
|
@ -579,17 +578,6 @@ void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int dma_set_coherent_mask(struct device *dev, u64 mask)
|
|
||||||
{
|
|
||||||
if (dev_is_pci(dev) && mask >= SZ_64M)
|
|
||||||
return -EIO;
|
|
||||||
|
|
||||||
dev->coherent_dma_mask = mask;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(dma_set_coherent_mask);
|
|
||||||
|
|
||||||
#ifdef CONFIG_IXP4XX_INDIRECT_PCI
|
#ifdef CONFIG_IXP4XX_INDIRECT_PCI
|
||||||
/*
|
/*
|
||||||
* In the case of using indirect PCI, we simply return the actual PCI
|
* In the case of using indirect PCI, we simply return the actual PCI
|
||||||
|
|
Loading…
Reference in New Issue