diff mbox

[v2,1/1] video: initial support for ADV7180

Message ID 20090811164320.4aa29f0a.akpm@linux-foundation.org (mailing list archive)
State Changes Requested
Delegated to: Douglas Landgraf
Headers show

Commit Message

Andrew Morton Aug. 11, 2009, 11:43 p.m. UTC 
On Tue, 11 Aug 2009 16:40:24 +0200
Richard R__jfors <richard.rojfors@mocean-labs.com> wrote:

> This is an initial driver for Analog Devices ADV7180 Video Decoder.
> 
> So far it only supports setting the chip in autodetect mode and query 
> the detected standard.
> 
> Signed-off-by: Richard R__jfors <richard.rojfors.ext@mocean-labs.com>
> ---
> diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
> index 84b6fc1..ac9f636 100644
> --- a/drivers/media/video/Kconfig
> +++ b/drivers/media/video/Kconfig
> @@ -265,6 +265,15 @@ config VIDEO_SAA6588
> 
>   comment "Video decoders"
> 
> +config VIDEO_ADV7180
> +	tristate "Analog Devices ADV7180 decoder"
> +	depends on VIDEO_V4L2 && I2C
> +	---help---
> +	  Support for the Analog Devices ADV7180 video decoder.
> +
> +	  To compile this driver as a module, choose M here: the
> +	  module will be called adv7180.
> +
>   config VIDEO_BT819
>   	tristate "BT819A VideoStream decoder"
>   	depends on VIDEO_V4L2 && I2C
> diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
> index 9f2e321..aac0884 100644
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@ -45,6 +45,7 @@ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
>   obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
>   obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
>   obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
> +obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
>   obj-$(CONFIG_VIDEO_ADV7343) += adv7343.o
>   obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
>   obj-$(CONFIG_VIDEO_BT819) += bt819.o

Something made a mess of that hunk.

> diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c
> new file mode 100644
> index 0000000..6607321
> --- /dev/null
> +++ b/drivers/media/video/adv7180.c
> @@ -0,0 +1,202 @@
> +/*
> + * adv7180.c Analog Devices ADV7180 video decoder driver
> + * Copyright (c) 2009 Intel Corporation
> + *
> + * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/errno.h>
> +#include <linux/kernel.h>
> +#include <linux/interrupt.h>
> +#include <linux/i2c.h>
> +#include <linux/i2c-id.h>
> +#include <media/v4l2-ioctl.h>
> +#include <linux/videodev2.h>
> +#include <media/v4l2-device.h>
> +#include <media/v4l2-chip-ident.h>
> +
> +#define DRIVER_NAME "adv7180"
> +
> +#define ADV7180_INPUT_CONTROL_REG	0x00
> +#define ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM	0x00
> +#define ADV7180_AUTODETECT_ENABLE_REG	0x07
> +#define ADV7180_AUTODETECT_DEFAULT	0x7f
> +
> +
> +#define ADV7180_STATUS1_REG 0x10
> +#define ADV7180_STATUS1_AUTOD_MASK 0x70
> +#define ADV7180_STATUS1_AUTOD_NTSM_M_J	0x00
> +#define ADV7180_STATUS1_AUTOD_NTSC_4_43 0x10
> +#define ADV7180_STATUS1_AUTOD_PAL_M	0x20
> +#define ADV7180_STATUS1_AUTOD_PAL_60	0x30
> +#define ADV7180_STATUS1_AUTOD_PAL_B_G	0x40
> +#define ADV7180_STATUS1_AUTOD_SECAM	0x50
> +#define ADV7180_STATUS1_AUTOD_PAL_COMB	0x60
> +#define ADV7180_STATUS1_AUTOD_SECAM_525	0x70
> +
> +#define ADV7180_IDENT_REG 0x11
> +#define ADV7180_ID_7180 0x18
> +
> +
> +struct adv7180_state {
> +	struct v4l2_subdev sd;
> +};
> +
> +static v4l2_std_id determine_norm(struct i2c_client *client)
> +{
> +	u8 status1 = i2c_smbus_read_byte_data(client, ADV7180_STATUS1_REG);
> +
> +	switch (status1 & ADV7180_STATUS1_AUTOD_MASK) {
> +	case ADV7180_STATUS1_AUTOD_NTSM_M_J:
> +		return V4L2_STD_NTSC_M_JP;
> +	case ADV7180_STATUS1_AUTOD_NTSC_4_43:
> +		return V4L2_STD_NTSC_443;
> +	case ADV7180_STATUS1_AUTOD_PAL_M:
> +		return V4L2_STD_PAL_M;
> +	case ADV7180_STATUS1_AUTOD_PAL_60:
> +		return V4L2_STD_PAL_60;
> +	case ADV7180_STATUS1_AUTOD_PAL_B_G:
> +		return V4L2_STD_PAL;
> +	case ADV7180_STATUS1_AUTOD_SECAM:
> +		return V4L2_STD_SECAM;
> +	case ADV7180_STATUS1_AUTOD_PAL_COMB:
> +		return V4L2_STD_PAL_Nc | V4L2_STD_PAL_N;
> +	case ADV7180_STATUS1_AUTOD_SECAM_525:
> +		return V4L2_STD_SECAM;
> +	default:
> +		return V4L2_STD_UNKNOWN;
> +	}
> +}
> +
> +static inline struct adv7180_state *to_state(struct v4l2_subdev *sd)
> +{
> +	return container_of(sd, struct adv7180_state, sd);
> +}
> +
> +static int adv7180_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
> +{
> +	struct i2c_client *client = v4l2_get_subdevdata(sd);
> +
> +	*(v4l2_std_id *)std = determine_norm(client);

That cast appears to be unneeded?

I queued a patch to remove it.

> +	return 0;
> +}
> +
> +static int adv7180_g_chip_ident(struct v4l2_subdev *sd,
> +	struct v4l2_dbg_chip_ident *chip)
> +{
> +	struct i2c_client *client = v4l2_get_subdevdata(sd);
> +
> +	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7180, 0);
> +}
> +
> +static const struct v4l2_subdev_video_ops adv7180_video_ops = {
> +	.querystd = adv7180_querystd,
> +};
> +
> +static const struct v4l2_subdev_core_ops adv7180_core_ops = {
> +	.g_chip_ident = adv7180_g_chip_ident,
> +};
> +
> +static const struct v4l2_subdev_ops adv7180_ops = {
> +	.core = &adv7180_core_ops,
> +	.video = &adv7180_video_ops,
> +};
> +
> +/*
> + * Generic i2c probe
> + * concerning the addresses: i2c wants 7 bit (without the r/w bit), so 
> '>>1'

Your email client wordwrapped the patch.



Here's what you changed since v1:


 drivers/media/video/adv7180.c |   95 ++++++++++++--------------------
 1 file changed, 38 insertions(+), 57 deletions(-)
diff mbox

Patch

diff -puN drivers/media/video/adv7180.c~video-initial-support-for-adv7180-update drivers/media/video/adv7180.c
--- a/drivers/media/video/adv7180.c~video-initial-support-for-adv7180-update
+++ a/drivers/media/video/adv7180.c
@@ -27,8 +27,8 @@ 
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
+#define DRIVER_NAME "adv7180"
 
 #define ADV7180_INPUT_CONTROL_REG	0x00
 #define ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM	0x00
@@ -51,10 +51,6 @@ 
 #define ADV7180_ID_7180 0x18
 
 
-static unsigned short normal_i2c[] = { 0x42 >> 1, I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
-
 struct adv7180_state {
 	struct v4l2_subdev sd;
 };
@@ -98,16 +94,6 @@  static int adv7180_querystd(struct v4l2_
 	return 0;
 }
 
-static int adv7180_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-	return -EINVAL;
-}
-
-static int adv7180_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
-{
-	return -EINVAL;
-}
-
 static int adv7180_g_chip_ident(struct v4l2_subdev *sd,
 	struct v4l2_dbg_chip_ident *chip)
 {
@@ -116,26 +102,12 @@  static int adv7180_g_chip_ident(struct v
 	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7180, 0);
 }
 
-static int adv7180_log_status(struct v4l2_subdev *sd)
-{
-	v4l2_info(sd, "Normal operation\n");
-	return 0;
-}
-
-static irqreturn_t adv7180_irq(int irq, void *devid)
-{
-	return IRQ_NONE;
-}
-
 static const struct v4l2_subdev_video_ops adv7180_video_ops = {
 	.querystd = adv7180_querystd,
 };
 
 static const struct v4l2_subdev_core_ops adv7180_core_ops = {
-	.log_status = adv7180_log_status,
 	.g_chip_ident = adv7180_g_chip_ident,
-	.g_ctrl = adv7180_g_ctrl,
-	.s_ctrl = adv7180_s_ctrl,
 };
 
 static const struct v4l2_subdev_ops adv7180_ops = {
@@ -153,6 +125,7 @@  static int adv7180_probe(struct i2c_clie
 {
 	struct adv7180_state *state;
 	struct v4l2_subdev *sd;
+	int ret;
 
 	/* Check if the adapter supports the needed features */
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
@@ -161,32 +134,26 @@  static int adv7180_probe(struct i2c_clie
 	v4l_info(client, "chip found @ 0x%02x (%s)\n",
 			client->addr << 1, client->adapter->name);
 
-	state = kmalloc(sizeof(struct adv7180_state), GFP_KERNEL);
+	state = kzalloc(sizeof(struct adv7180_state), GFP_KERNEL);
 	if (state == NULL)
 		return -ENOMEM;
 	sd = &state->sd;
 	v4l2_i2c_subdev_init(sd, client, &adv7180_ops);
 
 	/* Initialize adv7180 */
-
-	/* register interrupt, can be used later */
-	if (client->irq > 0) {
-		/* we can use IRQ */
-		int err = request_irq(client->irq, adv7180_irq, IRQF_SHARED,
-			"adv7180", sd);
-		if (err) {
-			printk(KERN_ERR "adv7180: Failed to request IRQ\n");
-			v4l2_device_unregister_subdev(sd);
-			kfree(state);
-			return err;
-		}
-	}
-
 	/* enable autodetection */
-	i2c_smbus_write_byte_data(client, ADV7180_INPUT_CONTROL_REG,
+	ret = i2c_smbus_write_byte_data(client, ADV7180_INPUT_CONTROL_REG,
 		ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM);
-	i2c_smbus_write_byte_data(client, ADV7180_AUTODETECT_ENABLE_REG,
-		ADV7180_AUTODETECT_DEFAULT);
+	if (ret > 0)
+		ret = i2c_smbus_write_byte_data(client,
+			ADV7180_AUTODETECT_ENABLE_REG,
+			ADV7180_AUTODETECT_DEFAULT);
+	if (ret < 0) {
+		printk(KERN_ERR DRIVER_NAME
+			": Failed to communicate to chip: %d\n", ret);
+		return ret;
+	}
+
 	return 0;
 }
 
@@ -194,27 +161,41 @@  static int adv7180_remove(struct i2c_cli
 {
 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
 
-	if (client->irq > 0)
-		free_irq(client->irq, sd);
-
 	v4l2_device_unregister_subdev(sd);
 	kfree(to_state(sd));
 	return 0;
 }
 
 static const struct i2c_device_id adv7180_id[] = {
-	{ "adv7180", 0 },
-	{ }
+	{DRIVER_NAME, 0},
+	{},
 };
+
 MODULE_DEVICE_TABLE(i2c, adv7180_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-	.name = "adv7180",
-	.probe = adv7180_probe,
-	.remove = adv7180_remove,
-	.id_table = adv7180_id,
+static struct i2c_driver adv7180_driver = {
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= DRIVER_NAME,
+	},
+	.probe		= adv7180_probe,
+	.remove		= adv7180_remove,
+	.id_table	= adv7180_id,
 };
 
+static __init int adv7180_init(void)
+{
+	return i2c_add_driver(&adv7180_driver);
+}
+
+static __exit void adv7180_exit(void)
+{
+	i2c_del_driver(&adv7180_driver);
+}
+
+module_init(adv7180_init);
+module_exit(adv7180_exit);
+
 MODULE_DESCRIPTION("Analog Devices ADV7180 video decoder driver");
 MODULE_AUTHOR("Mocean Laboratories");
 MODULE_LICENSE("GPL v2");