openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mips/jazz: provide missing dma_mask/coherent_dma_mask 

Commit 205e1b7f51 ("dma-mapping: warn when there is no
coherent_dma_mask") introduced a warning, if a device is missing a
coherent_dma_mask. ESP and sonic are using dma mapping functions, so
they need dma masks.

[paul.burton@mips.com:
  - Wrap commit message.]

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19828/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
This commit is contained in:
Thomas Bogendoerfer 2018-07-12 15:42:55 +02:00 committed by Paul Burton
parent ddba595b7b
commit b5d69129ea
No known key found for this signature in database
GPG Key ID: 3EA79FACB57500DD
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mips/jazz/setup.c
View File

@ -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[] = {