From: Russell King Date: Mon, 2 Apr 2007 12:53:15 +0000 (+0100) Subject: [ARM] Set coherent DMA mask for Acorn expansion cards X-Git-Tag: v2.6.22-rc1~1009^2~1^11~6 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=69f4f331a0f78470f0bc42ba8db8d6cdd9cae4a9;p=powerpc.git [ARM] Set coherent DMA mask for Acorn expansion cards Although expansion cards can't do bus-master DMA, subsystems want to be able to use coherent memory for DMA purposes to these cards. Therefore, set the coherent DMA mask to allow such memory to be allocated. Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index f1c0fb9741..6eb80acea3 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -825,6 +825,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot) ec->dev.bus = &ecard_bus_type; ec->dev.dma_mask = &ec->dma_mask; ec->dma_mask = (u64)0xffffffff; + ec->dev.coherent_dma_mask = ec->dma_mask; if (slot < 4) { ec_set_resource(ec, ECARD_RES_MEMC,