8 files changed, 101 insertions, 24 deletions

diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h
index 8bc1b3c0e679..a7ca4884c46c 100644
--- a/include/media/davinci/vpbe.h
+++ b/include/media/davinci/vpbe.h
@@ -35,7 +35,7 @@ struct osd_config_info {
 struct vpbe_output {
         struct v4l2_output output;
         /*
-         * If output capabilities include dv_preset, list supported presets
+         * If output capabilities include dv_timings, list supported timings
          * below
          */
         char *subdev_name;
@@ -120,16 +120,16 @@ struct vpbe_device_ops {
         unsigned int (*get_output)(struct vpbe_device *vpbe_dev);
 
         /* Set DV preset at current output */
-        int (*s_dv_preset)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_preset *dv_preset);
+        int (*s_dv_timings)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_timings *dv_timings);
 
         /* Get DV presets supported at the output */
-        int (*g_dv_preset)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_preset *dv_preset);
+        int (*g_dv_timings)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_timings *dv_timings);
 
         /* Enumerate the DV Presets supported at the output */
-        int (*enum_dv_presets)(struct vpbe_device *vpbe_dev,
-                               struct v4l2_dv_enum_preset *preset_info);
+        int (*enum_dv_timings)(struct vpbe_device *vpbe_dev,
+                               struct v4l2_enum_dv_timings *timings_info);
 
         /* Set std at the output */
         int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id);
diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h
index 727f55170e41..9b85396514be 100644
--- a/include/media/davinci/vpbe_types.h
+++ b/include/media/davinci/vpbe_types.h
@@ -32,11 +32,6 @@ enum vpbe_enc_timings_type {
         VPBE_ENC_TIMINGS_INVALID = 0x8,
 };
 
-union vpbe_timings {
-        v4l2_std_id std_id;
-        unsigned int dv_preset;
-};
-
 /*
  * struct vpbe_enc_mode_info
  * @name: ptr to name string of the standard, "NTSC", "PAL" etc
@@ -73,7 +68,8 @@ union vpbe_timings {
 struct vpbe_enc_mode_info {
         unsigned char *name;
         enum vpbe_enc_timings_type timings_type;
-        union vpbe_timings timings;
+        v4l2_std_id std_id;
+        struct v4l2_dv_timings dv_timings;
         unsigned int interlaced;
         unsigned int xres;
         unsigned int yres;
diff --git a/include/media/davinci/vpbe_venc.h b/include/media/davinci/vpbe_venc.h
index 6b57334f4029..cc78c2eb16da 100644
--- a/include/media/davinci/vpbe_venc.h
+++ b/include/media/davinci/vpbe_venc.h
@@ -32,7 +32,7 @@ struct venc_platform_data {
         int (*setup_pinmux)(enum v4l2_mbus_pixelcode if_type,
                             int field);
         int (*setup_clock)(enum vpbe_enc_timings_type type,
-                           unsigned int mode);
+                           unsigned int pixclock);
         int (*setup_if_config)(enum v4l2_mbus_pixelcode pixcode);
         /* Number of LCD outputs supported */
         int num_lcd_outputs;
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index d8f6ab1943e4..3882e0675ccf 100644
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 
 #define VPIF_CAPTURE_MAX_CHANNELS       2
