diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index ea5ed7c0141e338726cdeddc983ab26ca6044561..ca75614e9289a4e4b1a2ceecb76292b7f96daaff 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -8,7 +8,7 @@ * Based on code from Freescale: * * Copyright 2004-2016 Freescale Semiconductor, Inc. All Rights Reserved. - * Copyright 2017 NXP. + * Copyright 2018 NXP. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -1963,7 +1963,7 @@ static void sdma_issue_pending(struct dma_chan *chan) #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 38 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 41 -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4 42 +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4 44 static void sdma_add_scripts(struct sdma_engine *sdma, const struct sdma_script_start_addrs *addr) diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h index 30e676b36b247a595c39e98d7c59bdaa7e6eb233..e25720934d276ed9d7a453515d4155afccadc936 100644 --- a/include/linux/platform_data/dma-imx-sdma.h +++ b/include/linux/platform_data/dma-imx-sdma.h @@ -54,6 +54,8 @@ struct sdma_script_start_addrs { s32 mcu_2_ecspi_addr; /* End of v3 array */ s32 mcu_2_zqspi_addr; + s32 mcu_2_sai_addr; + s32 sai_2_mcu_addr; /* End of v4 array */ }; diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 18ed10c57e1932ce696c1a18bc1080272c83a1b4..f149a670911f580e23281e71ab14757a71a26a25 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -1,5 +1,6 @@ /* * Copyright 2004-2015 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2018 NXP. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -43,6 +44,7 @@ enum sdma_peripheral_type { IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ IMX_DMATYPE_SAI, /* SAI */ IMX_DMATYPE_HDMI, /* HDMI Audio */ + IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */ }; enum imx_dma_prio {