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

Commit 53ad835c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation" 



This reverts commit bfdad565.

The patch turned out to be incorrect, and will be replaced
with a correct patch.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent e1a4018f

arch/arm/mach-ixp4xx/common-pci.c

+9 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-ixp4xx/common.c

+0 −12
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/gpio.h>

#include <linux/cpu.h>

#include <linux/sched_clock.h>

#include <linux/pci.h>



#include <mach/udc.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

/*

 * In the case of using indirect PCI, we simply return the actual PCI