4 files changed, 215 insertions, 0 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index dc71eaea6af8..e6186b338a12 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 040bc0492007..e541932a789b 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
diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c
new file mode 100644
index 000000000000..1b3cbd02a7fd
--- /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);
+
+        *std = determine_norm(client);
+        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'
+ */
+
+static int adv7180_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+        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))
+                return -EIO;
+
+        v4l_info(client, "chip found @ 0x%02x (%s)\n",
+                        client->addr << 1, client->adapter->name);
+
+        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 */
+        /* enable autodetection */
+        ret = i2c_smbus_write_byte_data(client, ADV7180_INPUT_CONTROL_REG,
+                ADV7180_INPUT_CONTROL_PAL_BG_NTSC_J_SECAM);
+        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;
+}
+
+static int adv7180_remove(struct i2c_client *client)
+{
+        struct v4l2_subdev *sd = i2c_get_clientdata(client);
+
+        v4l2_device_unregister_subdev(sd);
+        kfree(to_state(sd));
+        return 0;
+}
+
+static const struct i2c_device_id adv7180_id[] = {
+        {DRIVER_NAME, 0},
+        {},
+};
+
+MODULE_DEVICE_TABLE(i2c, 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");
+
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 94e908c0d7a0..cf16689adba7 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -135,6 +135,9 @@ enum {
         /* module adv7175: just ident 7175 */
         V4L2_IDENT_ADV7175 = 7175,
 
+        /* module adv7180: just ident 7180 */
+        V4L2_IDENT_ADV7180 = 7180,
+
         /* module saa7185: just ident 7185 */
         V4L2_IDENT_SAA7185 = 7185,