diff options
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/dma-imx-sdma.h | 5 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-imx.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-mmp_tdma.h | 8 | ||||
| -rw-r--r-- | include/linux/platform_data/dma-mv_xor.h | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h index 3a3942823c20..eabac4e2fc99 100644 --- a/include/linux/platform_data/dma-imx-sdma.h +++ b/include/linux/platform_data/dma-imx-sdma.h | |||
| @@ -43,6 +43,11 @@ struct sdma_script_start_addrs { | |||
| 43 | s32 dptc_dvfs_addr; | 43 | s32 dptc_dvfs_addr; |
| 44 | s32 utra_addr; | 44 | s32 utra_addr; |
| 45 | s32 ram_code_start_addr; | 45 | s32 ram_code_start_addr; |
| 46 | /* End of v1 array */ | ||
| 47 | s32 mcu_2_ssish_addr; | ||
| 48 | s32 ssish_2_mcu_addr; | ||
| 49 | s32 hdmi_dma_addr; | ||
| 50 | /* End of v2 array */ | ||
| 46 | }; | 51 | }; |
| 47 | 52 | ||
| 48 | /** | 53 | /** |
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index beac6b8b6a7b..bcbc6c3c14c0 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h | |||
| @@ -39,6 +39,7 @@ enum sdma_peripheral_type { | |||
| 39 | IMX_DMATYPE_IPU_MEMORY, /* IPU Memory */ | 39 | IMX_DMATYPE_IPU_MEMORY, /* IPU Memory */ |
| 40 | IMX_DMATYPE_ASRC, /* ASRC */ | 40 | IMX_DMATYPE_ASRC, /* ASRC */ |
| 41 | IMX_DMATYPE_ESAI, /* ESAI */ | 41 | IMX_DMATYPE_ESAI, /* ESAI */ |
| 42 | IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ | ||
| 42 | }; | 43 | }; |
| 43 | 44 | ||
| 44 | enum imx_dma_prio { | 45 | enum imx_dma_prio { |
diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h index 239e0fc1bb1f..66574ea39f97 100644 --- a/include/linux/platform_data/dma-mmp_tdma.h +++ b/include/linux/platform_data/dma-mmp_tdma.h | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/mach-mmp/include/mach/sram.h | ||
| 3 | * | ||
| 4 | * SRAM Memory Management | 2 | * SRAM Memory Management |
| 5 | * | 3 | * |
| 6 | * Copyright (c) 2011 Marvell Semiconductors Inc. | 4 | * Copyright (c) 2011 Marvell Semiconductors Inc. |
| @@ -11,8 +9,8 @@ | |||
| 11 | * | 9 | * |
| 12 | */ | 10 | */ |
| 13 | 11 | ||
| 14 | #ifndef __ASM_ARCH_SRAM_H | 12 | #ifndef __DMA_MMP_TDMA_H |
| 15 | #define __ASM_ARCH_SRAM_H | 13 | #define __DMA_MMP_TDMA_H |
| 16 | 14 | ||
| 17 | #include <linux/genalloc.h> | 15 | #include <linux/genalloc.h> |
| 18 | 16 | ||
| @@ -32,4 +30,4 @@ struct sram_platdata { | |||
| 32 | 30 | ||
| 33 | extern struct gen_pool *sram_get_gpool(char *pool_name); | 31 | extern struct gen_pool *sram_get_gpool(char *pool_name); |
| 34 | 32 | ||
| 35 | #endif /* __ASM_ARCH_SRAM_H */ | 33 | #endif /* __DMA_MMP_TDMA_H */ |
diff --git a/include/linux/platform_data/dma-mv_xor.h b/include/linux/platform_data/dma-mv_xor.h index 8ec18f64e396..92ffd3245f76 100644 --- a/include/linux/platform_data/dma-mv_xor.h +++ b/include/linux/platform_data/dma-mv_xor.h | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/plat-orion/include/plat/mv_xor.h | ||
| 3 | * | ||
| 4 | * Marvell XOR platform device data definition file. | 2 | * Marvell XOR platform device data definition file. |
| 5 | */ | 3 | */ |
| 6 | 4 | ||
| 7 | #ifndef __PLAT_MV_XOR_H | 5 | #ifndef __DMA_MV_XOR_H |
| 8 | #define __PLAT_MV_XOR_H | 6 | #define __DMA_MV_XOR_H |
| 9 | 7 | ||
| 10 | #include <linux/dmaengine.h> | 8 | #include <linux/dmaengine.h> |
| 11 | #include <linux/mbus.h> | 9 | #include <linux/mbus.h> |
