aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2010-02-03 05:08:17 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-02-17 14:02:47 +1100
commite0508b1516ad4423499d4118a9037ae0aa4e9c2f (patch)
treed9ae599feedd4b7b5b69c917080b7b4c691b1aa4 /arch/powerpc/sysdev
parentec144a81ade915b5b38adedf10e84690813ed768 (diff)
downloadkernel_samsung_crespo-e0508b1516ad4423499d4118a9037ae0aa4e9c2f.zip
kernel_samsung_crespo-e0508b1516ad4423499d4118a9037ae0aa4e9c2f.tar.gz
kernel_samsung_crespo-e0508b1516ad4423499d4118a9037ae0aa4e9c2f.tar.bz2
powerpc: Add coherent_dma_mask to mv64x60 devices
DMA ops requires that coherent_dma_mask be set properly for a device, but this was not being done for devices on the MV64x60 that use DMA. Both the serial and ethernet devices need this or they won't be able to allocate memory. Signed-off-by: Corey Minyard <cminyard@mvista.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r--arch/powerpc/sysdev/mv64x60_dev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index b6bd775..31acd3b 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -16,6 +16,7 @@
#include <linux/mv643xx.h>
#include <linux/platform_device.h>
#include <linux/of_platform.h>
+#include <linux/dma-mapping.h>
#include <asm/prom.h>
@@ -189,6 +190,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
pdev = platform_device_alloc(MPSC_CTLR_NAME, port_number);
if (!pdev)
return -ENOMEM;
+ pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
err = platform_device_add_resources(pdev, r, 5);
if (err)
@@ -302,6 +304,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id,
if (!pdev)
return -ENOMEM;
+ pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
err = platform_device_add_resources(pdev, r, 1);
if (err)
goto error;