mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-27 01:11:31 +00:00
b5dcee225c
Currently, include/media is messy, as it contains both the V4L2 core
headers and some driver-specific headers on the same place. That makes
harder to identify what core headers should be documented and what
headers belong to I2C drivers that are included only by bridge/main
drivers that would require the functions provided by them.
Let's move those i2c specific files to its own subdirectory.
The files to move were produced via the following script:
mkdir include/media/i2c
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
(cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done)
for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done
And the references corrected via this script:
MAIN_DIR="media/"
PREV_DIR="media/"
DIRS="i2c/"
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
Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
83 lines
2.5 KiB
C
83 lines
2.5 KiB
C
/*
|
|
* include/media/i2c/smiapp.h
|
|
*
|
|
* Generic driver for SMIA/SMIA++ compliant camera modules
|
|
*
|
|
* Copyright (C) 2011--2012 Nokia Corporation
|
|
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
|
|
*
|
|
* 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 published by the Free Software Foundation.
|
|
*
|
|
* 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 __SMIAPP_H_
|
|
#define __SMIAPP_H_
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
#define SMIAPP_NAME "smiapp"
|
|
|
|
#define SMIAPP_DFL_I2C_ADDR (0x20 >> 1) /* Default I2C Address */
|
|
#define SMIAPP_ALT_I2C_ADDR (0x6e >> 1) /* Alternate I2C Address */
|
|
|
|
#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK 0
|
|
#define SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE 1
|
|
#define SMIAPP_CSI_SIGNALLING_MODE_CSI2 2
|
|
|
|
#define SMIAPP_NO_XSHUTDOWN -1
|
|
|
|
/*
|
|
* Sometimes due to board layout considerations the camera module can be
|
|
* mounted rotated. The typical rotation used is 180 degrees which can be
|
|
* corrected by giving a default H-FLIP and V-FLIP in the sensor readout.
|
|
* FIXME: rotation also changes the bayer pattern.
|
|
*/
|
|
enum smiapp_module_board_orient {
|
|
SMIAPP_MODULE_BOARD_ORIENT_0 = 0,
|
|
SMIAPP_MODULE_BOARD_ORIENT_180,
|
|
};
|
|
|
|
struct smiapp_flash_strobe_parms {
|
|
u8 mode;
|
|
u32 strobe_width_high_us;
|
|
u16 strobe_delay;
|
|
u16 stobe_start_point;
|
|
u8 trigger;
|
|
};
|
|
|
|
struct smiapp_platform_data {
|
|
/*
|
|
* Change the cci address if i2c_addr_alt is set.
|
|
* Both default and alternate cci addr need to be present
|
|
*/
|
|
unsigned short i2c_addr_dfl; /* Default i2c addr */
|
|
unsigned short i2c_addr_alt; /* Alternate i2c addr */
|
|
|
|
uint32_t nvm_size; /* bytes */
|
|
uint32_t ext_clk; /* sensor external clk */
|
|
|
|
unsigned int lanes; /* Number of CSI-2 lanes */
|
|
uint32_t csi_signalling_mode; /* SMIAPP_CSI_SIGNALLING_MODE_* */
|
|
uint64_t *op_sys_clock;
|
|
|
|
enum smiapp_module_board_orient module_board_orient;
|
|
|
|
struct smiapp_flash_strobe_parms *strobe_setup;
|
|
|
|
int (*set_xclk)(struct v4l2_subdev *sd, int hz);
|
|
int32_t xshutdown; /* gpio or SMIAPP_NO_XSHUTDOWN */
|
|
};
|
|
|
|
#endif /* __SMIAPP_H_ */
|