summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-07-04 10:05:01 +0530
committerVinod Koul <vinod.koul@intel.com>2017-07-04 10:05:01 +0530
commit70ef9af76590c970c23f99561c89ec614b0d26aa (patch)
tree5574008d61cfa21a71558dbe8e9f2388cc7b69ce /drivers/dma
parent87fce2f5f43715c46d85a31aa9142d83d7af347d (diff)
parent2446563c74f8c059fd4da4abeaa537f09033b5ec (diff)
downloadlinux-stable-70ef9af76590c970c23f99561c89ec614b0d26aa.tar.gz
linux-stable-70ef9af76590c970c23f99561c89ec614b0d26aa.tar.bz2
linux-stable-70ef9af76590c970c23f99561c89ec614b0d26aa.zip
Merge branch 'topic/mxs' into for-linus
Diffstat (limited to 'drivers/dma')
-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
config MXS_DMA
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 DMA_ENGINE
help
Support the MXS DMA engine. This engine including APBH-DMA
- and APBX-DMA is integrated into Freescale
- i.MX23/28/MX6Q/MX6DL/MX6UL chips.
+ and APBX-DMA is integrated into some Freescale chips.
config MX3_IPU
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(
if (period_len > MAX_XFER_BYTES) {
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);
goto err_out;
}