2 files changed, 10 insertions, 5 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 7032ac7ecd1b..41386723f9fa 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -20,7 +20,6 @@ choice
 
 config MIPS_MTX1
         bool "4G Systems MTX-1 board"
-        select DMA_NONCOHERENT
         select HW_HAS_PCI
         select ALCHEMY_GPIOINT_AU1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -29,7 +28,6 @@ config MIPS_MTX1
 config MIPS_DB1000
         bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"
         select ALCHEMY_GPIOINT_AU1000
-        select DMA_NONCOHERENT
         select HW_HAS_PCI
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -39,13 +37,11 @@ config MIPS_DB1235
         bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"
         select ARCH_REQUIRE_GPIOLIB
         select HW_HAS_PCI
-        select DMA_COHERENT
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
 config MIPS_XXS1500
         bool "MyCable XXS1500 board"
-        select DMA_NONCOHERENT
         select ALCHEMY_GPIOINT_AU1000
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
@@ -54,7 +50,6 @@ config MIPS_GPR
         bool "Trapeze ITS GPR board"
         select ALCHEMY_GPIOINT_AU1000
         select HW_HAS_PCI
-        select DMA_NONCOHERENT
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 62b4e7bbeab9..566a1743f685 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -30,6 +30,7 @@
 #include <linux/jiffies.h>
 #include <linux/module.h>
 
+#include <asm/dma-coherence.h>
 #include <asm/mipsregs.h>
 #include <asm/time.h>
 
@@ -59,6 +60,15 @@ void __init plat_mem_setup(void)
                 /* Clear to obtain best system bus performance */
                 clear_c0_config(1 << 19); /* Clear Config[OD] */
 
+        hw_coherentio = 0;
+        coherentio = 1;
+        switch (alchemy_get_cputype()) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+                coherentio = 0;
+        }
+
         board_setup();  /* board specific setup */
 
         /* IO/MEM resources. */