Commit 58af4a24 authored by Rob Herring's avatar Rob Herring
Browse files

ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol 



The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms:
ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is
implicitly included before dma-mapping.h, but the removal of io.h broke
things (c334bc15 ARM: make mach/io.h include optional). Since memory.h
is the correct place, but no longer exists, convert the define to a
kconfig entry.

Reported-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
parent a2a47ca3

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ config ZONE_DMA 
config NEED_DMA_MAP_STATE

       def_bool y



config ARCH_HAS_DMA_SET_COHERENT_MASK

	bool



config GENERIC_ISA_DMA

	bool
@@ -547,6 +550,7 @@ config ARCH_IXP2000 
config ARCH_IXP4XX

	bool "IXP4xx-based"

	depends on MMU

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select CLKSRC_MMIO

	select CPU_XSCALE

	select GENERIC_GPIO

arch/arm/mach-ixp4xx/include/mach/hardware.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#define PCIBIOS_MAX_MEM		0x4BFFFFFF

#endif



#define ARCH_HAS_DMA_SET_COHERENT_MASK



/* Register locations and bits */

#include "ixp4xx-regs.h"

arch/arm/mach-pxa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ config CSB726_CSB701 


config MACH_ARMCORE

	bool "CompuLab CM-X255/CM-X270 modules"

	select ARCH_HAS_DMA_SET_COHERENT_MASK if PCI

	select PXA27x

	select IWMMXT

	select PXA25x

arch/arm/mach-pxa/include/mach/hardware.h

+0 −4
Original line number Diff line number Diff line
@@ -337,8 +337,4 @@ extern unsigned int get_memclk_frequency_10khz(void); 
extern unsigned long get_clock_tick_rate(void);

#endif



#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)

#define ARCH_HAS_DMA_SET_COHERENT_MASK

#endif



#endif  /* _ASM_ARCH_HARDWARE_H */

include/linux/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline u64 dma_get_mask(struct device *dev) 
	return DMA_BIT_MASK(32);

}



#ifdef ARCH_HAS_DMA_SET_COHERENT_MASK

#ifdef CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK

int dma_set_coherent_mask(struct device *dev, u64 mask);

#else

static inline int dma_set_coherent_mask(struct device *dev, u64 mask)

CRA Git | Maintained and supported by SUSTech CRA and CCSE