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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

2 files changed, 20 insertions, 0 deletions

diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h
index 8b11fb037980..8bc1b3c0e679 100644
--- a/include/media/davinci/vpbe.h
+++ b/include/media/davinci/vpbe.h
@@ -63,6 +63,7 @@ struct vpbe_output {
          * output basis. If per mode is needed, we may have to move this to
          * mode_info structure
          */
+        enum v4l2_mbus_pixelcode if_params;
 };
 
 /* encoder configuration info */
@@ -74,6 +75,15 @@ struct encoder_config_info {
         struct i2c_board_info board_info;
 };
 
+/*amplifier configuration info */
+struct amp_config_info {
+        char module_name[32];
+        /* Is this an i2c device ? */
+        unsigned int is_i2c:1;
+        /* i2c subdevice board info */
+        struct i2c_board_info board_info;
+};
+
 /* structure for defining vpbe display subsystem components */
 struct vpbe_config {
         char module_name[32];
@@ -84,6 +94,8 @@ struct vpbe_config {
         /* external encoder information goes here */
         int num_ext_encoders;
         struct encoder_config_info *ext_encoders;
+        /* amplifier information goes here */
+        struct amp_config_info *amp;
         int num_outputs;
         /* Order is venc outputs followed by LCD and then external encoders */
         struct vpbe_output *outputs;
@@ -158,6 +170,8 @@ struct vpbe_device {
         struct v4l2_subdev **encoders;
         /* current encoder index */
         int current_sd_index;
+        /* external amplifier v4l2 subdevice */
+        struct v4l2_subdev *amp;
         struct mutex lock;
         /* device initialized */
         int initialized;
@@ -165,6 +179,8 @@ struct vpbe_device {
         struct clk *dac_clk;
         /* osd_device pointer */
         struct osd_state *osd_device;
+        /* venc device pointer */
+        struct venc_platform_data *venc_device;
         /*
          * fields below are accessed by users of vpbe_device. Not the
          * ones above
diff --git a/include/media/davinci/vpbe_venc.h b/include/media/davinci/vpbe_venc.h
index 426c205831a2..6b57334f4029 100644
--- a/include/media/davinci/vpbe_venc.h
+++ b/include/media/davinci/vpbe_venc.h
@@ -29,10 +29,14 @@
 
 struct venc_platform_data {
         enum vpbe_version venc_type;
+        int (*setup_pinmux)(enum v4l2_mbus_pixelcode if_type,
+                            int field);
         int (*setup_clock)(enum vpbe_enc_timings_type type,
                            unsigned int mode);
+        int (*setup_if_config)(enum v4l2_mbus_pixelcode pixcode);
         /* Number of LCD outputs supported */
         int num_lcd_outputs;
+        struct vpbe_if_params *lcd_if_params;
 };
 
 enum venc_ioctls {