Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 448fd41792e4bb24dbe9299450f27ef573320ff7..1b5e121c3f0d8de5f0fe7f7a0f16913c293e25f4 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -16,6 +16,7 @@
 #include <linux/screen_info.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
@@ -136,10 +137,16 @@ static struct resource jazz_esp_rsrc[] = {
        }
 };
 
+static u64 jazz_esp_dma_mask = DMA_BIT_MASK(32);
+
 static struct platform_device jazz_esp_pdev = {
        .name           = "jazz_esp",
        .num_resources  = ARRAY_SIZE(jazz_esp_rsrc),
-       .resource       = jazz_esp_rsrc
+       .resource       = jazz_esp_rsrc,
+       .dev = {
+               .dma_mask          = &jazz_esp_dma_mask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       }
 };
 
 static struct resource jazz_sonic_rsrc[] = {
@@ -155,10 +162,16 @@ static struct resource jazz_sonic_rsrc[] = {
        }
 };
 
+static u64 jazz_sonic_dma_mask = DMA_BIT_MASK(32);
+
 static struct platform_device jazz_sonic_pdev = {
        .name           = "jazzsonic",
        .num_resources  = ARRAY_SIZE(jazz_sonic_rsrc),
-       .resource       = jazz_sonic_rsrc
+       .resource       = jazz_sonic_rsrc,
+       .dev = {
+               .dma_mask          = &jazz_sonic_dma_mask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       }
 };
 
 static struct resource jazz_cmos_rsrc[] = {