Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0508b15 authored by Corey Minyard's avatar Corey Minyard Committed by Benjamin Herrenschmidt
Browse files

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: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ec144a81

arch/powerpc/sysdev/mv64x60_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -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;