Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...

21 files changed, 293 insertions, 135 deletions

diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index eb7fddf8f607..6dc37fae6606 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -60,6 +60,7 @@ enum rc_driver_type {
  * @s_idle: optional: enable/disable hardware idle mode, upon which,
         device doesn't interrupt host until it sees IR pulses
  * @s_learning_mode: enable wide band receiver used for learning
+ * @s_carrier_report: enable carrier reports
  */
 struct ir_dev_props {
         enum rc_driver_type     driver_type;
@@ -82,8 +83,9 @@ struct ir_dev_props {
         int                     (*s_tx_duty_cycle)(void *priv, u32 duty_cycle);
         int                     (*s_rx_carrier_range)(void *priv, u32 min, u32 max);
         int                     (*tx_ir)(void *priv, int *txbuf, u32 n);
-        void                    (*s_idle)(void *priv, int enable);
+        void                    (*s_idle)(void *priv, bool enable);
         int                     (*s_learning_mode)(void *priv, int enable);
+        int                     (*s_carrier_report) (void *priv, int enable);
 };
 
 struct ir_input_dev {
@@ -157,27 +159,54 @@ void ir_input_unregister(struct input_dev *input_dev);
 
 void ir_repeat(struct input_dev *dev);
 void ir_keydown(struct input_dev *dev, int scancode, u8 toggle);
+void ir_keyup(struct ir_input_dev *ir);
 u32 ir_g_keycode_from_table(struct input_dev *input_dev, u32 scancode);
 
 /* From ir-raw-event.c */
 
 struct ir_raw_event {
-        unsigned                        pulse:1;
-        unsigned                        duration:31;
+        union {
+                u32             duration;
+
+                struct {
+                        u32     carrier;
+                        u8      duty_cycle;
+                };
+        };
+
+        unsigned                pulse:1;
+        unsigned                reset:1;
+        unsigned                timeout:1;
+        unsigned                carrier_report:1;
 };
 
-#define IR_MAX_DURATION                 0x7FFFFFFF      /* a bit more than 2 seconds */
+#define DEFINE_IR_RAW_EVENT(event) \
+        struct ir_raw_event event = { \
+                { .duration = 0 } , \
+                .pulse = 0, \
+                .reset = 0, \
+                .timeout = 0, \
+                .carrier_report = 0 }
+
+static inline void init_ir_raw_event(struct ir_raw_event *ev)
+{
+        memset(ev, 0, sizeof(*ev));
+}
+
+#define IR_MAX_DURATION         0xFFFFFFFF      /* a bit more than 4 seconds */
 
 void ir_raw_event_handle(struct input_dev *input_dev);
 int ir_raw_event_store(struct input_dev *input_dev, struct ir_raw_event *ev);
 int ir_raw_event_store_edge(struct input_dev *input_dev, enum raw_event_type type);
 int ir_raw_event_store_with_filter(struct input_dev *input_dev,
                                 struct ir_raw_event *ev);
-void ir_raw_event_set_idle(struct input_dev *input_dev, int idle);
+void ir_raw_event_set_idle(struct input_dev *input_dev, bool idle);
 
 static inline void ir_raw_event_reset(struct input_dev *input_dev)
 {
-        struct ir_raw_event ev = { .pulse = false, .duration = 0 };
+        DEFINE_IR_RAW_EVENT(ev);
+        ev.reset = true;
+
         ir_raw_event_store(input_dev, &ev);
         ir_raw_event_handle(input_dev);
 }
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 5e96d7a430be..557c676ab7dc 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -3,6 +3,8 @@
 
 #include <media/ir-common.h>
 
+#define DEFAULT_POLLING_INTERVAL        100     /* ms */
+
 struct IR_i2c;
 
 struct IR_i2c {
@@ -15,6 +17,8 @@ struct IR_i2c {
         /* Used to avoid fast repeating */
         unsigned char          old;
 
+        u32                    polling_interval; /* in ms */
+
         struct delayed_work    work;
         char                   name[32];
         char                   phys[32];
@@ -24,7 +28,6 @@ struct IR_i2c {
 enum ir_kbd_get_key_fn {
         IR_KBD_GET_KEY_CUSTOM = 0,
         IR_KBD_GET_KEY_PIXELVIEW,
-        IR_KBD_GET_KEY_PV951,
         IR_KBD_GET_KEY_HAUP,
         IR_KBD_GET_KEY_KNC1,
         IR_KBD_GET_KEY_FUSIONHDTV,
@@ -35,8 +38,9 @@ enum ir_kbd_get_key_fn {
 /* Can be passed when instantiating an ir_video i2c device */
 struct IR_i2c_init_data {
         char                    *ir_codes;
-        const char             *name;
-        u64          type; /* IR_TYPE_RC5, etc */
+        const char              *name;
+        u64                     type; /* IR_TYPE_RC5, etc */
+        u32                     polling_interval; /* 0 means DEFAULT_POLLING_INTERVAL */
         /*
          * Specify either a function pointer or a value indicating one of
          * ir_kbd_i2c's internal get_key functions
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index b1f60663cb39..54780a560d0e 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -125,10 +125,10 @@ static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
 struct lirc_driver {
         char name[40];
         int minor;
-        unsigned long code_length;
+        __u32 code_length;
         unsigned int buffer_size; /* in chunks holding one code each */
         int sample_rate;
-        unsigned long features;
+        __u32 features;
 
         unsigned int chunk_size;
 
@@ -139,7 +139,7 @@ struct lirc_driver {
         struct lirc_buffer *rbuf;
         int (*set_use_inc) (void *data);
         void (*set_use_dec) (void *data);
-        struct file_operations *fops;
+        const struct file_operations *fops;
         struct device *dev;
         struct module *owner;
 };
diff --git a/include/media/omap1_camera.h b/include/media/omap1_camera.h
new file mode 100644
index 000000000000..819767cf04d4
--- /dev/null
+++ b/include/media/omap1_camera.h
@@ -0,0 +1,35 @@
+/*
+ * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface
+ *
+ * Copyright (C) 2010, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
+ *
+ * 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.
+ */
+
+#ifndef __MEDIA_OMAP1_CAMERA_H_
+#define __MEDIA_OMAP1_CAMERA_H_
+
+#include <linux/bitops.h>
+
+#define OMAP1_CAMERA_IOSIZE             0x1c
+
+enum omap1_cam_vb_mode {
+        OMAP1_CAM_DMA_CONTIG = 0,
+        OMAP1_CAM_DMA_SG,
+};
+
+#define OMAP1_CAMERA_MIN_BUF_COUNT(x)   ((x) == OMAP1_CAM_DMA_CONTIG ? 3 : 2)
+
+struct omap1_cam_platform_data {
+        unsigned long   camexclk_khz;
+        unsigned long   lclk_khz_max;
+        unsigned long   flags;
+};
+
+#define OMAP1_CAMERA_LCLK_RISING        BIT(0)
+#define OMAP1_CAMERA_RST_LOW            BIT(1)
+#define OMAP1_CAMERA_RST_HIGH           BIT(2)
+
+#endif /* __MEDIA_OMAP1_CAMERA_H_ */
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 9b201ec8dc7f..e0f17edf38ed 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -17,12 +17,13 @@
 #define IR_TYPE_RC6     (1  << 2)       /* Philips RC6 protocol */
 #define IR_TYPE_JVC     (1  << 3)       /* JVC protocol */
 #define IR_TYPE_SONY    (1  << 4)       /* Sony12/15/20 protocol */
+#define IR_TYPE_RC5_SZ  (1  << 5)       /* RC5 variant used by Streamzap */
 #define IR_TYPE_LIRC    (1  << 30)      /* Pass raw IR to lirc userspace */
 #define IR_TYPE_OTHER   (1u << 31)
 
 #define IR_TYPE_ALL (IR_TYPE_RC5 | IR_TYPE_NEC  | IR_TYPE_RC6  | \
                      IR_TYPE_JVC | IR_TYPE_SONY | IR_TYPE_LIRC | \
-                     IR_TYPE_OTHER)
+                     IR_TYPE_RC5_SZ | IR_TYPE_OTHER)
 
 struct ir_scancode {
         u32     scancode;
@@ -54,6 +55,8 @@ void rc_map_init(void);
 /* Names of the several keytables defined in-kernel */
 
 #define RC_MAP_ADSTECH_DVB_T_PCI         "rc-adstech-dvb-t-pci"
+#define RC_MAP_ALINK_DTU_M               "rc-alink-dtu-m"
+#define RC_MAP_ANYSEE                    "rc-anysee"
 #define RC_MAP_APAC_VIEWCOMP             "rc-apac-viewcomp"
 #define RC_MAP_ASUS_PC39                 "rc-asus-pc39"
 #define RC_MAP_ATI_TV_WONDER_HD_600      "rc-ati-tv-wonder-hd-600"
@@ -62,8 +65,10 @@ void rc_map_init(void);
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
 #define RC_MAP_AVERMEDIA_M135A           "rc-avermedia-m135a"
 #define RC_MAP_AVERMEDIA_M733A_RM_K6     "rc-avermedia-m733a-rm-k6"
+#define RC_MAP_AVERMEDIA_RM_KS           "rc-avermedia-rm-ks"
 #define RC_MAP_AVERMEDIA                 "rc-avermedia"
 #define RC_MAP_AVERTV_303                "rc-avertv-303"
+#define RC_MAP_AZUREWAVE_AD_TU700        "rc-azurewave-ad-tu700"
 #define RC_MAP_BEHOLD_COLUMBUS           "rc-behold-columbus"
 #define RC_MAP_BEHOLD                    "rc-behold"
 #define RC_MAP_BUDGET_CI_OLD             "rc-budget-ci-old"
@@ -71,6 +76,8 @@ void rc_map_init(void);
 #define RC_MAP_CINERGY                   "rc-cinergy"
 #define RC_MAP_DIB0700_NEC_TABLE         "rc-dib0700-nec"
 #define RC_MAP_DIB0700_RC5_TABLE         "rc-dib0700-rc5"
+#define RC_MAP_DIGITALNOW_TINYTWIN       "rc-digitalnow-tinytwin"
+#define RC_MAP_DIGITTRADE                "rc-digittrade"
 #define RC_MAP_DM1105_NEC                "rc-dm1105-nec"
 #define RC_MAP_DNTV_LIVE_DVBT_PRO        "rc-dntv-live-dvbt-pro"
 #define RC_MAP_DNTV_LIVE_DVB_T           "rc-dntv-live-dvb-t"
@@ -94,8 +101,12 @@ void rc_map_init(void);
 #define RC_MAP_KAIOMY                    "rc-kaiomy"
 #define RC_MAP_KWORLD_315U               "rc-kworld-315u"
 #define RC_MAP_KWORLD_PLUS_TV_ANALOG     "rc-kworld-plus-tv-analog"
+#define RC_MAP_LEADTEK_Y04G0051          "rc-leadtek-y04g0051"
 #define RC_MAP_LIRC                      "rc-lirc"
+#define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
+#define RC_MAP_MSI_DIGIVOX_II            "rc-msi-digivox-ii"
+#define RC_MAP_MSI_DIGIVOX_III           "rc-msi-digivox-iii"
 #define RC_MAP_MSI_TVANYWHERE_PLUS       "rc-msi-tvanywhere-plus"
 #define RC_MAP_MSI_TVANYWHERE            "rc-msi-tvanywhere"
 #define RC_MAP_NEBULA                    "rc-nebula"
@@ -114,14 +125,18 @@ void rc_map_init(void);
 #define RC_MAP_PURPLETV                  "rc-purpletv"
 #define RC_MAP_PV951                     "rc-pv951"
 #define RC_MAP_RC5_HAUPPAUGE_NEW         "rc-rc5-hauppauge-new"
-#define RC_MAP_RC5_STREAMZAP             "rc-rc5-streamzap"
 #define RC_MAP_RC5_TV                    "rc-rc5-tv"
 #define RC_MAP_RC6_MCE                   "rc-rc6-mce"
 #define RC_MAP_REAL_AUDIO_220_32_KEYS    "rc-real-audio-220-32-keys"
+#define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 #define RC_MAP_TERRATEC_CINERGY_XS       "rc-terratec-cinergy-xs"
+#define RC_MAP_TERRATEC_SLIM             "rc-terratec-slim"
 #define RC_MAP_TEVII_NEC                 "rc-tevii-nec"
+#define RC_MAP_TOTAL_MEDIA_IN_HAND       "rc-total-media-in-hand"
+#define RC_MAP_TREKSTOR                  "rc-trekstor"
 #define RC_MAP_TT_1500                   "rc-tt-1500"
+#define RC_MAP_TWINHAN_VP1027_DVBS       "rc-twinhan1027"
 #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
 #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 #define RC_MAP_WINFAST                   "rc-winfast"
diff --git a/include/media/s3c_fimc.h b/include/media/s3c_fimc.h
new file mode 100644
index 000000000000..ca1b6738e4a4
--- /dev/null
+++ b/include/media/s3c_fimc.h
@@ -0,0 +1,60 @@
+/*
+ * Samsung S5P SoC camera interface driver header
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd
+ * Author: Sylwester Nawrocki, <s.nawrocki@samsung.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.
+ */
+
+#ifndef S3C_FIMC_H_
+#define S3C_FIMC_H_
+
+enum cam_bus_type {
+        FIMC_ITU_601 = 1,
+        FIMC_ITU_656,
+        FIMC_MIPI_CSI2,
+        FIMC_LCD_WB, /* FIFO link from LCD mixer */
+};
+
+#define FIMC_CLK_INV_PCLK       (1 << 0)
+#define FIMC_CLK_INV_VSYNC      (1 << 1)
+#define FIMC_CLK_INV_HREF       (1 << 2)
+#define FIMC_CLK_INV_HSYNC      (1 << 3)
+
+struct i2c_board_info;
+
+/**
+ * struct s3c_fimc_isp_info - image sensor information required for host
+ *                            interace configuration.
+ *
+ * @board_info: pointer to I2C subdevice's board info
+ * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
+ * @i2c_bus_num: i2c control bus id the sensor is attached to
+ * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
+ * @bus_width: camera data bus width in bits
+ * @flags: flags defining bus signals polarity inversion (High by default)
+ */
+struct s3c_fimc_isp_info {
+        struct i2c_board_info *board_info;
+        enum cam_bus_type bus_type;
+        u16 i2c_bus_num;
+        u16 mux_id;
+        u16 bus_width;
+        u16 flags;
+};
+
+
+#define FIMC_MAX_CAMIF_CLIENTS  2
+
+/**
+ * struct s3c_platform_fimc - camera host interface platform data
+ *
+ * @isp_info: properties of camera sensor required for host interface setup
+ */
+struct s3c_platform_fimc {
+        struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
+};
+#endif /* S3C_FIMC_H_ */
diff --git a/include/media/sh_vou.h b/include/media/sh_vou.h
index a3ef30242b00..ec3ba9a597a2 100644
--- a/include/media/sh_vou.h
+++ b/include/media/sh_vou.h
@@ -28,7 +28,6 @@ struct sh_vou_pdata {
         int i2c_adap;
         struct i2c_board_info *board_info;
         unsigned long flags;
-        char *module_name;
 };
 
 #endif
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 2ce957301f77..86e3631764ef 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -21,6 +21,8 @@
 
 extern struct bus_type soc_camera_bus_type;
 
+struct file;
+
 struct soc_camera_device {
         struct list_head list;
         struct device dev;
@@ -41,10 +43,7 @@ struct soc_camera_device {
         /* soc_camera.c private count. Only accessed with .video_lock held */
         int use_count;
         struct mutex video_lock;        /* Protects device data */
-};
-
-struct soc_camera_file {
-        struct soc_camera_device *icd;
+        struct file *streamer;          /* stream owner */
         struct videobuf_queue vb_vidq;
 };
 
@@ -79,7 +78,7 @@ struct soc_camera_host_ops {
         int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);
         void (*init_videobuf)(struct videobuf_queue *,
                               struct soc_camera_device *);
-        int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *);
+        int (*reqbufs)(struct soc_camera_device *, struct v4l2_requestbuffers *);
         int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);
         int (*set_bus_param)(struct soc_camera_device *, __u32);
         int (*get_ctrl)(struct soc_camera_device *, struct v4l2_control *);
diff --git a/include/media/sr030pc30.h b/include/media/sr030pc30.h
new file mode 100644
index 000000000000..6f901a653ba2
--- /dev/null
+++ b/include/media/sr030pc30.h
@@ -0,0 +1,21 @@
+/*
+ * Driver header for SR030PC30 camera sensor
+ *
+ * Copyright (c) 2010 Samsung Electronics, Co. Ltd
+ * Contact: Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef SR030PC30_H
+#define SR030PC30_H
+
+struct sr030pc30_platform_data {
+        unsigned long clk_rate; /* master clock frequency in Hz */
+        int (*set_power)(struct device *dev, int on);
+};
+
+#endif /* SR030PC30_H */
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 21b4428c12ab..51e89f2267b8 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -38,6 +38,9 @@ enum {
         /* module tvaudio: reserved range 50-99 */
         V4L2_IDENT_TVAUDIO = 50,        /* A tvaudio chip, unknown which it is exactly */
 
+        /* Sony IMX074 */
+        V4L2_IDENT_IMX074 = 74,
+
         /* module saa7110: just ident 100 */
         V4L2_IDENT_SAA7110 = 100,
 
@@ -70,6 +73,7 @@ enum {
         V4L2_IDENT_OV9655 = 255,
         V4L2_IDENT_SOI968 = 256,
         V4L2_IDENT_OV9640 = 257,
+        V4L2_IDENT_OV6650 = 258,
 
         /* module saa7146: reserved range 300-309 */
         V4L2_IDENT_SAA7146 = 300,
@@ -111,6 +115,10 @@ enum {
         V4L2_IDENT_VPX3216B = 3216,
         V4L2_IDENT_VPX3220A = 3220,
 
+        /* VX855 just ident 3409 */
+        /* Other via devs could use 3314, 3324, 3327, 3336, 3364, 3353 */
+        V4L2_IDENT_VIA_VX855 = 3409,
+
         /* module tvp5150 */
         V4L2_IDENT_TVP5150 = 5150,
 
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 98b32645e5a7..41dd480e45f1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
                            unsigned int hmax, unsigned int halign,
                            unsigned int salign);
 int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
+
+struct v4l2_discrete_probe {
+        const struct v4l2_frmsize_discrete      *sizes;
+        int                                     num_sizes;
+};
+
+const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+                const struct v4l2_discrete_probe *probe,
+                s32 width, s32 height);
+
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 1efcacbed01a..15802a067a12 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -21,8 +21,7 @@
 #define VFL_TYPE_GRABBER        0
 #define VFL_TYPE_VBI            1
 #define VFL_TYPE_RADIO          2
-#define VFL_TYPE_VTX            3
-#define VFL_TYPE_MAX            4
+#define VFL_TYPE_MAX            3
 
 struct v4l2_ioctl_callbacks;
 struct video_device;
@@ -42,8 +41,6 @@ struct v4l2_file_operations {
         unsigned int (*poll) (struct file *, struct poll_table_struct *);
         long (*ioctl) (struct file *, unsigned int, unsigned long);
         long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
-        unsigned long (*get_unmapped_area) (struct file *, unsigned long,
-                                unsigned long, unsigned long, unsigned long);
         int (*mmap) (struct file *, struct vm_area_struct *);
         int (*open) (struct file *);
         int (*release) (struct file *);
@@ -97,6 +94,9 @@ struct video_device
 
         /* ioctl callbacks */
         const struct v4l2_ioctl_ops *ioctl_ops;
+
+        /* serialization lock */
+        struct mutex *lock;
 };
 
 /* dev to video-device */
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index 8bcbd7a0271c..6648036b728d 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -101,46 +101,67 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
 /* Call the specified callback for all subdevs matching the condition.
    Ignore any errors. Note that you cannot add or delete a subdev
    while walking the subdevs list. */
-#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+#define __v4l2_device_call_subdevs_p(v4l2_dev, sd, cond, o, f, args...) \
         do {                                                            \
-                struct v4l2_subdev *sd;                                 \
+                list_for_each_entry((sd), &(v4l2_dev)->subdevs, list)   \
+                        if ((cond) && (sd)->ops->o && (sd)->ops->o->f)  \
+                                (sd)->ops->o->f((sd) , ##args);         \
+        } while (0)
+
+#define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
                                                                         \
-                list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)     \
-                        if ((cond) && sd->ops->o && sd->ops->o->f)      \
-                                sd->ops->o->f(sd , ##args);             \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd, cond, o,   \
+                                                f , ##args);            \
         } while (0)
 
 /* Call the specified callback for all subdevs matching the condition.
    If the callback returns an error other than 0 or -ENOIOCTLCMD, then
    return with that error code. Note that you cannot add or delete a
    subdev while walking the subdevs list. */
-#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+#define __v4l2_device_call_subdevs_until_err_p(v4l2_dev, sd, cond, o, f, args...) \
 ({                                                                      \
-        struct v4l2_subdev *sd;                                         \
-        long err = 0;                                                   \
+        long __err = 0;                                                 \
                                                                         \
-        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) {           \
-                if ((cond) && sd->ops->o && sd->ops->o->f)              \
-                        err = sd->ops->o->f(sd , ##args);               \
-                if (err && err != -ENOIOCTLCMD)                         \
+        list_for_each_entry((sd), &(v4l2_dev)->subdevs, list) {         \
+                if ((cond) && (sd)->ops->o && (sd)->ops->o->f)          \
+                        __err = (sd)->ops->o->f((sd) , ##args);         \
+                if (__err && __err != -ENOIOCTLCMD)                     \
                         break;                                          \
         }                                                               \
-        (err == -ENOIOCTLCMD) ? 0 : err;                                \
+        (__err == -ENOIOCTLCMD) ? 0 : __err;                            \
+})
+
+#define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd, cond, o, \
+                                                f, args...);            \
 })
 
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). Ignore any errors. Note that you cannot add or delete
    a subdev while walking the subdevs list. */
-#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
-        __v4l2_device_call_subdevs(v4l2_dev,                            \
-                        !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+#define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
+        do {                                                            \
+                struct v4l2_subdev *__sd;                               \
+                                                                        \
+                __v4l2_device_call_subdevs_p(v4l2_dev, __sd,            \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+        } while (0)
 
 /* Call the specified callback for all subdevs matching grp_id (if 0, then
    match them all). If the callback returns an error other than 0 or
    -ENOIOCTLCMD, then return with that error code. Note that you cannot
    add or delete a subdev while walking the subdevs list. */
 #define v4l2_device_call_until_err(v4l2_dev, grpid, o, f, args...)      \
-        __v4l2_device_call_subdevs_until_err(v4l2_dev,                  \
-                       !(grpid) || sd->grp_id == (grpid), o, f , ##args)
+({                                                                      \
+        struct v4l2_subdev *__sd;                                       \
+        __v4l2_device_call_subdevs_until_err_p(v4l2_dev, __sd,          \
+                        !(grpid) || __sd->grp_id == (grpid), o, f ,     \
+                        ##args);                                        \
+})
 
 #endif
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h
deleted file mode 100644
index 74bf741d1a9b..000000000000
--- a/include/media/v4l2-i2c-drv.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * v4l2-i2c-drv.h - contains I2C handling code that's identical for
- *                  all V4L2 I2C drivers. Use this header if the
- *                  I2C driver is only used by drivers converted
- *                  to the bus-based I2C API.
- *
- * Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-/* NOTE: the full version of this header is in the v4l-dvb repository
- * and allows v4l i2c drivers to be compiled on pre-2.6.26 kernels.
- * The version of this header as it appears in the kernel is a stripped
- * version (without all the backwards compatibility stuff) and so it
- * looks a bit odd.
- *
- * If you look at the full version then you will understand the reason
- * for introducing this header since you really don't want to have all
- * the tricky backwards compatibility code in each and every i2c driver.
- *
- * If the i2c driver will never be compiled for pre-2.6.26 kernels, then
- * DO NOT USE this header! Just write it as a regular i2c driver.
- */
-
-#ifndef __V4L2_I2C_DRV_H__
-#define __V4L2_I2C_DRV_H__
-
-#include <media/v4l2-common.h>
-
-struct v4l2_i2c_driver_data {
-        const char * const name;
-        int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);
-        int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);
-        int (*remove)(struct i2c_client *client);
-        int (*suspend)(struct i2c_client *client, pm_message_t state);
-        int (*resume)(struct i2c_client *client);
-        const struct i2c_device_id *id_table;
-};
-
-static struct v4l2_i2c_driver_data v4l2_i2c_data;
-static struct i2c_driver v4l2_i2c_driver;
-
-
-/* Bus-based I2C implementation for kernels >= 2.6.26 */
-
-static int __init v4l2_i2c_drv_init(void)
-{
-        v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;
-        v4l2_i2c_driver.command = v4l2_i2c_data.command;
-        v4l2_i2c_driver.probe = v4l2_i2c_data.probe;
-        v4l2_i2c_driver.remove = v4l2_i2c_data.remove;
-        v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend;
-        v4l2_i2c_driver.resume = v4l2_i2c_data.resume;
-        v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table;
-        return i2c_add_driver(&v4l2_i2c_driver);
-}
-
-
-static void __exit v4l2_i2c_drv_cleanup(void)
-{
-        i2c_del_driver(&v4l2_i2c_driver);
-}
-
-module_init(v4l2_i2c_drv_init);
-module_exit(v4l2_i2c_drv_cleanup);
-
-#endif /* __V4L2_I2C_DRV_H__ */
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index f0cf2e7def06..8e6559838ae3 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -28,10 +28,18 @@ enum v4l2_mbus_pixelcode {
         V4L2_MBUS_FMT_YVYU8_2X8,
         V4L2_MBUS_FMT_UYVY8_2X8,
         V4L2_MBUS_FMT_VYUY8_2X8,
+        V4L2_MBUS_FMT_YVYU10_2X10,
+        V4L2_MBUS_FMT_YUYV10_2X10,
+        V4L2_MBUS_FMT_YVYU10_1X20,
+        V4L2_MBUS_FMT_YUYV10_1X20,
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+        V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
         V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
         V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
         V4L2_MBUS_FMT_RGB565_2X8_LE,
         V4L2_MBUS_FMT_RGB565_2X8_BE,
+        V4L2_MBUS_FMT_BGR565_2X8_LE,
+        V4L2_MBUS_FMT_BGR565_2X8_BE,
         V4L2_MBUS_FMT_SBGGR8_1X8,
         V4L2_MBUS_FMT_SBGGR10_1X10,
         V4L2_MBUS_FMT_GREY8_1X8,
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 4a97d7341a94..b0316a7cf08d 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -256,10 +256,6 @@ struct v4l2_subdev_video_ops {
         int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
         int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
-        int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
-        int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-        int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-        int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
         int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
         int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
         int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
@@ -442,17 +438,28 @@ struct v4l2_subdev {
         /* can be used to group similar subdevs, value is driver-specific */
         u32 grp_id;
         /* pointer to private data */
-        void *priv;
+        void *dev_priv;
+        void *host_priv;
 };
 
 static inline void v4l2_set_subdevdata(struct v4l2_subdev *sd, void *p)
 {
-        sd->priv = p;
+        sd->dev_priv = p;
 }
 
 static inline void *v4l2_get_subdevdata(const struct v4l2_subdev *sd)
 {
-        return sd->priv;
+        return sd->dev_priv;
+}
+
+static inline void v4l2_set_subdev_hostdata(struct v4l2_subdev *sd, void *p)
+{
+        sd->host_priv = p;
+}
+
+static inline void *v4l2_get_subdev_hostdata(const struct v4l2_subdev *sd)
+{
+        return sd->host_priv;
 }
 
 static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
@@ -466,7 +473,8 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
         sd->flags = 0;
         sd->name[0] = '\0';
         sd->grp_id = 0;
-        sd->priv = NULL;
+        sd->dev_priv = NULL;
+        sd->host_priv = NULL;
 }
 
 /* Call an ops of a v4l2_subdev, doing the right checks against
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index f2c41cebf453..1d3835fc26be 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -139,6 +139,7 @@ struct videobuf_qtype_ops {
 
 struct videobuf_queue {
         struct mutex               vb_lock;
+        struct mutex               *ext_lock;
         spinlock_t                 *irqlock;
         struct device              *dev;
 
@@ -167,7 +168,20 @@ struct videobuf_queue {
         void                       *priv_data;
 };
 
-int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
+static inline void videobuf_queue_lock(struct videobuf_queue *q)
+{
+        if (!q->ext_lock)
+                mutex_lock(&q->vb_lock);
+}
+
+static inline void videobuf_queue_unlock(struct videobuf_queue *q)
+{
+        if (!q->ext_lock)
+                mutex_unlock(&q->vb_lock);
+}
+
+int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
+                int non_blocking, int intr);
 int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 struct v4l2_framebuffer *fbuf);
 
@@ -185,7 +199,8 @@ void videobuf_queue_core_init(struct videobuf_queue *q,
                          enum v4l2_field field,
                          unsigned int msize,
                          void *priv,
-                         struct videobuf_qtype_ops *int_ops);
+                         struct videobuf_qtype_ops *int_ops,
+                         struct mutex *ext_lock);
 int  videobuf_queue_is_busy(struct videobuf_queue *q);
 void videobuf_queue_cancel(struct videobuf_queue *q);
 
diff --git a/include/media/videobuf-dma-contig.h b/include/media/videobuf-dma-contig.h
index ebaa9bc1ee8d..f0ed82543d9f 100644
--- a/include/media/videobuf-dma-contig.h
+++ b/include/media/videobuf-dma-contig.h
@@ -23,7 +23,8 @@ void videobuf_queue_dma_contig_init(struct videobuf_queue *q,
                                     enum v4l2_buf_type type,
                                     enum v4l2_field field,
                                     unsigned int msize,
-                                    void *priv);
+                                    void *priv,
+                                    struct mutex *ext_lock);
 
 dma_addr_t videobuf_to_dma_contig(struct videobuf_buffer *buf);
 void videobuf_dma_contig_free(struct videobuf_queue *q,
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index aa4ebb42a565..1c647e8148c4 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -103,7 +103,8 @@ void videobuf_queue_sg_init(struct videobuf_queue *q,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
                          unsigned int msize,
-                         void *priv);
+                         void *priv,
+                         struct mutex *ext_lock);
 
 #endif /* _VIDEOBUF_DMA_SG_H */
 
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index e19403c18dae..486a97efdb56 100644
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -36,7 +36,8 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue *q,
                          enum v4l2_buf_type type,
                          enum v4l2_field field,
                          unsigned int msize,
-                         void *priv);
+                         void *priv,
+                         struct mutex *ext_lock);
 
 void *videobuf_to_vmalloc(struct videobuf_buffer *buf);
 
diff --git a/include/media/wm8775.h b/include/media/wm8775.h
index 60739c5a23ae..a1c4d417dfa2 100644
--- a/include/media/wm8775.h
+++ b/include/media/wm8775.h
@@ -32,4 +32,7 @@
 #define WM8775_AIN3 4
 #define WM8775_AIN4 8
 
+/* subdev group ID */
+#define WM8775_GID (1 << 0)
+
 #endif