leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS: remove CONFIG_DMA_MAYBE_COHERENT

Browse Source 
CONFIG_DMA_MAYBE_COHERENT just guards two early init options now.  Just
enable them unconditionally for CONFIG_DMA_NONCOHERENT.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Christoph Hellwig
2021-02-10 10:56:40 +01:00
committed by Thomas Bogendoerfer
parent 6d4e9a8efe
commit a86497d66d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/Kconfig
View File

@@ -184,7 +184,7 @@ config MIPS_ALCHEMY
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select IRQ_MIPS_CPU select IRQ_MIPS_CPU
select DMA_MAYBE_COHERENT # Au1000,1500,1100 aren't, rest is select DMA_NONCOHERENT # Au1000,1500,1100 aren't, rest is
select MIPS_FIXUP_BIGPHYS_ADDR if PCI select MIPS_FIXUP_BIGPHYS_ADDR if PCI
select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
@@ -548,7 +548,7 @@ config MIPS_MALTA
select CLKSRC_MIPS_GIC select CLKSRC_MIPS_GIC
select COMMON_CLK select COMMON_CLK
select CSRC_R4K select CSRC_R4K
select DMA_MAYBE_COHERENT select DMA_NONCOHERENT
select GENERIC_ISA_DMA select GENERIC_ISA_DMA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
select HAVE_PCI select HAVE_PCI
@@ -1162,10 +1162,6 @@ config FW_CFE
config ARCH_SUPPORTS_UPROBES config ARCH_SUPPORTS_UPROBES
bool bool
config DMA_MAYBE_COHERENT
select DMA_NONCOHERENT
bool
config DMA_PERDEV_COHERENT config DMA_PERDEV_COHERENT
bool bool
select ARCH_HAS_SETUP_DMA_OPS select ARCH_HAS_SETUP_DMA_OPS

2
arch/mips/kernel/setup.c
View File

@@ -801,7 +801,7 @@ static int __init debugfs_mips(void)
arch_initcall(debugfs_mips); arch_initcall(debugfs_mips);
#endif #endif
#ifdef CONFIG_DMA_MAYBE_COHERENT #ifdef CONFIG_DMA_NONCOHERENT
static int __init setcoherentio(char *str) static int __init setcoherentio(char *str)
{ {
dma_default_coherent = true; dma_default_coherent = true;