Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 11:53:01 +00:00
Code Issues Projects Releases Wiki Activity

powerpc: Add coherent_dma_mask to mv64x60 devices

Browse source 
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>
This commit is contained in:
Corey Minyard 2010-02-03 05:08:17 +00:00 committed by Benjamin Herrenschmidt
parent ec144a81ad
commit e0508b1516
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/sysdev/mv64x60_dev.c
View file

@ -16,6 +16,7 @@
#include <linux/mv643xx.h> #include <linux/mv643xx.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/dma-mapping.h>
#include <asm/prom.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); pdev = platform_device_alloc(MPSC_CTLR_NAME, port_number);
if (!pdev) if (!pdev)
return -ENOMEM; return -ENOMEM;
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
err = platform_device_add_resources(pdev, r, 5); err = platform_device_add_resources(pdev, r, 5);
if (err) if (err)
@ -302,6 +304,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id,
if (!pdev) if (!pdev)
return -ENOMEM; return -ENOMEM;
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
err = platform_device_add_resources(pdev, r, 1); err = platform_device_add_resources(pdev, r, 1);
if (err) if (err)
goto error; goto error;