diff options
| author | Robby Cai <R63905@freescale.com> | 2013-08-08 11:23:54 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-08-23 07:30:18 +0800 |
| commit | 7da3e31eeaae37160dc99c5b1a3fc213d5f4f517 (patch) | |
| tree | ffc8aab38effc41cc6a05eba46c54ae1204b35d7 /include | |
| parent | 96e66100ded4bd2d9a5fc10693d9f723e85694e9 (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')
| -rw-r--r-- | include/linux/platform_data/dma-imx.h | 7 | ||||
| -rw-r--r-- | include/uapi/linux/pxp_dma.h | 2 |
2 files changed, 8 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 @@ /* - * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. * * 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 @@ -58,6 +58,11 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) return !strcmp(dev_name(chan->device->dev), "ipu-core"); } +static inline int imx_dma_is_pxp(struct dma_chan *chan) +{ + return strstr(dev_name(chan->device->dev), "pxp") != NULL; +} + static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { return strstr(dev_name(chan->device->dev), "sdma") || 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 @@ #include <linux/posix_types.h> +#ifndef __KERNEL__ typedef unsigned long dma_addr_t; typedef unsigned char bool; +#endif /* PXP Pixel format definitions */ /* Four-character-code (FOURCC) */ |