[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>
This commit is contained in:
44
include/linux/platform_data/media/camera-mx2.h
Normal file
44
include/linux/platform_data/media/camera-mx2.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* mx2-cam.h - i.MX27/i.MX25 camera driver header file
|
||||
*
|
||||
* Copyright (C) 2003, Intel Corporation
|
||||
* Copyright (C) 2008, Sascha Hauer <s.hauer@pengutronix.de>
|
||||
* Copyright (C) 2010, Baruch Siach <baruch@tkos.co.il>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef __MACH_MX2_CAM_H_
|
||||
#define __MACH_MX2_CAM_H_
|
||||
|
||||
#define MX2_CAMERA_EXT_VSYNC (1 << 1)
|
||||
#define MX2_CAMERA_CCIR (1 << 2)
|
||||
#define MX2_CAMERA_CCIR_INTERLACE (1 << 3)
|
||||
#define MX2_CAMERA_HSYNC_HIGH (1 << 4)
|
||||
#define MX2_CAMERA_GATED_CLOCK (1 << 5)
|
||||
#define MX2_CAMERA_INV_DATA (1 << 6)
|
||||
#define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7)
|
||||
|
||||
/**
|
||||
* struct mx2_camera_platform_data - optional platform data for mx2_camera
|
||||
* @flags: any combination of MX2_CAMERA_*
|
||||
* @clk: clock rate of the csi block / 2
|
||||
*/
|
||||
struct mx2_camera_platform_data {
|
||||
unsigned long flags;
|
||||
unsigned long clk;
|
||||
};
|
||||
|
||||
#endif /* __MACH_MX2_CAM_H_ */
|
52
include/linux/platform_data/media/camera-mx3.h
Normal file
52
include/linux/platform_data/media/camera-mx3.h
Normal file
@@ -0,0 +1,52 @@
|
||||
/*
|
||||
* mx3_camera.h - i.MX3x camera driver header file
|
||||
*
|
||||
* Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef _MX3_CAMERA_H_
|
||||
#define _MX3_CAMERA_H_
|
||||
|
||||
#include <linux/device.h>
|
||||
|
||||
#define MX3_CAMERA_CLK_SRC 1
|
||||
#define MX3_CAMERA_EXT_VSYNC 2
|
||||
#define MX3_CAMERA_DP 4
|
||||
#define MX3_CAMERA_PCP 8
|
||||
#define MX3_CAMERA_HSP 0x10
|
||||
#define MX3_CAMERA_VSP 0x20
|
||||
#define MX3_CAMERA_DATAWIDTH_4 0x40
|
||||
#define MX3_CAMERA_DATAWIDTH_8 0x80
|
||||
#define MX3_CAMERA_DATAWIDTH_10 0x100
|
||||
#define MX3_CAMERA_DATAWIDTH_15 0x200
|
||||
|
||||
#define MX3_CAMERA_DATAWIDTH_MASK (MX3_CAMERA_DATAWIDTH_4 | MX3_CAMERA_DATAWIDTH_8 | \
|
||||
MX3_CAMERA_DATAWIDTH_10 | MX3_CAMERA_DATAWIDTH_15)
|
||||
|
||||
struct v4l2_async_subdev;
|
||||
|
||||
/**
|
||||
* struct mx3_camera_pdata - i.MX3x camera platform data
|
||||
* @flags: MX3_CAMERA_* flags
|
||||
* @mclk_10khz: master clock frequency in 10kHz units
|
||||
* @dma_dev: IPU DMA device to match against in channel allocation
|
||||
*/
|
||||
struct mx3_camera_pdata {
|
||||
unsigned long flags;
|
||||
unsigned long mclk_10khz;
|
||||
struct device *dma_dev;
|
||||
struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
|
||||
int *asd_sizes; /* 0-terminated array of asd group sizes */
|
||||
};
|
||||
|
||||
#endif
|
44
include/linux/platform_data/media/camera-pxa.h
Normal file
44
include/linux/platform_data/media/camera-pxa.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
camera.h - PXA camera driver header file
|
||||
|
||||
Copyright (C) 2003, Intel Corporation
|
||||
Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_CAMERA_H_
|
||||
#define __ASM_ARCH_CAMERA_H_
|
||||
|
||||
#define PXA_CAMERA_MASTER 1
|
||||
#define PXA_CAMERA_DATAWIDTH_4 2
|
||||
#define PXA_CAMERA_DATAWIDTH_5 4
|
||||
#define PXA_CAMERA_DATAWIDTH_8 8
|
||||
#define PXA_CAMERA_DATAWIDTH_9 0x10
|
||||
#define PXA_CAMERA_DATAWIDTH_10 0x20
|
||||
#define PXA_CAMERA_PCLK_EN 0x40
|
||||
#define PXA_CAMERA_MCLK_EN 0x80
|
||||
#define PXA_CAMERA_PCP 0x100
|
||||
#define PXA_CAMERA_HSP 0x200
|
||||
#define PXA_CAMERA_VSP 0x400
|
||||
|
||||
struct pxacamera_platform_data {
|
||||
unsigned long flags;
|
||||
unsigned long mclk_10khz;
|
||||
};
|
||||
|
||||
extern void pxa_set_camera_info(struct pxacamera_platform_data *);
|
||||
|
||||
#endif /* __ASM_ARCH_CAMERA_H_ */
|
25
include/linux/platform_data/media/camera-rcar.h
Normal file
25
include/linux/platform_data/media/camera-rcar.h
Normal file
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* Platform data for Renesas R-Car VIN soc-camera driver
|
||||
*
|
||||
* Copyright (C) 2011-2013 Renesas Solutions Corp.
|
||||
* Copyright (C) 2013 Cogent Embedded, Inc., <source@cogentembedded.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef __CAMERA_RCAR_H_
|
||||
#define __CAMERA_RCAR_H_
|
||||
|
||||
#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0)
|
||||
#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
|
||||
#define RCAR_VIN_BT601 (1 << 2)
|
||||
#define RCAR_VIN_BT656 (1 << 3)
|
||||
|
||||
struct rcar_vin_platform_data {
|
||||
unsigned int flags;
|
||||
};
|
||||
|
||||
#endif /* __CAMERA_RCAR_H_ */
|
18
include/linux/platform_data/media/coda.h
Normal file
18
include/linux/platform_data/media/coda.h
Normal file
@@ -0,0 +1,18 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Philipp Zabel, Pengutronix
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
#ifndef PLATFORM_CODA_H
|
||||
#define PLATFORM_CODA_H
|
||||
|
||||
struct device;
|
||||
|
||||
struct coda_platform_data {
|
||||
struct device *iram_dev;
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user