diff options
| author | Steven J. Hill <Steven.Hill@imgtec.com> | 2013-03-25 13:47:29 -0500 |
|---|---|---|
| committer | Steven J. Hill <Steven.Hill@imgtec.com> | 2013-05-01 16:32:49 -0500 |
| commit | b6d92b4a6bdb880b39789c677b952c53a437028d (patch) | |
| tree | f14d30f02314d75860aa1ed12449410e6659513b /arch/mips/include/asm/mach-generic/dma-coherence.h | |
| parent | c34c09c81d659e13e15947580198fa652af3ca1a (diff) | |
| download | linux-b6d92b4a6bdb880b39789c677b952c53a437028d.tar.gz | |
MIPS: Add option to disable software I/O coherency.
Some MIPS controllers have hardware I/O coherency. This patch detects those and turns off software coherency. A new kernel command line option also allows the user to manually turn software coherency on or off. Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
Diffstat (limited to 'arch/mips/include/asm/mach-generic/dma-coherence.h')
| -rw-r--r-- | arch/mips/include/asm/mach-generic/dma-coherence.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h index 9c95177f7a7e..fe23034aaf72 100644 --- a/arch/mips/include/asm/mach-generic/dma-coherence.h +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h @@ -61,9 +61,8 @@ static inline int plat_device_is_coherent(struct device *dev) { #ifdef CONFIG_DMA_COHERENT return 1; -#endif -#ifdef CONFIG_DMA_NONCOHERENT - return 0; +#else + return coherentio; #endif } |