mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08: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>
113 lines
2.9 KiB
C
113 lines
2.9 KiB
C
/*
|
|
* Copyright (C) 2005-2006 Micronas USA Inc.
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/videodev2.h>
|
|
#include <media/v4l2-device.h>
|
|
#include <media/i2c/uda1342.h>
|
|
#include <linux/slab.h>
|
|
|
|
static int write_reg(struct i2c_client *client, int reg, int value)
|
|
{
|
|
/* UDA1342 wants MSB first, but SMBus sends LSB first */
|
|
i2c_smbus_write_word_data(client, reg, swab16(value));
|
|
return 0;
|
|
}
|
|
|
|
static int uda1342_s_routing(struct v4l2_subdev *sd,
|
|
u32 input, u32 output, u32 config)
|
|
{
|
|
struct i2c_client *client = v4l2_get_subdevdata(sd);
|
|
|
|
switch (input) {
|
|
case UDA1342_IN1:
|
|
write_reg(client, 0x00, 0x1241); /* select input 1 */
|
|
break;
|
|
case UDA1342_IN2:
|
|
write_reg(client, 0x00, 0x1441); /* select input 2 */
|
|
break;
|
|
default:
|
|
v4l2_err(sd, "input %d not supported\n", input);
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static const struct v4l2_subdev_audio_ops uda1342_audio_ops = {
|
|
.s_routing = uda1342_s_routing,
|
|
};
|
|
|
|
static const struct v4l2_subdev_ops uda1342_ops = {
|
|
.audio = &uda1342_audio_ops,
|
|
};
|
|
|
|
static int uda1342_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct i2c_adapter *adapter = client->adapter;
|
|
struct v4l2_subdev *sd;
|
|
|
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
|
|
return -ENODEV;
|
|
|
|
dev_dbg(&client->dev, "initializing UDA1342 at address %d on %s\n",
|
|
client->addr, adapter->name);
|
|
|
|
sd = devm_kzalloc(&client->dev, sizeof(*sd), GFP_KERNEL);
|
|
if (sd == NULL)
|
|
return -ENOMEM;
|
|
|
|
v4l2_i2c_subdev_init(sd, client, &uda1342_ops);
|
|
|
|
write_reg(client, 0x00, 0x8000); /* reset registers */
|
|
write_reg(client, 0x00, 0x1241); /* select input 1 */
|
|
|
|
v4l_info(client, "chip found @ 0x%02x (%s)\n",
|
|
client->addr << 1, client->adapter->name);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int uda1342_remove(struct i2c_client *client)
|
|
{
|
|
struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
|
v4l2_device_unregister_subdev(sd);
|
|
return 0;
|
|
}
|
|
|
|
static const struct i2c_device_id uda1342_id[] = {
|
|
{ "uda1342", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, uda1342_id);
|
|
|
|
static struct i2c_driver uda1342_driver = {
|
|
.driver = {
|
|
.name = "uda1342",
|
|
},
|
|
.probe = uda1342_probe,
|
|
.remove = uda1342_remove,
|
|
.id_table = uda1342_id,
|
|
};
|
|
|
|
module_i2c_driver(uda1342_driver);
|
|
|
|
MODULE_LICENSE("GPL v2");
|