mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +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>
71 lines
2.4 KiB
C
71 lines
2.4 KiB
C
/*
|
|
* include/media/i2c/as3645a.h
|
|
*
|
|
* Copyright (C) 2008-2011 Nokia Corporation
|
|
*
|
|
* Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
*
|
|
* 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 __AS3645A_H__
|
|
#define __AS3645A_H__
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
#define AS3645A_NAME "as3645a"
|
|
#define AS3645A_I2C_ADDR (0x60 >> 1) /* W:0x60, R:0x61 */
|
|
|
|
#define AS3645A_FLASH_TIMEOUT_MIN 100000 /* us */
|
|
#define AS3645A_FLASH_TIMEOUT_MAX 850000
|
|
#define AS3645A_FLASH_TIMEOUT_STEP 50000
|
|
|
|
#define AS3645A_FLASH_INTENSITY_MIN 200 /* mA */
|
|
#define AS3645A_FLASH_INTENSITY_MAX_1LED 500
|
|
#define AS3645A_FLASH_INTENSITY_MAX_2LEDS 400
|
|
#define AS3645A_FLASH_INTENSITY_STEP 20
|
|
|
|
#define AS3645A_TORCH_INTENSITY_MIN 20 /* mA */
|
|
#define AS3645A_TORCH_INTENSITY_MAX 160
|
|
#define AS3645A_TORCH_INTENSITY_STEP 20
|
|
|
|
#define AS3645A_INDICATOR_INTENSITY_MIN 0 /* uA */
|
|
#define AS3645A_INDICATOR_INTENSITY_MAX 10000
|
|
#define AS3645A_INDICATOR_INTENSITY_STEP 2500
|
|
|
|
/*
|
|
* as3645a_platform_data - Flash controller platform data
|
|
* @set_power: Set power callback
|
|
* @vref: VREF offset (0=0V, 1=+0.3V, 2=-0.3V, 3=+0.6V)
|
|
* @peak: Inductor peak current limit (0=1.25A, 1=1.5A, 2=1.75A, 3=2.0A)
|
|
* @ext_strobe: True if external flash strobe can be used
|
|
* @flash_max_current: Max flash current (mA, <= AS3645A_FLASH_INTENSITY_MAX)
|
|
* @torch_max_current: Max torch current (mA, >= AS3645A_TORCH_INTENSITY_MAX)
|
|
* @timeout_max: Max flash timeout (us, <= AS3645A_FLASH_TIMEOUT_MAX)
|
|
*/
|
|
struct as3645a_platform_data {
|
|
int (*set_power)(struct v4l2_subdev *subdev, int on);
|
|
unsigned int vref;
|
|
unsigned int peak;
|
|
bool ext_strobe;
|
|
|
|
/* Flash and torch currents and timeout limits */
|
|
unsigned int flash_max_current;
|
|
unsigned int torch_max_current;
|
|
unsigned int timeout_max;
|
|
};
|
|
|
|
#endif /* __AS3645A_H__ */
|