+#define VPIF_DISPLAY_MAX_CHANNELS       2
 
 enum vpif_if_type {
         VPIF_IF_BT656,
@@ -37,29 +38,38 @@ struct vpif_interface {
 struct vpif_subdev_info {
         const char *name;
         struct i2c_board_info board_info;
-        u32 input;
-        u32 output;
-        unsigned can_route:1;
-        struct vpif_interface vpif_if;
+};
+
+struct vpif_output {
+        struct v4l2_output output;
+        const char *subdev_name;
+        u32 input_route;
+        u32 output_route;
+};
+
+struct vpif_display_chan_config {
+        const struct vpif_output *outputs;
+        int output_count;
+        bool clip_en;
 };
 
 struct vpif_display_config {
         int (*set_clock)(int, int);
         struct vpif_subdev_info *subdevinfo;
         int subdev_count;
-        const char **output;
-        int output_count;
+        struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS];
         const char *card_name;
-        bool ch2_clip_en;
-        bool ch3_clip_en;
 };
 
 struct vpif_input {
         struct v4l2_input input;
         const char *subdev_name;
+        u32 input_route;
+        u32 output_route;
 };
 
 struct vpif_capture_chan_config {
+        struct vpif_interface vpif_if;
         const struct vpif_input *inputs;
         int input_count;
 };
diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index 09421a611d73..eaea62a382f8 100644
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -30,7 +30,6 @@ struct i2c_board_info;
  * @board_info: pointer to I2C subdevice's board info
  * @clk_frequency: frequency of the clock the host interface provides to sensor
  * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
- * @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)
  * @clk_id: index of the SoC peripheral clock for sensors
@@ -40,7 +39,6 @@ struct s5p_fimc_isp_info {
         struct i2c_board_info *board_info;
         unsigned long clk_frequency;
         enum cam_bus_type bus_type;
-        u16 csi_data_align;
         u16 i2c_bus_num;
         u16 mux_id;
         u16 flags;
diff --git a/include/media/s5p_hdmi.h b/include/media/s5p_hdmi.h
index 361a751f73af..181642b8d0a5 100644
--- a/include/media/s5p_hdmi.h
+++ b/include/media/s5p_hdmi.h
@@ -20,6 +20,7 @@ struct i2c_board_info;
  * @hdmiphy_info: template for HDMIPHY I2C device
  * @mhl_bus: controller id for MHL control bus
  * @mhl_info: template for MHL I2C device
+ * @hpd_gpio: GPIO for Hot-Plug-Detect pin
  *
  * NULL pointer for *_info fields indicates that
  * the corresponding chip is not present
@@ -29,6 +30,7 @@ struct s5p_hdmi_platform_data {
         struct i2c_board_info *hdmiphy_info;
         int mhl_bus;
         struct i2c_board_info *mhl_info;
+        int hpd_gpio;
 };
 
 #endif /* S5P_HDMI_H */
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 801adb466bd2..96509119f28f 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -351,6 +351,29 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
                         const struct v4l2_ctrl_ops *ops,
                         u32 id, s32 max, s32 mask, s32 def);
 
