diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-11-17 04:11:13 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-11-19 05:09:38 -0500 |
| commit | a71daaa10ec2e325f34d172b2782f2d68209b08d (patch) | |
| tree | 24ac00adc30f3947effe71abcace83c9e5ec4c08 /include/linux/platform_data/media | |
| parent | 886aa71bd4c3d22b1879cae3a4cd60d09b3fc25f (diff) | |
[media] move media platform data to linux/platform_data/media
Now that media has its own subdirectory inside platform_data,
let's move the headers that are already there to such subdir.
After moving those files, the references were adjusted using this
script:
MAIN_DIR="linux/platform_data/"
PREV_DIR="linux/platform_data/"
DIRS="media/"
echo "Checking affected files" >&2
for i in $DIRS; do
for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do
n=`basename $j`
git grep -l $n
done
done|sort|uniq >files && (
echo "Handling files..." >&2;
echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done";
);
echo "Handling documentation..." >&2;
echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\";
(
cd include/$MAIN_DIR;
for j in $DIRS; do
for i in $(ls $j); do
echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\";
done;
done;
echo "cat > a && mv a \$i; done"
);
) >script && . ./script
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/linux/platform_data/media')
| -rw-r--r-- | include/linux/platform_data/media/camera-mx2.h | 44 | ||||
| -rw-r--r-- | include/linux/platform_data/media/camera-mx3.h | 52 | ||||
| -rw-r--r-- | include/linux/platform_data/media/camera-pxa.h | 44 | ||||
| -rw-r--r-- | include/linux/platform_data/media/camera-rcar.h | 25 | ||||
| -rw-r--r-- | include/linux/platform_data/media/coda.h | 18 |
5 files changed, 183 insertions, 0 deletions
diff --git a/include/linux/platform_data/media/camera-mx2.h b/include/linux/platform_data/media/camera-mx2.h new file mode 100644 index 000000000000..7ded6f1f74bc --- /dev/null +++ b/include/linux/platform_data/media/camera-mx2.h | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | /* | ||
| 2 | * mx2-cam.h - i.MX27/i.MX25 camera driver header file | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003, Intel Corporation | ||
| 5 | * Copyright (C) 2008, Sascha Hauer <s.hauer@pengutronix.de> | ||
| 6 | * Copyright (C) 2010, Baruch Siach <baruch@tkos.co.il> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; if not, write to the Free Software | ||
| 20 | * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 21 | */ | ||
| 22 | |||
| 23 | #ifndef __MACH_MX2_CAM_H_ | ||
| 24 | #define __MACH_MX2_CAM_H_ | ||
| 25 | |||
| 26 | #define MX2_CAMERA_EXT_VSYNC (1 << 1) | ||
| 27 | #define MX2_CAMERA_CCIR (1 << 2) | ||
| 28 | #define MX2_CAMERA_CCIR_INTERLACE (1 << 3) | ||
| 29 | #define MX2_CAMERA_HSYNC_HIGH (1 << 4) | ||
| 30 | #define MX2_CAMERA_GATED_CLOCK (1 << 5) | ||
| 31 | #define MX2_CAMERA_INV_DATA (1 << 6) | ||
| 32 | #define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7) | ||
| 33 | |||
| 34 | /** | ||
| 35 | * struct mx2_camera_platform_data - optional platform data for mx2_camera | ||
| 36 | * @flags: any combination of MX2_CAMERA_* | ||
| 37 | * @clk: clock rate of the csi block / 2 | ||
| 38 | */ | ||
| 39 | struct mx2_camera_platform_data { | ||
| 40 | unsigned long flags; | ||
| 41 | unsigned long clk; | ||
| 42 | }; | ||
| 43 | |||
| 44 | #endif /* __MACH_MX2_CAM_H_ */ | ||
diff --git a/include/linux/platform_data/media/camera-mx3.h b/include/linux/platform_data/media/camera-mx3.h new file mode 100644 index 000000000000..a910dadc8258 --- /dev/null +++ b/include/linux/platform_data/media/camera-mx3.h | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | /* | ||
| 2 | * mx3_camera.h - i.MX3x camera driver header file | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de> | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #ifndef _MX3_CAMERA_H_ | ||
| 18 | #define _MX3_CAMERA_H_ | ||
| 19 | |||
| 20 | #include <linux/device.h> | ||
| 21 | |||
| 22 | #define MX3_CAMERA_CLK_SRC 1 | ||
| 23 | #define MX3_CAMERA_EXT_VSYNC 2 | ||
| 24 | #define MX3_CAMERA_DP 4 | ||
| 25 | #define MX3_CAMERA_PCP 8 | ||
| 26 | #define MX3_CAMERA_HSP 0x10 | ||
| 27 | #define MX3_CAMERA_VSP 0x20 | ||
| 28 | #define MX3_CAMERA_DATAWIDTH_4 0x40 | ||
| 29 | #define MX3_CAMERA_DATAWIDTH_8 0x80 | ||
| 30 | #define MX3_CAMERA_DATAWIDTH_10 0x100 | ||
| 31 | #define MX3_CAMERA_DATAWIDTH_15 0x200 | ||
| 32 | |||
| 33 | #define MX3_CAMERA_DATAWIDTH_MASK (MX3_CAMERA_DATAWIDTH_4 | MX3_CAMERA_DATAWIDTH_8 | \ | ||
| 34 | MX3_CAMERA_DATAWIDTH_10 | MX3_CAMERA_DATAWIDTH_15) | ||
| 35 | |||
| 36 | struct v4l2_async_subdev; | ||
| 37 | |||
| 38 | /** | ||
| 39 | * struct mx3_camera_pdata - i.MX3x camera platform data | ||
| 40 | * @flags: MX3_CAMERA_* flags | ||
| 41 | * @mclk_10khz: master clock frequency in 10kHz units | ||
| 42 | * @dma_dev: IPU DMA device to match against in channel allocation | ||
| 43 | */ | ||
| 44 | struct mx3_camera_pdata { | ||
| 45 | unsigned long flags; | ||
| 46 | unsigned long mclk_10khz; | ||
| 47 | struct device *dma_dev; | ||
| 48 | struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ | ||
| 49 | int *asd_sizes; /* 0-terminated array of asd group sizes */ | ||
| 50 | }; | ||
| 51 | |||
| 52 | #endif | ||
diff --git a/include/linux/platform_data/media/camera-pxa.h b/include/linux/platform_data/media/camera-pxa.h new file mode 100644 index 000000000000..6709b1cd7c77 --- /dev/null +++ b/include/linux/platform_data/media/camera-pxa.h | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | /* | ||
| 2 | camera.h - PXA camera driver header file | ||
| 3 | |||
| 4 | Copyright (C) 2003, Intel Corporation | ||
| 5 | Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de> | ||
| 6 | |||
| 7 | This program is free software; you can redistribute it and/or modify | ||
| 8 | it under the terms of the GNU General Public License as published by | ||
| 9 | the Free Software Foundation; either version 2 of the License, or | ||
| 10 | (at your option) any later version. | ||
| 11 | |||
| 12 | This program is distributed in the hope that it will be useful, | ||
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 15 | GNU General Public License for more details. | ||
| 16 | |||
| 17 | You should have received a copy of the GNU General Public License | ||
| 18 | along with this program; if not, write to the Free Software | ||
| 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 20 | */ | ||
| 21 | |||
| 22 | #ifndef __ASM_ARCH_CAMERA_H_ | ||
| 23 | #define __ASM_ARCH_CAMERA_H_ | ||
| 24 | |||
| 25 | #define PXA_CAMERA_MASTER 1 | ||
| 26 | #define PXA_CAMERA_DATAWIDTH_4 2 | ||
| 27 | #define PXA_CAMERA_DATAWIDTH_5 4 | ||
| 28 | #define PXA_CAMERA_DATAWIDTH_8 8 | ||
| 29 | #define PXA_CAMERA_DATAWIDTH_9 0x10 | ||
| 30 | #define PXA_CAMERA_DATAWIDTH_10 0x20 | ||
| 31 | #define PXA_CAMERA_PCLK_EN 0x40 | ||
| 32 | #define PXA_CAMERA_MCLK_EN 0x80 | ||
| 33 | #define PXA_CAMERA_PCP 0x100 | ||
| 34 | #define PXA_CAMERA_HSP 0x200 | ||
| 35 | #define PXA_CAMERA_VSP 0x400 | ||
| 36 | |||
| 37 | struct pxacamera_platform_data { | ||
| 38 | unsigned long flags; | ||
| 39 | unsigned long mclk_10khz; | ||
| 40 | }; | ||
| 41 | |||
| 42 | extern void pxa_set_camera_info(struct pxacamera_platform_data *); | ||
| 43 | |||
| 44 | #endif /* __ASM_ARCH_CAMERA_H_ */ | ||
diff --git a/include/linux/platform_data/media/camera-rcar.h b/include/linux/platform_data/media/camera-rcar.h new file mode 100644 index 000000000000..dfc83c581593 --- /dev/null +++ b/include/linux/platform_data/media/camera-rcar.h | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | /* | ||
| 2 | * Platform data for Renesas R-Car VIN soc-camera driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2011-2013 Renesas Solutions Corp. | ||
| 5 | * Copyright (C) 2013 Cogent Embedded, Inc., <source@cogentembedded.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License as published by the | ||
| 9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 10 | * option) any later version. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __CAMERA_RCAR_H_ | ||
| 14 | #define __CAMERA_RCAR_H_ | ||
| 15 | |||
| 16 | #define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0) | ||
| 17 | #define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1) | ||
| 18 | #define RCAR_VIN_BT601 (1 << 2) | ||
| 19 | #define RCAR_VIN_BT656 (1 << 3) | ||
| 20 | |||
| 21 | struct rcar_vin_platform_data { | ||
| 22 | unsigned int flags; | ||
| 23 | }; | ||
| 24 | |||
| 25 | #endif /* __CAMERA_RCAR_H_ */ | ||
diff --git a/include/linux/platform_data/media/coda.h b/include/linux/platform_data/media/coda.h new file mode 100644 index 000000000000..6ad4410d9e20 --- /dev/null +++ b/include/linux/platform_data/media/coda.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2013 Philipp Zabel, Pengutronix | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License as published by | ||
| 6 | * the Free Software Foundation; either version 2 of the License, or | ||
| 7 | * (at your option) any later version. | ||
| 8 | */ | ||
| 9 | #ifndef PLATFORM_CODA_H | ||
| 10 | #define PLATFORM_CODA_H | ||
| 11 | |||
| 12 | struct device; | ||
| 13 | |||
| 14 | struct coda_platform_data { | ||
| 15 | struct device *iram_dev; | ||
| 16 | }; | ||
| 17 | |||
| 18 | #endif | ||
