diff options
| author | Han Xu <han.xu@nxp.com> | 2017-06-23 16:28:10 -0500 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 35412bc70c91f004a0ed3d06480487cc7e2f1d74 (patch) | |
| tree | 86e1a0eccb7c1ff8d367bb339d6cfe810d8c758b | |
| parent | 0b26da4166e2e44a7559651ddfd5ad95925c6f9e (diff) | |
MLK-15284-4: dma: Kconfig: add MXS_DMA dependency for ARM64
add MXS_DMA dependency for ARCH_MXC_ARM64
The patch also merge the upstreamed change that extend the dependency to
allow the mxs dma driver to be built whenever ARCH_MXS or ARCH_MXC is
selected. Refer to
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/dma/Kconfig?h=next-20170626&id=d762e4f35601239cbebfbfd43d99876d8f220927
Signed-off-by: Han Xu <han.xu@nxp.com>
| -rw-r--r-- | drivers/dma/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/dma/mxs-dma.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 6cb475ebcfc6..2e476accd3ba 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -367,13 +367,13 @@ config MV_XOR_V2 config MXS_DMA bool "MXS DMA support" - depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6 + depends on ARCH_MXS || ARCH_MXC || ARCH_MXC_ARM64 || 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. + i.MX23/28/MX6Q/MX6DL/MX6UL/MX7D/MX8 chips. source "drivers/dma/pxp/Kconfig" diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index f573e7e1634c..6c382e717418 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -644,7 +644,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; } |