leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/mxs' into for-linus

Browse Source
This commit is contained in:
Vinod Koul 2017-07-04 10:05:01 +05:30
commit 70ef9af765
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/dma/Kconfig
View File

@ -369,13 +369,12 @@ config MV_XOR_V2
config MXS_DMA config MXS_DMA
bool "MXS DMA support" bool "MXS DMA support"
depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_IMX6UL depends on ARCH_MXS || ARCH_MXC || COMPILE_TEST
select STMP_DEVICE select STMP_DEVICE
select DMA_ENGINE select DMA_ENGINE
help help
Support the MXS DMA engine. This engine including APBH-DMA Support the MXS DMA engine. This engine including APBH-DMA
and APBX-DMA is integrated into Freescale and APBX-DMA is integrated into some Freescale chips.
i.MX23/28/MX6Q/MX6DL/MX6UL chips.
config MX3_IPU config MX3_IPU
bool "MX3x Image Processing Unit support" bool "MX3x Image Processing Unit support"

2
drivers/dma/mxs-dma.c
View File

@ -617,7 +617,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(
if (period_len > MAX_XFER_BYTES) { if (period_len > MAX_XFER_BYTES) {
dev_err(mxs_dma->dma_device.dev, dev_err(mxs_dma->dma_device.dev,
"maximum period size exceeded: %d > %d\n", "maximum period size exceeded: %zu > %d\n",
period_len, MAX_XFER_BYTES); period_len, MAX_XFER_BYTES);
goto err_out; goto err_out;
} }