20 files changed, 380 insertions, 156 deletions

diff --git a/include/media/m5mols.h b/include/media/m5mols.h
index aac2c0e06d5e..4a825ae5c6c8 100644
--- a/include/media/m5mols.h
+++ b/include/media/m5mols.h
@@ -18,15 +18,13 @@
 
 /**
  * struct m5mols_platform_data - platform data for M-5MOLS driver
- * @irq:        GPIO getting the irq pin of M-5MOLS
  * @gpio_reset: GPIO driving the reset pin of M-5MOLS
- * @reset_polarity: active state for gpio_rst pin, 0 or 1
+ * @reset_polarity: active state for gpio_reset pin, 0 or 1
  * @set_power:  an additional callback to the board setup code
  *              to be called after enabling and before disabling
  *              the sensor's supply regulators
  */
 struct m5mols_platform_data {
-        int irq;
         int gpio_reset;
         u8 reset_polarity;
         int (*set_power)(struct device *dev, int on);
diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
new file mode 100644
index 000000000000..96448c7a318b
--- /dev/null
+++ b/include/media/mt9p031.h
@@ -0,0 +1,19 @@
+#ifndef MT9P031_H
+#define MT9P031_H
+
+struct v4l2_subdev;
+
+enum {
+        MT9P031_COLOR_VERSION,
+        MT9P031_MONOCHROME_VERSION,
+};
+
+struct mt9p031_platform_data {
+        int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
+        int (*reset)(struct v4l2_subdev *subdev, int active);
+        int ext_freq; /* input frequency to the mt9p031 for PLL dividers */
+        int target_freq; /* frequency target for the PLL */
+        int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */
+};
+
+#endif
diff --git a/include/media/mt9t001.h b/include/media/mt9t001.h
new file mode 100644
index 000000000000..e839a78bb9c5
--- /dev/null
+++ b/include/media/mt9t001.h
@@ -0,0 +1,8 @@
+#ifndef _MEDIA_MT9T001_H
+#define _MEDIA_MT9T001_H
+
+struct mt9t001_platform_data {
+        unsigned int clk_pol:1;
+};
+
+#endif
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
new file mode 100644
index 000000000000..e917b1da6577
--- /dev/null
+++ b/include/media/omap3isp.h
@@ -0,0 +1,140 @@
+/*
+ * omap3isp.h
+ *
+ * TI OMAP3 ISP - Platform data
+ *
+ * Copyright (C) 2011 Nokia Corporation
+ *
+ * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ *           Sakari Ailus <sakari.ailus@iki.fi>
+ *
+ * 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 __MEDIA_OMAP3ISP_H__
+#define __MEDIA_OMAP3ISP_H__
+
+struct i2c_board_info;
+struct isp_device;
+
+enum isp_interface_type {
+        ISP_INTERFACE_PARALLEL,
+        ISP_INTERFACE_CSI2A_PHY2,
+        ISP_INTERFACE_CCP2B_PHY1,
+        ISP_INTERFACE_CCP2B_PHY2,
+        ISP_INTERFACE_CSI2C_PHY1,
+};
+
+enum {
+        ISP_BRIDGE_DISABLE = 0,
+        ISP_BRIDGE_LITTLE_ENDIAN = 2,
+        ISP_BRIDGE_BIG_ENDIAN = 3,
+};
+
+enum {
+        ISP_LANE_SHIFT_0 = 0,
+        ISP_LANE_SHIFT_2 = 1,
+        ISP_LANE_SHIFT_4 = 2,
+        ISP_LANE_SHIFT_6 = 3,
+};
+
+/**
+ * struct isp_parallel_platform_data - Parallel interface platform data
+ * @data_lane_shift: Data lane shifter
+ *              ISP_LANE_SHIFT_0 - CAMEXT[13:0] -> CAM[13:0]
+ *              ISP_LANE_SHIFT_2 - CAMEXT[13:2] -> CAM[11:0]
+ *              ISP_LANE_SHIFT_4 - CAMEXT[13:4] -> CAM[9:0]
+ *              ISP_LANE_SHIFT_6 - CAMEXT[13:6] -> CAM[7:0]
+ * @clk_pol: Pixel clock polarity
+ *              0 - Non Inverted, 1 - Inverted
+ * @hs_pol: Horizontal synchronization polarity
+ *              0 - Active high, 1 - Active low
+ * @vs_pol: Vertical synchronization polarity
+ *              0 - Active high, 1 - Active low
+ * @bridge: CCDC Bridge input control
+ *              ISP_BRIDGE_DISABLE - Disable
+ *              ISP_BRIDGE_LITTLE_ENDIAN - Little endian
+ *              ISP_BRIDGE_BIG_ENDIAN - Big endian
+ */
+struct isp_parallel_platform_data {
+        unsigned int data_lane_shift:2;
+        unsigned int clk_pol:1;
+        unsigned int hs_pol:1;
+        unsigned int vs_pol:1;
+        unsigned int bridge:2;
+};
+
+enum {
+        ISP_CCP2_PHY_DATA_CLOCK = 0,
+        ISP_CCP2_PHY_DATA_STROBE = 1,
+};
+
+enum {
+        ISP_CCP2_MODE_MIPI = 0,
+        ISP_CCP2_MODE_CCP2 = 1,
+};
+
+/**
+ * struct isp_ccp2_platform_data - CCP2 interface platform data
+ * @strobe_clk_pol: Strobe/clock polarity
+ *              0 - Non Inverted, 1 - Inverted
+ * @crc: Enable the cyclic redundancy check
+ * @ccp2_mode: Enable CCP2 compatibility mode
+ *              ISP_CCP2_MODE_MIPI - MIPI-CSI1 mode
+ *              ISP_CCP2_MODE_CCP2 - CCP2 mode
+ * @phy_layer: Physical layer selection
+ *              ISP_CCP2_PHY_DATA_CLOCK - Data/clock physical layer
+ *              ISP_CCP2_PHY_DATA_STROBE - Data/strobe physical layer
+ * @vpclk_div: Video port output clock control
+ */
+struct isp_ccp2_platform_data {
+        unsigned int strobe_clk_pol:1;
+        unsigned int crc:1;
+        unsigned int ccp2_mode:1;
+        unsigned int phy_layer:1;
+        unsigned int vpclk_div:2;
+};
+
+/**
+ * struct isp_csi2_platform_data - CSI2 interface platform data
+ * @crc: Enable the cyclic redundancy check
+ * @vpclk_div: Video port output clock control
+ */
+struct isp_csi2_platform_data {
+        unsigned crc:1;
+        unsigned vpclk_div:2;
+};
+
+struct isp_subdev_i2c_board_info {
+        struct i2c_board_info *board_info;
+        int i2c_adapter_id;
+};
+
+struct isp_v4l2_subdevs_group {
+        struct isp_subdev_i2c_board_info *subdevs;
+        enum isp_interface_type interface;
+        union {
+                struct isp_parallel_platform_data parallel;
+                struct isp_ccp2_platform_data ccp2;
+                struct isp_csi2_platform_data csi2;
+        } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */
+};
+
+struct isp_platform_data {
+        struct isp_v4l2_subdevs_group *subdevs;
+        void (*set_constraints)(struct isp_device *isp, bool enable);
+};
+
+#endif  /* __MEDIA_OMAP3ISP_H__ */
diff --git a/include/media/ov772x.h b/include/media/ov772x.h
index 548bf1155c83..00dbb7c4feae 100644
--- a/include/media/ov772x.h
+++ b/include/media/ov772x.h
@@ -12,12 +12,9 @@
 #ifndef __OV772X_H__
 #define __OV772X_H__
 
-#include <media/soc_camera.h>
-
 /* for flags */
 #define OV772X_FLAG_VFLIP       (1 << 0) /* Vertical flip image */
 #define OV772X_FLAG_HFLIP       (1 << 1) /* Horizontal flip image */
-#define OV772X_FLAG_8BIT        (1 << 2) /* default 10 bit */
 
 /*
  * for Edge ctrl
@@ -32,22 +29,23 @@ struct ov772x_edge_ctrl {
         unsigned char lower;
 };
 
-#define OV772X_MANUAL_EDGE_CTRL 0x80 /* un-used bit of strength */
-#define EDGE_STRENGTH_MASK      0x1F
-#define EDGE_THRESHOLD_MASK     0x0F
-#define EDGE_UPPER_MASK         0xFF
-#define EDGE_LOWER_MASK         0xFF
+#define OV772X_MANUAL_EDGE_CTRL         0x80 /* un-used bit of strength */
+#define OV772X_EDGE_STRENGTH_MASK       0x1F
+#define OV772X_EDGE_THRESHOLD_MASK      0x0F
+#define OV772X_EDGE_UPPER_MASK          0xFF
+#define OV772X_EDGE_LOWER_MASK          0xFF
 
 #define OV772X_AUTO_EDGECTRL(u, l)      \
 {                                       \
-        .upper = (u & EDGE_UPPER_MASK), \
-        .lower = (l & EDGE_LOWER_MASK), \
+        .upper = (u & OV772X_EDGE_UPPER_MASK),  \
+        .lower = (l & OV772X_EDGE_LOWER_MASK),  \
 }
 
-#define OV772X_MANUAL_EDGECTRL(s, t)                                    \
-{                                                                       \
-        .strength  = (s & EDGE_STRENGTH_MASK) | OV772X_MANUAL_EDGE_CTRL,\
-        .threshold = (t & EDGE_THRESHOLD_MASK),                         \
+#define OV772X_MANUAL_EDGECTRL(s, t)                    \
+{                                                       \
+        .strength  = (s & OV772X_EDGE_STRENGTH_MASK) |  \
+                        OV772X_MANUAL_EDGE_CTRL,        \
+        .threshold = (t & OV772X_EDGE_THRESHOLD_MASK),  \
 }
 
 /*
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index b1f19b77ecd4..b0c494a69079 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -23,8 +23,11 @@
 #include <media/rc-map.h>
 
 extern int rc_core_debug;
-#define IR_dprintk(level, fmt, arg...)  if (rc_core_debug >= level) \
-        printk(KERN_DEBUG "%s: " fmt , __func__, ## arg)
+#define IR_dprintk(level, fmt, ...)                             \
+do {                                                            \
+        if (rc_core_debug >= level)                             \
+                pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);  \
+} while (0)
 
 enum rc_driver_type {
         RC_DRIVER_SCANCODE = 0, /* Driver or hardware generates a scancode */
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 17c9759ae77b..26a3bd0fe57c 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -61,6 +61,7 @@ void rc_map_init(void);
 #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"
+#define RC_MAP_ATI_X10                   "rc-ati-x10"
 #define RC_MAP_AVERMEDIA_A16D            "rc-avermedia-a16d"
 #define RC_MAP_AVERMEDIA_CARDBUS         "rc-avermedia-cardbus"
 #define RC_MAP_AVERMEDIA_DVBT            "rc-avermedia-dvbt"
@@ -106,6 +107,7 @@ void rc_map_init(void);
 #define RC_MAP_LIRC                      "rc-lirc"
 #define RC_MAP_LME2510                   "rc-lme2510"
 #define RC_MAP_MANLI                     "rc-manli"
+#define RC_MAP_MEDION_X10                "rc-medion-x10"
 #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"
@@ -130,6 +132,7 @@ void rc_map_init(void);
 #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_SNAPSTREAM_FIREFLY        "rc-snapstream-firefly"
 #define RC_MAP_STREAMZAP                 "rc-streamzap"
 #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 #define RC_MAP_TECHNISAT_USB2            "rc-technisat-usb2"
diff --git a/include/media/s5k6aa.h b/include/media/s5k6aa.h
new file mode 100644
index 000000000000..ba34f7055e55
--- /dev/null
+++ b/include/media/s5k6aa.h
@@ -0,0 +1,51 @@
+/*
+ * S5K6AAFX camera sensor driver header
+ *
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ *
+ * 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 S5K6AA_H
+#define S5K6AA_H
+
+#include <media/v4l2-mediabus.h>
+
+/**
+ * struct s5k6aa_gpio - data structure describing a GPIO
+ * @gpio:  GPIO number
+ * @level: indicates active state of the @gpio
+ */
+struct s5k6aa_gpio {
+        int gpio;
+        int level;
+};
+
+/**
+ * struct s5k6aa_platform_data - s5k6aa driver platform data
+ * @set_power:   an additional callback to the board code, called
+ *               after enabling the regulators and before switching
+ *               the sensor off
+ * @mclk_frequency: sensor's master clock frequency in Hz
+ * @gpio_reset:  GPIO driving RESET pin
+ * @gpio_stby:   GPIO driving STBY pin
+ * @nlanes:      maximum number of MIPI-CSI lanes used
+ * @horiz_flip:  default horizontal image flip value, non zero to enable
+ * @vert_flip:   default vertical image flip value, non zero to enable
+ */
+
+struct s5k6aa_platform_data {
+        int (*set_power)(int enable);
+        unsigned long mclk_frequency;
+        struct s5k6aa_gpio gpio_reset;
+        struct s5k6aa_gpio gpio_stby;
+        enum v4l2_mbus_type bus_type;
+        u8 nlanes;
+        u8 horiz_flip;
+        u8 vert_flip;
+};
+
+#endif /* S5K6AA_H */
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index 9fdff8a4ed26..688fb3f1dc35 100644
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -19,11 +19,6 @@ enum cam_bus_type {
         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;
 
 /**
@@ -36,7 +31,8 @@ struct i2c_board_info;
  * @csi_data_align: MIPI-CSI interface data alignment in bits
  * @i2c_bus_num: i2c control bus id the sensor is attached to
  * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
- * @flags: flags defining bus signals polarity inversion (High by default)
+ * @clk_id: index of the SoC peripheral clock for sensors
+ * @flags: the parallel bus flags defining signals polarity (V4L2_MBUS_*)
  */
 struct s5p_fimc_isp_info {
         struct i2c_board_info *board_info;
@@ -46,6 +42,7 @@ struct s5p_fimc_isp_info {
         u16 i2c_bus_num;
         u16 mux_id;
         u16 flags;
+        u8 clk_id;
 };
 
 /**
@@ -58,4 +55,13 @@ struct s5p_platform_fimc {
         struct s5p_fimc_isp_info *isp_info;
         int num_clients;
 };
+
+/*
+ * v4l2_device notification id. This is only for internal use in the kernel.
+ * Sensor subdevs should issue S5P_FIMC_TX_END_NOTIFY notification in single
+ * frame capture mode when there is only one VSYNC pulse issued by the sensor
+ * at begining of the frame transmission.
+ */
+#define S5P_FIMC_TX_END_NOTIFY _IO('e', 0)
+
 #endif /* S5P_FIMC_H_ */
diff --git a/include/media/saa7146.h b/include/media/saa7146.h
index 6e84cde44b82..0f037e8edf9a 100644
--- a/include/media/saa7146.h
+++ b/include/media/saa7146.h
@@ -24,24 +24,32 @@
 
 extern unsigned int saa7146_debug;
 
-//#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),KBUILD_MODNAME,__func__)
-
 #ifndef DEBUG_VARIABLE
         #define DEBUG_VARIABLE saa7146_debug
 #endif
 
-#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME, __func__)
-#define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; }
-
-#define ERR(x) { DEBUG_PROLOG; printk x; }
-
-#define DEB_S(x)    if (0!=(DEBUG_VARIABLE&0x01)) { DEBUG_PROLOG; printk x; } /* simple debug messages */
-#define DEB_D(x)    if (0!=(DEBUG_VARIABLE&0x02)) { DEBUG_PROLOG; printk x; } /* more detailed debug messages */
-#define DEB_EE(x)   if (0!=(DEBUG_VARIABLE&0x04)) { DEBUG_PROLOG; printk x; } /* print enter and exit of functions */
-#define DEB_I2C(x)  if (0!=(DEBUG_VARIABLE&0x08)) { DEBUG_PROLOG; printk x; } /* i2c debug messages */
-#define DEB_VBI(x)  if (0!=(DEBUG_VARIABLE&0x10)) { DEBUG_PROLOG; printk x; } /* vbi debug messages */
-#define DEB_INT(x)  if (0!=(DEBUG_VARIABLE&0x20)) { DEBUG_PROLOG; printk x; } /* interrupt debug messages */
-#define DEB_CAP(x)  if (0!=(DEBUG_VARIABLE&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */
+#define ERR(fmt, ...)   pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
+
+#define _DBG(mask, fmt, ...)                                            \
+do {                                                                    \
+        if (DEBUG_VARIABLE & mask)                                      \
+                pr_debug("%s(): " fmt, __func__, ##__VA_ARGS__);        \
+} while (0)
+
+/* simple debug messages */
+#define DEB_S(fmt, ...)         _DBG(0x01, fmt, ##__VA_ARGS__)
+/* more detailed debug messages */
+#define DEB_D(fmt, ...)         _DBG(0x02, fmt, ##__VA_ARGS__)
+/* print enter and exit of functions */
+#define DEB_EE(fmt, ...)        _DBG(0x04, fmt, ##__VA_ARGS__)
+/* i2c debug messages */
+#define DEB_I2C(fmt, ...)       _DBG(0x08, fmt, ##__VA_ARGS__)
+/* vbi debug messages */
+#define DEB_VBI(fmt, ...)       _DBG(0x10, fmt, ##__VA_ARGS__)
+/* interrupt debug messages */
+#define DEB_INT(fmt, ...)       _DBG(0x20, fmt, ##__VA_ARGS__)
+/* capture debug messages */
+#define DEB_CAP(fmt, ...)       _DBG(0x40, fmt, ##__VA_ARGS__)
 
 #define SAA7146_ISR_CLEAR(x,y) \
         saa7146_write(x, ISR, (y));
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 7582952dceae..b1377b931eb7 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -12,12 +12,14 @@
 #ifndef SOC_CAMERA_H
 #define SOC_CAMERA_H
 
+#include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/videodev2.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf2-core.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 
 struct file;
@@ -37,8 +39,8 @@ struct soc_camera_device {
         unsigned char iface;            /* Host number */
         unsigned char devnum;           /* Device number per host */
         struct soc_camera_sense *sense; /* See comment in struct definition */
-        struct soc_camera_ops *ops;
         struct video_device *vdev;
+        struct v4l2_ctrl_handler ctrl_handler;
         const struct soc_camera_format_xlate *current_fmt;
         struct soc_camera_format_xlate *user_formats;
         int num_user_formats;
@@ -93,14 +95,10 @@ struct soc_camera_host_ops {
         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 *);
-        int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);
         int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
         int (*set_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
         int (*enum_fsizes)(struct soc_camera_device *, struct v4l2_frmsizeenum *);
         unsigned int (*poll)(struct file *, poll_table *);
-        const struct v4l2_queryctrl *controls;
-        int num_controls;
 };
 
 #define SOCAM_SENSOR_INVERT_PCLK        (1 << 0)
@@ -193,13 +191,6 @@ struct soc_camera_format_xlate {
         const struct soc_mbus_pixelfmt *host_fmt;
 };
 
-struct soc_camera_ops {
-        unsigned long (*query_bus_param)(struct soc_camera_device *);
-        int (*set_bus_param)(struct soc_camera_device *, unsigned long);
-        const struct v4l2_queryctrl *controls;
-        int num_controls;
-};
-
 #define SOCAM_SENSE_PCLK_CHANGED        (1 << 0)
 
 /**
@@ -226,65 +217,18 @@ struct soc_camera_sense {
         unsigned long pixel_clock;
 };
 
-static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
-        struct soc_camera_ops *ops, int id)
-{
-        int i;
-
-        for (i = 0; i < ops->num_controls; i++)
-                if (ops->controls[i].id == id)
-                        return &ops->controls[i];
-
-        return NULL;
-}
-
-#define SOCAM_MASTER                    (1 << 0)
-#define SOCAM_SLAVE                     (1 << 1)
-#define SOCAM_HSYNC_ACTIVE_HIGH         (1 << 2)
-#define SOCAM_HSYNC_ACTIVE_LOW          (1 << 3)
-#define SOCAM_VSYNC_ACTIVE_HIGH         (1 << 4)
-#define SOCAM_VSYNC_ACTIVE_LOW          (1 << 5)
-#define SOCAM_DATAWIDTH_4               (1 << 6)
-#define SOCAM_DATAWIDTH_8               (1 << 7)
-#define SOCAM_DATAWIDTH_9               (1 << 8)
-#define SOCAM_DATAWIDTH_10              (1 << 9)
-#define SOCAM_DATAWIDTH_15              (1 << 10)
-#define SOCAM_DATAWIDTH_16              (1 << 11)
-#define SOCAM_PCLK_SAMPLE_RISING        (1 << 12)
-#define SOCAM_PCLK_SAMPLE_FALLING       (1 << 13)
-#define SOCAM_DATA_ACTIVE_HIGH          (1 << 14)
-#define SOCAM_DATA_ACTIVE_LOW           (1 << 15)
-#define SOCAM_MIPI_1LANE                (1 << 16)
-#define SOCAM_MIPI_2LANE                (1 << 17)
-#define SOCAM_MIPI_3LANE                (1 << 18)
-#define SOCAM_MIPI_4LANE                (1 << 19)
-#define SOCAM_MIPI      (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \
-                        SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE)
+#define SOCAM_DATAWIDTH(x)      BIT((x) - 1)
+#define SOCAM_DATAWIDTH_4       SOCAM_DATAWIDTH(4)
+#define SOCAM_DATAWIDTH_8       SOCAM_DATAWIDTH(8)
+#define SOCAM_DATAWIDTH_9       SOCAM_DATAWIDTH(9)
+#define SOCAM_DATAWIDTH_10      SOCAM_DATAWIDTH(10)
+#define SOCAM_DATAWIDTH_15      SOCAM_DATAWIDTH(15)
+#define SOCAM_DATAWIDTH_16      SOCAM_DATAWIDTH(16)
 
 #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
                               SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
                               SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
 
-static inline unsigned long soc_camera_bus_param_compatible(
-                        unsigned long camera_flags, unsigned long bus_flags)
-{
-        unsigned long common_flags, hsync, vsync, pclk, data, buswidth, mode;
-        unsigned long mipi;
-
-        common_flags = camera_flags & bus_flags;
-
-        hsync = common_flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);
-        vsync = common_flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);
-        pclk = common_flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);
-        data = common_flags & (SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW);
-        mode = common_flags & (SOCAM_MASTER | SOCAM_SLAVE);
-        buswidth = common_flags & SOCAM_DATAWIDTH_MASK;
-        mipi = common_flags & SOCAM_MIPI;
-
-        return ((!hsync || !vsync || !pclk || !data || !mode || !buswidth) && !mipi) ? 0 :
-                common_flags;
-}
-
 static inline void soc_camera_limit_side(int *start, int *length,
                 unsigned int start_min,
                 unsigned int length_min, unsigned int length_max)
@@ -300,23 +244,37 @@ static inline void soc_camera_limit_side(int *start, int *length,
                 *start = start_min + length_max - *length;
 }
 
-extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
-                                                   unsigned long flags);
+unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
+                                            unsigned long flags);
+unsigned long soc_camera_apply_board_flags(struct soc_camera_link *icl,
+                                           const struct v4l2_mbus_config *cfg);
 
 /* This is only temporary here - until v4l2-subdev begins to link to video_device */
 #include <linux/i2c.h>
-static inline struct video_device *soc_camera_i2c_to_vdev(struct i2c_client *client)
+static inline struct video_device *soc_camera_i2c_to_vdev(const struct i2c_client *client)
+{
+        struct v4l2_subdev *sd = i2c_get_clientdata(client);
+        struct soc_camera_device *icd = (struct soc_camera_device *)sd->grp_id;
+        return icd ? icd->vdev : NULL;
+}
+
+static inline struct soc_camera_link *soc_camera_i2c_to_link(const struct i2c_client *client)
+{
+        return client->dev.platform_data;
+}
+
+static inline struct v4l2_subdev *soc_camera_vdev_to_subdev(const struct video_device *vdev)
 {
-        struct soc_camera_device *icd = client->dev.platform_data;
-        return icd->vdev;
+        struct soc_camera_device *icd = dev_get_drvdata(vdev->parent);
+        return soc_camera_to_subdev(icd);
 }
 
-static inline struct soc_camera_device *soc_camera_from_vb2q(struct vb2_queue *vq)
+static inline struct soc_camera_device *soc_camera_from_vb2q(const struct vb2_queue *vq)
 {
         return container_of(vq, struct soc_camera_device, vb2_vidq);
 }
 
-static inline struct soc_camera_device *soc_camera_from_vbq(struct videobuf_queue *vq)
+static inline struct soc_camera_device *soc_camera_from_vbq(const struct videobuf_queue *vq)
 {
         return container_of(vq, struct soc_camera_device, vb_vidq);
 }
diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index 74f0fa15ca47..8aa4200a0b1d 100644
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -13,6 +13,7 @@
 
 #include <linux/videodev2.h>
 #include <media/soc_camera.h>
+#include <media/v4l2-mediabus.h>
 
 struct device;
 
@@ -20,7 +21,8 @@ struct soc_camera_platform_info {
         const char *format_name;
         unsigned long format_depth;
         struct v4l2_mbus_framefmt format;
-        unsigned long bus_param;
+        unsigned long mbus_param;
+        enum v4l2_mbus_type mbus_type;
         struct soc_camera_device *icd;
         int (*set_capture)(struct soc_camera_platform_info *info, int enable);
 };
diff --git a/include/media/soc_mediabus.h b/include/media/soc_mediabus.h
index fae432544b41..73f1e7eb60f3 100644
--- a/include/media/soc_mediabus.h
+++ b/include/media/soc_mediabus.h
@@ -82,5 +82,7 @@ const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
 s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf);
 int soc_mbus_samples_per_pixel(const struct soc_mbus_pixelfmt *mf,
                         unsigned int *numerator, unsigned int *denominator);
+unsigned int soc_mbus_config_compatible(const struct v4l2_mbus_config *cfg,
+                                        unsigned int flags);
 
 #endif
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 63fd9d3db296..810a20928a21 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -212,9 +212,6 @@ enum {
         /* module sn9c20x: just ident 10000 */
         V4L2_IDENT_SN9C20X = 10000,
 
-        /* Siliconfile sensors: reserved range 10100 - 10199 */
-        V4L2_IDENT_NOON010PC30  = 10100,
-
         /* module cx231xx and cx25840 */
         V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
         V4L2_IDENT_CX23100    = 23100,
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 13fe4d744aba..eeb3df637144 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -65,14 +65,12 @@ struct v4l2_ctrl_ops {
   * @is_private: If set, then this control is private to its handler and it
   *             will not be added to any other handlers. Drivers can set
   *             this flag.
-  * @is_volatile: If set, then this control is volatile. This means that the
-  *             control's current value cannot be cached and needs to be
-  *             retrieved through the g_volatile_ctrl op. Drivers can set
-  *             this flag.
   * @is_auto:   If set, then this control selects whether the other cluster
   *             members are in 'automatic' mode or 'manual' mode. This is
   *             used for autogain/gain type clusters. Drivers should never
   *             set this flag directly.
+  * @has_volatiles: If set, then one or more members of the cluster are volatile.
+  *             Drivers should never touch this flag.
   * @manual_mode_value: If the is_auto flag is set, then this is the value
   *             of the auto control that determines if that control is in
   *             manual mode. So if the value of the auto control equals this
@@ -118,8 +116,8 @@ struct v4l2_ctrl {
 
         unsigned int is_new:1;
         unsigned int is_private:1;
-        unsigned int is_volatile:1;
         unsigned int is_auto:1;
+        unsigned int has_volatiles:1;
         unsigned int manual_mode_value:8;
 
         const struct v4l2_ctrl_ops *ops;
@@ -208,9 +206,6 @@ struct v4l2_ctrl_handler {
   *             must be NULL.
   * @is_private: If set, then this control is private to its handler and it
   *             will not be added to any other handlers.
-  * @is_volatile: If set, then this control is volatile. This means that the
-  *             control's current value cannot be cached and needs to be
-  *             retrieved through the g_volatile_ctrl op.
   */
 struct v4l2_ctrl_config {
         const struct v4l2_ctrl_ops *ops;
@@ -225,7 +220,6 @@ struct v4l2_ctrl_config {
         u32 menu_skip_mask;
         const char * const *qmenu;
         unsigned int is_private:1;
-        unsigned int is_volatile:1;
 };
 
 /** v4l2_ctrl_fill() - Fill in the control fields based on the control ID.
@@ -389,8 +383,7 @@ void v4l2_ctrl_cluster(unsigned ncontrols, struct v4l2_ctrl **controls);
   * @manual_val: The value for the first control in the cluster that equals the
   *             manual setting.
   * @set_volatile: If true, then all controls except the first auto control will
-  *             have is_volatile set to true. If false, then is_volatile will not
-  *             be touched.
+  *             be volatile.
   *
   * Use for control groups where one control selects some automatic feature and
   * the other controls are only active whenever the automatic feature is turned
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index dd9f1e7b8ff7..4d1c74ad4c84 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -122,6 +122,8 @@ struct v4l2_ioctl_ops {
         int (*vidioc_qbuf)    (struct file *file, void *fh, struct v4l2_buffer *b);
         int (*vidioc_dqbuf)   (struct file *file, void *fh, struct v4l2_buffer *b);
 
+        int (*vidioc_create_bufs)(struct file *file, void *fh, struct v4l2_create_buffers *b);
+        int (*vidioc_prepare_buf)(struct file *file, void *fh, struct v4l2_buffer *b);
 
         int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
         int (*vidioc_g_fbuf)   (struct file *file, void *fh,
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 6114007c8c74..83ae07e53350 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -22,8 +22,12 @@
  */
 #define V4L2_MBUS_MASTER                        (1 << 0)
 #define V4L2_MBUS_SLAVE                         (1 << 1)
-/* Which signal polarities it supports */
-/* Note: in BT.656 mode HSYNC and VSYNC are unused */
+/*
+ * Signal polarity flags
+ * Note: in BT.656 mode HSYNC, FIELD, and VSYNC are unused
+ * V4L2_MBUS_[HV]SYNC* flags should be also used for specifying
+ * configuration of hardware that uses [HV]REF signals
+ */
 #define V4L2_MBUS_HSYNC_ACTIVE_HIGH             (1 << 2)
 #define V4L2_MBUS_HSYNC_ACTIVE_LOW              (1 << 3)
 #define V4L2_MBUS_VSYNC_ACTIVE_HIGH             (1 << 4)
@@ -32,6 +36,10 @@
 #define V4L2_MBUS_PCLK_SAMPLE_FALLING           (1 << 7)
 #define V4L2_MBUS_DATA_ACTIVE_HIGH              (1 << 8)
 #define V4L2_MBUS_DATA_ACTIVE_LOW               (1 << 9)
+/* FIELD = 0/1 - Field1 (odd)/Field2 (even) */
+#define V4L2_MBUS_FIELD_EVEN_HIGH               (1 << 10)
+/* FIELD = 1/0 - Field1 (odd)/Field2 (even) */
+#define V4L2_MBUS_FIELD_EVEN_LOW                (1 << 11)
 
 /* Serial flags */
 /* How many lanes the client can use */
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 257da1a30f66..f0f3358d1b1b 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -158,6 +158,7 @@ struct v4l2_subdev_core_ops {
         int (*s_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
         int (*try_ext_ctrls)(struct v4l2_subdev *sd, struct v4l2_ext_controls *ctrls);
         int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
+        int (*g_std)(struct v4l2_subdev *sd, v4l2_std_id *norm);
         int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -534,13 +535,13 @@ struct v4l2_subdev {
         void *dev_priv;
         void *host_priv;
         /* subdev device node */
-        struct video_device devnode;
+        struct video_device *devnode;
 };
 
 #define media_entity_to_v4l2_subdev(ent) \
         container_of(ent, struct v4l2_subdev, entity)
 #define vdev_to_v4l2_subdev(vdev) \
-        container_of(vdev, struct v4l2_subdev, devnode)
+        video_get_drvdata(vdev)
 
 /*
  * Used for storing subdev information per file handle
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index f87472acbc51..a15d1f1b319e 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -75,7 +75,6 @@ struct vb2_mem_ops {
 
 struct vb2_plane {
         void                    *mem_priv;
-        int                     mapped:1;
 };
 
 /**
@@ -106,6 +105,7 @@ enum vb2_fileio_flags {
 /**
  * enum vb2_buffer_state - current video buffer state
  * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control
+ * @VB2_BUF_STATE_PREPARED:     buffer prepared in videobuf and by the driver
  * @VB2_BUF_STATE_QUEUED:       buffer queued in videobuf, but not in driver
  * @VB2_BUF_STATE_ACTIVE:       buffer queued in driver and possibly used
  *                              in a hardware operation
@@ -117,6 +117,7 @@ enum vb2_fileio_flags {
  */
 enum vb2_buffer_state {
         VB2_BUF_STATE_DEQUEUED,
+        VB2_BUF_STATE_PREPARED,
         VB2_BUF_STATE_QUEUED,
         VB2_BUF_STATE_ACTIVE,
         VB2_BUF_STATE_DONE,
@@ -147,7 +148,6 @@ struct vb2_queue;
  * @done_entry:         entry on the list that stores all buffers ready to
  *                      be dequeued to userspace
  * @planes:             private per-plane information; do not change
- * @num_planes_mapped:  number of mapped planes; do not change
  */
 struct vb2_buffer {
         struct v4l2_buffer      v4l2_buf;
@@ -164,19 +164,26 @@ struct vb2_buffer {
         struct list_head        done_entry;
 
         struct vb2_plane        planes[VIDEO_MAX_PLANES];
-        unsigned int            num_planes_mapped;
 };
 
 /**
  * struct vb2_ops - driver-specific callbacks
  *
- * @queue_setup:        called from a VIDIOC_REQBUFS handler, before
- *                      memory allocation; driver should return the required
- *                      number of buffers in num_buffers, the required number
- *                      of planes per buffer in num_planes; the size of each
- *                      plane should be set in the sizes[] array and optional
- *                      per-plane allocator specific context in alloc_ctxs[]
- *                      array
+ * @queue_setup:        called from VIDIOC_REQBUFS and VIDIOC_CREATE_BUFS
+ *                      handlers before memory allocation, or, if
+ *                      *num_planes != 0, after the allocation to verify a
+ *                      smaller number of buffers. Driver should return
+ *                      the required number of buffers in *num_buffers, the
+ *                      required number of planes per buffer in *num_planes; the
+ *                      size of each plane should be set in the sizes[] array
+ *                      and optional per-plane allocator specific context in the
+ *                      alloc_ctxs[] array. When called from VIDIOC_REQBUFS,
+ *                      fmt == NULL, the driver has to use the currently
+ *                      configured format and *num_buffers is the total number
+ *                      of buffers, that are being allocated. When called from
+ *                      VIDIOC_CREATE_BUFS, fmt != NULL and it describes the
+ *                      target frame format. In this case *num_buffers are being
+ *                      allocated additionally to q->num_buffers.
  * @wait_prepare:       release any locks taken while calling vb2 functions;
  *                      it is called before an ioctl needs to wait for a new
  *                      buffer to arrive; required to avoid a deadlock in
@@ -189,30 +196,39 @@ struct vb2_buffer {
  *                      perform additional buffer-related initialization;
  *                      initialization failure (return != 0) will prevent
  *                      queue setup from completing successfully; optional
- * @buf_prepare:        called every time the buffer is queued from userspace;
- *                      drivers may perform any initialization required before
- *                      each hardware operation in this callback;
- *                      if an error is returned, the buffer will not be queued
- *                      in driver; optional
+ * @buf_prepare:        called every time the buffer is queued from userspace
+ *                      and from the VIDIOC_PREPARE_BUF ioctl; drivers may
+ *                      perform any initialization required before each hardware
+ *                      operation in this callback; if an error is returned, the
+ *                      buffer will not be queued in driver; optional
  * @buf_finish:         called before every dequeue of the buffer back to
  *                      userspace; drivers may perform any operations required
  *                      before userspace accesses the buffer; optional
  * @buf_cleanup:        called once before the buffer is freed; drivers may
  *                      perform any additional cleanup; optional
- * @start_streaming:    called once before entering 'streaming' state; enables
- *                      driver to receive buffers over buf_queue() callback
+ * @start_streaming:    called once to enter 'streaming' state; the driver may
+ *                      receive buffers with @buf_queue callback before
+ *                      @start_streaming is called; the driver gets the number
+ *                      of already queued buffers in count parameter; driver
+ *                      can return an error if hardware fails or not enough
+ *                      buffers has been queued, in such case all buffers that
+ *                      have been already given by the @buf_queue callback are
+ *                      invalidated.
  * @stop_streaming:     called when 'streaming' state must be disabled; driver
  *                      should stop any DMA transactions or wait until they
  *                      finish and give back all buffers it got from buf_queue()
  *                      callback; may use vb2_wait_for_all_buffers() function
  * @buf_queue:          passes buffer vb to the driver; driver may start
  *                      hardware operation on this buffer; driver should give
- *                      the buffer back by calling vb2_buffer_done() function
+ *                      the buffer back by calling vb2_buffer_done() function;
+ *                      it is allways called after calling STREAMON ioctl;
+ *                      might be called before start_streaming callback if user
+ *                      pre-queued buffers before calling STREAMON
  */
 struct vb2_ops {
-        int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers,
-                           unsigned int *num_planes, unsigned long sizes[],
-                           void *alloc_ctxs[]);
+        int (*queue_setup)(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[]);
 
         void (*wait_prepare)(struct vb2_queue *q);
         void (*wait_finish)(struct vb2_queue *q);
@@ -222,7 +238,7 @@ struct vb2_ops {
         int (*buf_finish)(struct vb2_buffer *vb);
         void (*buf_cleanup)(struct vb2_buffer *vb);
 
-        int (*start_streaming)(struct vb2_queue *q);
+        int (*start_streaming)(struct vb2_queue *q, unsigned int count);
         int (*stop_streaming)(struct vb2_queue *q);
 
         void (*buf_queue)(struct vb2_buffer *vb);
@@ -276,6 +292,7 @@ struct vb2_queue {
         wait_queue_head_t               done_wq;
 
         void                            *alloc_ctx[VIDEO_MAX_PLANES];
+        unsigned int                    plane_sizes[VIDEO_MAX_PLANES];
 
         unsigned int                    streaming:1;
 
@@ -291,6 +308,9 @@ int vb2_wait_for_all_buffers(struct vb2_queue *q);
 int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b);
 int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
 
+int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
+int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
+
 int vb2_queue_init(struct vb2_queue *q);
 
 void vb2_queue_release(struct vb2_queue *q);
@@ -302,6 +322,13 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
 int vb2_streamoff(struct vb2_queue *q, enum v4l2_buf_type type);
 
 int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma);
+#ifndef CONFIG_MMU
+unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
+                                    unsigned long addr,
+                                    unsigned long len,
+                                    unsigned long pgoff,
+                                    unsigned long flags);
+#endif
 unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait);
 size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
                 loff_t *ppos, int nonblock);
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 7e6c68b23773..19ae1e350567 100644
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h
@@ -17,11 +17,11 @@
 #include <linux/dma-mapping.h>
 
 static inline dma_addr_t
-vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
+vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no)
 {
-        dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
+        dma_addr_t *addr = vb2_plane_cookie(vb, plane_no);
 
-        return *paddr;
+        return *addr;
 }
 
 void *vb2_dma_contig_init_ctx(struct device *dev);