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/uapi | |
| 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/uapi')
| -rw-r--r-- | include/uapi/linux/pxp_dma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/pxp_dma.h b/include/uapi/linux/pxp_dma.h index 87fcdc7c9451..bc280a70c856 100644 --- a/include/uapi/linux/pxp_dma.h +++ b/include/uapi/linux/pxp_dma.h | |||
| @@ -21,8 +21,10 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/posix_types.h> | 22 | #include <linux/posix_types.h> |
| 23 | 23 | ||
| 24 | #ifndef __KERNEL__ | ||
| 24 | typedef unsigned long dma_addr_t; | 25 | typedef unsigned long dma_addr_t; |
| 25 | typedef unsigned char bool; | 26 | typedef unsigned char bool; |
| 27 | #endif | ||
| 26 | 28 | ||
| 27 | /* PXP Pixel format definitions */ | 29 | /* PXP Pixel format definitions */ |
| 28 | /* Four-character-code (FOURCC) */ | 30 | /* Four-character-code (FOURCC) */ |