diff options
| author | Robby Cai <R63905@freescale.com> | 2013-08-07 23:23:54 -0400 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:01:12 -0400 |
| commit | da0159b2d580a21c8c79ffdd1acbf528d8f87dce (patch) | |
| tree | 42aeb51134bbdb6df2a0600c64d78b72ab4d3c4e /include/linux/platform_data | |
| parent | d76bb18bc03b64924401eeb9e884ff65ab3b0f54 (diff) | |
ENGR00274412-1 dma: pxp: Port ePxP driver to 3.10
It's ported from v3.5.7, which contains ePxP DMAENGINE driver and
a client driver named pxp_device. This patch also includes the changes:
- use uapi header file
- remove VM_RESERVED since it's deprecated, and drop redundant VM_IO flag
since it's automatically set in remap_pfn_range()
- use <linux/platform_data/dma-imx.h> instead of <mach/dma.h>
- use devm_kzalloc() instead in pxp_probe()
- use macro __KERNEL__ in pxp_dma uapi header to avoid definition conflict
Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/dma-imx.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index f6d30cc1cb77..3558f05273a3 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. | 2 | * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. |
| 3 | * | 3 | * |
| 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
| @@ -58,6 +58,11 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) | |||
| 58 | return !strcmp(dev_name(chan->device->dev), "ipu-core"); | 58 | return !strcmp(dev_name(chan->device->dev), "ipu-core"); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static inline int imx_dma_is_pxp(struct dma_chan *chan) | ||
| 62 | { | ||
| 63 | return strstr(dev_name(chan->device->dev), "pxp") != NULL; | ||
| 64 | } | ||
| 65 | |||
| 61 | static inline int imx_dma_is_general_purpose(struct dma_chan *chan) | 66 | static inline int imx_dma_is_general_purpose(struct dma_chan *chan) |
| 62 | { | 67 | { |
| 63 | return strstr(dev_name(chan->device->dev), "sdma") || | 68 | return strstr(dev_name(chan->device->dev), "sdma") || |
