aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/Kconfig5
-rw-r--r--drivers/dma/mxs-dma.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 686ae67d7e2a..c022cc68b025 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -369,13 +369,12 @@ config MV_XOR_V2
369 369
370config MXS_DMA 370config MXS_DMA
371 bool "MXS DMA support" 371 bool "MXS DMA support"
372 depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q || SOC_IMX6UL 372 depends on ARCH_MXS || ARCH_MXC || COMPILE_TEST
373 select STMP_DEVICE 373 select STMP_DEVICE
374 select DMA_ENGINE 374 select DMA_ENGINE
375 help 375 help
376 Support the MXS DMA engine. This engine including APBH-DMA 376 Support the MXS DMA engine. This engine including APBH-DMA
377 and APBX-DMA is integrated into Freescale 377 and APBX-DMA is integrated into some Freescale chips.
378 i.MX23/28/MX6Q/MX6DL/MX6UL chips.
379 378
380config MX3_IPU 379config MX3_IPU
381 bool "MX3x Image Processing Unit support" 380 bool "MX3x Image Processing Unit support"
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index e217268c7098..41d167921fab 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -617,7 +617,7 @@ static struct dma_async_tx_descriptor *mxs_dma_prep_dma_cyclic(
617 617
618 if (period_len > MAX_XFER_BYTES) { 618 if (period_len > MAX_XFER_BYTES) {
619 dev_err(mxs_dma->dma_device.dev, 619 dev_err(mxs_dma->dma_device.dev,
620 "maximum period size exceeded: %d > %d\n", 620 "maximum period size exceeded: %zu > %d\n",
621 period_len, MAX_XFER_BYTES); 621 period_len, MAX_XFER_BYTES);
622 goto err_out; 622 goto err_out;
623 } 623 }