+/** v4l2_ctrl_new_std_menu_items() - Create a new standard V4L2 menu control
+  * with driver specific menu.
+  * @hdl:       The control handler.
+  * @ops:       The control ops.
+  * @id:        The control ID.
+  * @max:       The control's maximum value.
+  * @mask:      The control's skip mask for menu controls. This makes it
+  *             easy to skip menu items that are not valid. If bit X is set,
+  *             then menu item X is skipped. Of course, this only works for
+  *             menus with <= 32 menu items. There are no menus that come
+  *             close to that number, so this is OK. Should we ever need more,
+  *             then this will have to be extended to a u64 or a bit array.
+  * @def:       The control's default value.
+  * @qmenu:     The new menu.
+  *
+  * Same as v4l2_ctrl_new_std_menu(), but @qmenu will be the driver specific
+  * menu of this control.
+  *
+  */
+struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,
+                        const struct v4l2_ctrl_ops *ops, u32 id, s32 max,
+                        s32 mask, s32 def, const char * const *qmenu);
+
 /** v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control.
   * @hdl:       The control handler.
   * @ops:       The control ops.
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 2ecd7377153b..b137a5e1151a 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -21,6 +21,7 @@
 #ifndef _V4L2_SUBDEV_H
 #define _V4L2_SUBDEV_H
 
+#include <linux/types.h>
 #include <linux/v4l2-subdev.h>
 #include <media/media-entity.h>
 #include <media/v4l2-common.h>
@@ -45,6 +46,7 @@ struct v4l2_fh;
 struct v4l2_subdev;
 struct v4l2_subdev_fh;
 struct tuner_setup;
+struct v4l2_mbus_frame_desc;
 
 /* decode_vbi_line */
 struct v4l2_decode_vbi_line {
@@ -226,6 +228,36 @@ struct v4l2_subdev_audio_ops {
         int (*s_stream)(struct v4l2_subdev *sd, int enable);
 };
 
+/* Indicates the @length field specifies maximum data length. */
+#define V4L2_MBUS_FRAME_DESC_FL_LEN_MAX         (1U << 0)
+/* Indicates user defined data format, i.e. non standard frame format. */
+#define V4L2_MBUS_FRAME_DESC_FL_BLOB            (1U << 1)
+
+/**
+ * struct v4l2_mbus_frame_desc_entry - media bus frame description structure
+ * @flags: V4L2_MBUS_FRAME_DESC_FL_* flags
+ * @pixelcode: media bus pixel code, valid if FRAME_DESC_FL_BLOB is not set
+ * @length: number of octets per frame, valid for compressed or unspecified
+ *          formats
+ */
+struct v4l2_mbus_frame_desc_entry {
+        u16 flags;
+        u32 pixelcode;
+        u32 length;
+};
+
+#define V4L2_FRAME_DESC_ENTRY_MAX       4
+
+/**
+ * struct v4l2_mbus_frame_desc - media bus data frame description
+ * @entry: frame descriptors array
+ * @num_entries: number of entries in @entry array
+ */
+struct v4l2_mbus_frame_desc {
+        struct v4l2_mbus_frame_desc_entry entry[V4L2_FRAME_DESC_ENTRY_MAX];
+        unsigned short num_entries;
+};
+
 /*
    s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
         video input devices.
@@ -274,6 +306,10 @@ struct v4l2_subdev_audio_ops {
    s_mbus_config: set a certain mediabus configuration. This operation is added
         for compatibility with soc-camera drivers and should not be used by new
         software.
+
+   s_rx_buffer: set a host allocated memory buffer for the subdev. The subdev
+        can adjust @size to a lower value and must not write more data to the
+        buffer starting at @data than the original value of @size.
  */
 struct v4l2_subdev_video_ops {
         int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config);
@@ -327,6 +363,8 @@ struct v4l2_subdev_video_ops {
                              struct v4l2_mbus_config *cfg);
         int (*s_mbus_config)(struct v4l2_subdev *sd,
                              const struct v4l2_mbus_config *cfg);
+        int (*s_rx_buffer)(struct v4l2_subdev *sd, void *buf,
+                           unsigned int *size);
 };
 
 /*
@@ -455,6 +493,12 @@ struct v4l2_subdev_ir_ops {
                                 struct v4l2_subdev_ir_parameters *params);
 };
 
+/**
+ * struct v4l2_subdev_pad_ops - v4l2-subdev pad level operations
+ * @get_frame_desc: get the current low level media bus frame parameters.
+ * @get_frame_desc: set the low level media bus frame parameters, @fd array
+ *                  may be adjusted by the subdev driver to device capabilities.
+ */
 struct v4l2_subdev_pad_ops {
         int (*enum_mbus_code)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
                               struct v4l2_subdev_mbus_code_enum *code);
@@ -483,6 +527,10 @@ struct v4l2_subdev_pad_ops {
                              struct v4l2_subdev_format *source_fmt,
                              struct v4l2_subdev_format *sink_fmt);
 #endif /* CONFIG_MEDIA_CONTROLLER */
+        int (*get_frame_desc)(struct v4l2_subdev *sd, unsigned int pad,
+                              struct v4l2_mbus_frame_desc *fd);
+        int (*set_frame_desc)(struct v4l2_subdev *sd, unsigned int pad,
+                              struct v4l2_mbus_frame_desc *fd);
 };
 
 struct v4l2_subdev_ops {