Patched in Tegra support.

6 files changed, 19 insertions, 127 deletions

diff --git a/include/media/davinci/vpbe.h b/include/media/davinci/vpbe.h
index a7ca4884c46..8b11fb03798 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_timings, list supported timings
+         * If output capabilities include dv_preset, list supported presets
          * below
          */
         char *subdev_name;
@@ -63,7 +63,6 @@ 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 */
@@ -75,15 +74,6 @@ 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];
@@ -94,8 +84,6 @@ 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;
@@ -120,16 +108,16 @@ struct vpbe_device_ops {
         unsigned int (*get_output)(struct vpbe_device *vpbe_dev);
 
         /* Set DV preset at current output */
-        int (*s_dv_timings)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_timings *dv_timings);
+        int (*s_dv_preset)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_preset *dv_preset);
 
         /* Get DV presets supported at the output */
-        int (*g_dv_timings)(struct vpbe_device *vpbe_dev,
-                           struct v4l2_dv_timings *dv_timings);
+        int (*g_dv_preset)(struct vpbe_device *vpbe_dev,
+                           struct v4l2_dv_preset *dv_preset);
 
         /* Enumerate the DV Presets supported at the output */
-        int (*enum_dv_timings)(struct vpbe_device *vpbe_dev,
-                               struct v4l2_enum_dv_timings *timings_info);
+        int (*enum_dv_presets)(struct vpbe_device *vpbe_dev,
+                               struct v4l2_dv_enum_preset *preset_info);
 
         /* Set std at the output */
         int (*s_std)(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id);
@@ -170,8 +158,6 @@ 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;
@@ -179,8 +165,6 @@ 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_display.h b/include/media/davinci/vpbe_display.h
index 8dffffedbb5..dbf6b37682c 100644
--- a/include/media/davinci/vpbe_display.h
+++ b/include/media/davinci/vpbe_display.h
@@ -16,7 +16,7 @@
 /* Header files */
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <media/videobuf2-dma-contig.h>
+#include <media/videobuf-dma-contig.h>
 #include <media/davinci/vpbe_types.h>
 #include <media/davinci/vpbe_osd.h>
 #include <media/davinci/vpbe.h>
@@ -62,11 +62,6 @@ struct display_layer_info {
         enum osd_v_exp_ratio v_exp;
 };
 
-struct vpbe_disp_buffer {
-        struct vb2_buffer vb;
-        struct list_head list;
-};
-
 /* vpbe display object structure */
 struct vpbe_layer {
         /* number of buffers in fbuffers */
@@ -74,15 +69,13 @@ struct vpbe_layer {
         /* Pointer to the vpbe_display */
         struct vpbe_display *disp_dev;
         /* Pointer pointing to current v4l2_buffer */
-        struct vpbe_disp_buffer *cur_frm;
+        struct videobuf_buffer *cur_frm;
         /* Pointer pointing to next v4l2_buffer */
-        struct vpbe_disp_buffer *next_frm;
+        struct videobuf_buffer *next_frm;
         /* videobuf specific parameters
          * Buffer queue used in video-buf
          */
-        struct vb2_queue buffer_queue;
-        /* allocator-specific contexts for each plane */
-        struct vb2_alloc_ctx *alloc_ctx;
+        struct videobuf_queue buffer_queue;
         /* Queue of filled frames */
         struct list_head dma_queue;
         /* Used in video-buf */
diff --git a/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index 5ab0d8d41f6..d7e397a444e 100644
--- a/include/media/davinci/vpbe_osd.h
+++ b/include/media/davinci/vpbe_osd.h
@@ -357,7 +357,7 @@ struct osd_state {
         spinlock_t lock;
         struct device *dev;
         dma_addr_t osd_base_phys;
-        void __iomem *osd_base;
+        unsigned long osd_base;
         unsigned long osd_size;
         /* 1-->the isr will toggle the VID0 ping-pong buffer */
         int pingpong;
diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h
index 9b85396514b..727f55170e4 100644
--- a/include/media/davinci/vpbe_types.h
+++ b/include/media/davinci/vpbe_types.h
@@ -32,6 +32,11 @@ 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
@@ -68,8 +73,7 @@ enum vpbe_enc_timings_type {
 struct vpbe_enc_mode_info {
         unsigned char *name;
         enum vpbe_enc_timings_type timings_type;
-        v4l2_std_id std_id;
-        struct v4l2_dv_timings dv_timings;
+        union vpbe_timings 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 cc78c2eb16d..426c205831a 100644
--- a/include/media/davinci/vpbe_venc.h
+++ b/include/media/davinci/vpbe_venc.h
@@ -29,14 +29,10 @@
 
 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 pixclock);
-        int (*setup_if_config)(enum v4l2_mbus_pixelcode pixcode);
+                           unsigned int mode);
         /* Number of LCD outputs supported */
         int num_lcd_outputs;
-        struct vpbe_if_params *lcd_if_params;
 };
 
 enum venc_ioctls {
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
deleted file mode 100644
index 3882e0675cc..00000000000
--- a/include/media/davinci/vpif_types.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2011 Texas Instruments Inc
- *
- * 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 version 2.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#ifndef _VPIF_TYPES_H
-#define _VPIF_TYPES_H
-
-#include <linux/i2c.h>
-
-#define VPIF_CAPTURE_MAX_CHANNELS       2
-#define VPIF_DISPLAY_MAX_CHANNELS       2
-
-enum vpif_if_type {
-        VPIF_IF_BT656,
-        VPIF_IF_BT1120,
-        VPIF_IF_RAW_BAYER
-};
-
-struct vpif_interface {
-        enum vpif_if_type if_type;
-        unsigned hd_pol:1;
-        unsigned vd_pol:1;
-        unsigned fid_pol:1;
-};
-
-struct vpif_subdev_info {
-        const char *name;
-        struct i2c_board_info board_info;
-};
-
-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;
-        struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS];
-        const char *card_name;
-};
-
-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;
-};
-
-struct vpif_capture_config {
-        int (*setup_input_channel_mode)(int);
-        int (*setup_input_path)(int, const char *);
-        struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
-        struct vpif_subdev_info *subdev_info;
-        int subdev_count;
-        const char *card_name;
-};
-#endif /* _VPIF_TYPES_H */